From 40a0b3526bf001fafc92acb0a0016b44aa7cd91e Mon Sep 17 00:00:00 2001 From: root Date: Wed, 3 Oct 2012 18:26:49 +0200 Subject: [PATCH] Changing TyrQuake ebuild for use virtual/jpeg Added patch for Sylpheed to use menu key to popup menus --- games-fps/tyrquake/Manifest | 4 +- games-fps/tyrquake/tyrquake-0.61.ebuild | 2 +- mail-client/sylpheed/Manifest | 10 +- .../sylpheed/files/sylpheed-2.4-firefox.diff | 12 - .../sylpheed/files/sylpheed-2.5-enchant.diff | 17 - .../sylpheed/files/sylpheed-2.7-menu_key.diff | 32 -- .../files/sylpheed-2.7-shared-mime-info.diff | 55 ---- .../sylpheed-3.1.4-menu_key_support.patch | 307 ++++++++++++++++++ .../sylpheed/files/sylpheed-r3033.diff | 23 ++ ...1-r99.ebuild => sylpheed-3.1.4-r99.ebuild} | 62 ++-- 10 files changed, 361 insertions(+), 163 deletions(-) delete mode 100644 mail-client/sylpheed/files/sylpheed-2.4-firefox.diff delete mode 100644 mail-client/sylpheed/files/sylpheed-2.5-enchant.diff delete mode 100644 mail-client/sylpheed/files/sylpheed-2.7-menu_key.diff delete mode 100644 mail-client/sylpheed/files/sylpheed-2.7-shared-mime-info.diff create mode 100644 mail-client/sylpheed/files/sylpheed-3.1.4-menu_key_support.patch create mode 100644 mail-client/sylpheed/files/sylpheed-r3033.diff rename mail-client/sylpheed/{sylpheed-2.7.1-r99.ebuild => sylpheed-3.1.4-r99.ebuild} (52%) diff --git a/games-fps/tyrquake/Manifest b/games-fps/tyrquake/Manifest index ab1977c..80e342e 100644 --- a/games-fps/tyrquake/Manifest +++ b/games-fps/tyrquake/Manifest @@ -1,2 +1,2 @@ -DIST tyrquake-0.61.tar.gz 1188917 RMD160 005363c07abb3e071f3352517ac549a5ae3aa8fa SHA1 b9c9ec45b339759f1e6bf884a6bed516ad1f8939 SHA256 1a51a5bbcb7dcf296c46e1dc9108fd74c4969b9b6ac3c5b1f33ff967fba3f843 -EBUILD tyrquake-0.61.ebuild 1206 RMD160 be7e3bb572b532f684f4b78dcdbdca7be4edbcb3 SHA1 8eef5ff32d1841058acedaf41449c56745b0871a SHA256 d97fa96f2b3b2d002f3a3909ca782719d42fa975d64a530e657e9affbd55513f +DIST tyrquake-0.61.tar.gz 1188917 SHA256 1a51a5bbcb7dcf296c46e1dc9108fd74c4969b9b6ac3c5b1f33ff967fba3f843 SHA512 4b12e452923d3c56b78a45a1b974c735339abcd39112d7ce38b4cd98cb471ddc4beab4aaf7a5f6318bd7dedf4e3b6aa8af9efb79be63cbb56658f66dfc3260f8 WHIRLPOOL cb3bce02a87180357bd96436b217a178ae7d48b06dde1f2253bb760ecd89778cef88e5d3daacea4fb98c5e28a4e37c71ba1d966262c8d5c9e00f8b8d11e6b30d +EBUILD tyrquake-0.61.ebuild 1203 SHA256 cf40170afad3a9a104c62a35e779672af72ea36d9a519e8beebdfed1203000fa SHA512 e95c4a3a784ec66ffcfd0e2d174a526c8a0f604f285e03f6f3ed9631860269e2d6d19573e4577b60f67a2fb4afcb1d639d66e7f7f196ba2258004cb898e71bd0 WHIRLPOOL 8a346a9ab79d72084b0aa194159ec886d842a63f0601dc52657694e3030dbf2ae1bd9ffb2d204e854673bd4cdccc0ebf5a13bb5593a1754c3289d20879e30286 diff --git a/games-fps/tyrquake/tyrquake-0.61.ebuild b/games-fps/tyrquake/tyrquake-0.61.ebuild index 82c7d42..b6f8a7f 100644 --- a/games-fps/tyrquake/tyrquake-0.61.ebuild +++ b/games-fps/tyrquake/tyrquake-0.61.ebuild @@ -17,7 +17,7 @@ dir=${GAMES_DATADIR}/quake1 # These dependencies have not been checked COMMON="media-libs/alsa-lib - media-libs/jpeg + virtual/jpeg media-libs/libogg media-libs/libpng media-libs/libvorbis diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest index 3dd725f..921b7a9 100644 --- a/mail-client/sylpheed/Manifest +++ b/mail-client/sylpheed/Manifest @@ -1,6 +1,4 @@ -AUX sylpheed-2.4-firefox.diff 612 RMD160 67c11c67c4c4b506215780a28d462f729d28fd21 SHA1 499d8de33f4daf252efeadb362ebceb52217b648 SHA256 cc9b955cb5f6b0276265caff123a13345439ee5a5ca6ab49303f5e141ba359d8 -AUX sylpheed-2.5-enchant.diff 657 RMD160 60a9f01e855283860606ff39d7efceab24f94f22 SHA1 8c2a0b08ab739dc35d57edcbb6a3a29f5c25f6b0 SHA256 b47b4829cfe20215c6daf3a80a2b3ba1afbf529ca3212986246316e9655fefab -AUX sylpheed-2.7-menu_key.diff 861 RMD160 95bd944fddcfb1ac39793c472c69a57e2f234c7a SHA1 2a109d668638dca054ff17a56423bcb3d0c8291c SHA256 8c2f157789ecc5b7a29ae7a77c98db552d1f5e153175270e52a3be6a672e76dc -AUX sylpheed-2.7-shared-mime-info.diff 1537 RMD160 281d4e57483ec5a4ea47b0449b2da643d9ec1393 SHA1 d828c1aa80cccc4c6ca00daf21b35fc1fbee6889 SHA256 9cf57d8e0750df6ef11a3107c119295fa1cc721e029be3fb4777e004b2174428 -DIST sylpheed-2.7.1.tar.bz2 2903079 RMD160 270607ebb48c2a2426472ddfa352021db634d0f7 SHA1 79013505355a9d359bbb3147f1916499abe1ab0e SHA256 8bb6457db4e2eea1877b487d9ac8513546372db9a6a2e4271d11229f4af84e23 -EBUILD sylpheed-2.7.1-r99.ebuild 1608 RMD160 f9f1b1f32645658fe7dabf4bda8b5d8ee5179037 SHA1 592fb856427e30313c35f8a041ce293723e167af SHA256 92e165839fc586dee9ffe60c6fa3d50781a6ee1dfdad6ef40e59beefe0d0c171 +AUX sylpheed-3.1.4-menu_key_support.patch 9901 SHA256 821fde5e114cbea349ec92faa1d03e4e7a0c114ef4f4a0e22db6b6068e61e41e SHA512 490fea7dbf25f927d1977dcce29498b0dad84ec1c1dc9d960af960ec2c29753ee5536c67ee71f5a674e54c0954dbb10ea193f91908c55729718ea05fe285c8d8 WHIRLPOOL 0061b93e4375abc20e7e9fcb0ebac6a94b02163a4ed3d04e1ba4dce328b353e7c1e90bd2ab501c127677fee2d7ebd773e7a0c06367451aa414578995b64a924e +AUX sylpheed-r3033.diff 662 SHA256 deb989aac7eb818a40ae59053359f60bd642d3f1f39c78a4ccb3568e47c4734a SHA512 e2bb8c57ee6557a95a267d5833df4c1b187054392f343083af0652e8a303cf5f4eb7fcf57aca1e9209868af15e83e86133316e385bf535ab8f613e32a7a48bdb WHIRLPOOL c70b593e79d01e3cb4e931ca132e9392d7be7fe5524c5ee3c3314c67b0ebcd65da42f4eba82470c91a125c9196af958c30a6d35cf35a6f447b65cb2054a1c1c3 +DIST sylpheed-3.1.4.tar.bz2 3239023 SHA256 5bd4105b78a65070000375193c506fda09c1e0471403f7b9e225cfca904c93ab SHA512 01fb1749b80cb485b863ab9e1d08c8ea9bc47e411f898fde3567f126db935a1bc51a65b093e39e2d5026522bea0cd2ddff284fa574355bdf5e067c777874903d WHIRLPOOL 211e3cb2cc7c1533cdc67e23c93d8dd8eac5753be83599672dc498e06631991e87f7bc02fdf41736367728b32ef5d78034a75f6ff8582c99203a6abdf155abc0 +EBUILD sylpheed-3.1.4-r99.ebuild 1563 SHA256 5c9ffe8705fce690bfffcb2bea0d97082c60a2194da0b120622ccfce71dc7441 SHA512 7ab186b367d705d7d623473539cbfaf9b99419001e759e240fcea7db102d4e4dcec993620673516e17ad8ff012fd155e1c1a531e67304d745cc631ff02b989d4 WHIRLPOOL 8699d330722923f016b0667c8d805040be331ee7ac7ff02f3cfed4a06b94129d1d6f7f9b94a5566f3772e51028136eae423a682aa99008bc9fe5293206a17e93 diff --git a/mail-client/sylpheed/files/sylpheed-2.4-firefox.diff b/mail-client/sylpheed/files/sylpheed-2.4-firefox.diff deleted file mode 100644 index 79ee315..0000000 --- a/mail-client/sylpheed/files/sylpheed-2.4-firefox.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur sylpheed-2.4.1.orig/libsylph/defs.h sylpheed-2.4.1/libsylph/defs.h ---- sylpheed-2.4.1.orig/libsylph/defs.h 2006-09-22 11:58:56.000000000 +0900 -+++ sylpheed-2.4.1/libsylph/defs.h 2007-05-07 17:25:18.000000000 +0900 -@@ -92,7 +92,7 @@ - /* #define DEFAULT_INC_PATH "/usr/bin/imget" */ - /* #define DEFAULT_INC_PROGRAM "imget" */ - #define DEFAULT_SENDMAIL_CMD "/usr/sbin/sendmail -t -i" --#define DEFAULT_BROWSER_CMD "mozilla-firefox -remote 'openURL(%s,new-window)'" -+#define DEFAULT_BROWSER_CMD "firefox -remote 'openURL(%s,new-window)'" - - #ifdef _PATH_MAILDIR - # define DEFAULT_SPOOL_PATH _PATH_MAILDIR diff --git a/mail-client/sylpheed/files/sylpheed-2.5-enchant.diff b/mail-client/sylpheed/files/sylpheed-2.5-enchant.diff deleted file mode 100644 index 0501f02..0000000 --- a/mail-client/sylpheed/files/sylpheed-2.5-enchant.diff +++ /dev/null @@ -1,17 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in (revision 2022) -+++ configure.in (working copy) -@@ -266,11 +266,7 @@ - AC_MSG_RESULT(yes) - CFLAGS="$CFLAGS `$PKG_CONFIG --cflags gtkspell-2.0`" - LIBS="$LIBS `$PKG_CONFIG --libs gtkspell-2.0`" -- if $PKG_CONFIG --atleast-version 2.0.13 gtkspell-2.0 ; then -- AC_DEFINE(USE_ENCHANT, 1, Use Enchant with GtkSpell) -- elif $PKG_CONFIG --atleast-version 2.0.12 gtkspell-2.0 ; then -- LIBS="$LIBS -laspell" -- fi -+ AC_DEFINE(USE_ENCHANT, 1, Use Enchant with GtkSpell) - AC_DEFINE(USE_GTKSPELL, 1, Use GtkSpell in editor) - else - AC_MSG_RESULT(no) diff --git a/mail-client/sylpheed/files/sylpheed-2.7-menu_key.diff b/mail-client/sylpheed/files/sylpheed-2.7-menu_key.diff deleted file mode 100644 index 685ab64..0000000 --- a/mail-client/sylpheed/files/sylpheed-2.7-menu_key.diff +++ /dev/null @@ -1,32 +0,0 @@ ---- sylpheed-2.7.1_orig/src/folderview.c 2009-06-15 06:35:28.000000000 +0200 -+++ sylpheed-2.7.1/src/folderview.c 2010-07-23 21:53:07.000000000 +0200 -@@ -1634,8 +1634,9 @@ - - if (!event) return FALSE; - -- if (event->button != 3) -- return FALSE; -+ // Show context menu -+ //if (event->button != 3) -+ // return FALSE; - - if (!gtk_tree_selection_get_selected - (folderview->selection, NULL, &iter)) -@@ -1879,6 +1880,17 @@ - return TRUE; - } - break; -+ case GDK_Menu: -+ // Show context menu -+ if (folderview->selected) { -+ selected = gtk_tree_row_reference_get_path -+ (folderview->selected); -+ gtk_tree_selection_select_path(folderview->selection, selected); -+ folderview_menu_popup(folderview, event); -+ gtk_tree_path_free(selected); -+ return TRUE; -+ } -+ break; - default: - break; - } diff --git a/mail-client/sylpheed/files/sylpheed-2.7-shared-mime-info.diff b/mail-client/sylpheed/files/sylpheed-2.7-shared-mime-info.diff deleted file mode 100644 index 4e0783d..0000000 --- a/mail-client/sylpheed/files/sylpheed-2.7-shared-mime-info.diff +++ /dev/null @@ -1,55 +0,0 @@ -Index: libsylph/procmime.c -=================================================================== ---- libsylph/procmime.c (revision 2195) -+++ libsylph/procmime.c (working copy) -@@ -1483,6 +1483,9 @@ - g_free(dir); - mime_type_list = g_list_concat(mime_type_list, list); - -+ list = procmime_get_mime_type_list(DATADIR "/mime/globs"); -+ mime_type_list = g_list_concat(mime_type_list, list); -+ - if (!mime_type_list) { - debug_print("mime.types not found\n"); - return NULL; -@@ -1535,7 +1538,7 @@ - g_strstrip(buf); - - p = buf; -- while (*p && !g_ascii_isspace(*p)) p++; -+ while (*p && !g_ascii_isspace(*p) && *p != ':') p++; - if (*p) { - *p = '\0'; - p++; -@@ -1548,7 +1551,7 @@ - mime_type->type = g_strdup(buf); - mime_type->sub_type = g_strdup(delim + 1); - -- while (*p && g_ascii_isspace(*p)) p++; -+ while (*p && (g_ascii_isspace(*p) || *p == '*' || *p == '.')) p++; - if (*p) - mime_type->extension = g_strdup(p); - else -@@ -1560,7 +1563,7 @@ - fclose(fp); - - if (!list) -- g_warning("Can't read mime.types\n"); -+ g_warning("Can't read %s\n", file); - - return list; - } -Index: libsylph/Makefile.am -=================================================================== ---- libsylph/Makefile.am (revision 2195) -+++ libsylph/Makefile.am (working copy) -@@ -2,7 +2,8 @@ - AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"LibSylph\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ -- -DLOCALEDIR=\""$(localedir)"\" -+ -DLOCALEDIR=\""$(localedir)"\" \ -+ -DDATADIR=\""$(datadir)"\" - - INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir) -I$(includedir) - diff --git a/mail-client/sylpheed/files/sylpheed-3.1.4-menu_key_support.patch b/mail-client/sylpheed/files/sylpheed-3.1.4-menu_key_support.patch new file mode 100644 index 0000000..077eeef --- /dev/null +++ b/mail-client/sylpheed/files/sylpheed-3.1.4-menu_key_support.patch @@ -0,0 +1,307 @@ +diff -ur sylpheed-3.1.4_orig/src/addressbook.c sylpheed-3.1.4/src/addressbook.c +--- sylpheed-3.1.4_orig/src/addressbook.c 2012-10-03 17:25:03.253072293 +0200 ++++ sylpheed-3.1.4/src/addressbook.c 2012-10-03 17:25:41.651355851 +0200 +@@ -201,12 +201,18 @@ + static gboolean addressbook_list_button_released(GtkWidget *widget, + GdkEventButton *event, + gpointer data); ++static gboolean addressbook_list_key_pressed (GtkWidget *widget, ++ GdkEventKey *event, ++ gpointer data); + static gboolean addressbook_tree_button_pressed (GtkWidget *ctree, + GdkEventButton *event, + gpointer data); + static gboolean addressbook_tree_button_released(GtkWidget *ctree, + GdkEventButton *event, + gpointer data); ++static gboolean addressbook_tree_key_pressed (GtkWidget *ctree, ++ GdkEventKey *event, ++ gpointer data); + + static gboolean addressbook_drag_motion (GtkWidget *widget, + GdkDragContext *context, +@@ -718,6 +724,9 @@ + g_signal_connect(G_OBJECT(treeview), "button_release_event", + G_CALLBACK(addressbook_tree_button_released), + NULL); ++ g_signal_connect(G_OBJECT(treeview), "key_press_event", ++ G_CALLBACK(addressbook_tree_key_pressed), ++ NULL); + + gtk_drag_dest_set(treeview, GTK_DEST_DEFAULT_ALL, + addressbook_drag_types, N_DRAG_TYPES, +@@ -843,6 +852,9 @@ + g_signal_connect(G_OBJECT(listview), "button_release_event", + G_CALLBACK(addressbook_list_button_released), + NULL); ++ g_signal_connect(G_OBJECT(listview), "key_press_event", ++ G_CALLBACK(addressbook_list_key_pressed), ++ NULL); + g_signal_connect(G_OBJECT(listview), "row_expanded", + G_CALLBACK(addressbook_person_expand_node), NULL); + g_signal_connect(G_OBJECT(listview), "row_collapsed", +@@ -3721,6 +3733,51 @@ + return FALSE; + } + ++static gboolean addressbook_tree_key_pressed(GtkWidget *widget, ++ GdkEventKey *event, gpointer data) ++{ ++ if (event && event->keyval == GDK_Menu) ++ { ++ GtkTreeView *treeview = GTK_TREE_VIEW(widget); ++ GtkTreeSelection *selection; ++ ++ if (!event) ++ return FALSE; ++ ++ selection = gtk_tree_view_get_selection(treeview); ++ ++ if (selection){ ++ addressbook_menuitem_set_sensitive(); ++ gtk_menu_popup(GTK_MENU(addrbook.tree_popup), NULL, NULL, NULL, ++ NULL, 3, event->time); ++ return TRUE; ++ } ++ } ++ return FALSE; ++} ++ ++static gboolean addressbook_list_key_pressed(GtkWidget *widget, ++ GdkEventKey *event, gpointer data) ++{ ++ if (event && event->keyval == GDK_Menu) ++ { ++ GtkTreeSelection *selection; ++ ++ if (!event) ++ return FALSE; ++ ++ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); ++ ++ if (selection){ ++ gtk_menu_popup(GTK_MENU(addrbook.list_popup), NULL, NULL, ++ NULL, NULL, 3, event->time); ++ return TRUE; ++ } ++ } ++ return FALSE; ++} ++ ++ + static void size_allocated(GtkWidget *widget, GtkAllocation *allocation, + gpointer data) + { +diff -ur sylpheed-3.1.4_orig/src/folderview.c sylpheed-3.1.4/src/folderview.c +--- sylpheed-3.1.4_orig/src/folderview.c 2012-10-03 17:25:03.254072301 +0200 ++++ sylpheed-3.1.4/src/folderview.c 2012-10-03 17:25:41.651355851 +0200 +@@ -1639,7 +1639,7 @@ + } + + static gboolean folderview_menu_popup(FolderView *folderview, +- GdkEventButton *event) ++ guint32 event_time) + { + FolderItem *item = NULL; + Folder *folder; +@@ -1663,11 +1663,6 @@ + gboolean search_folder = FALSE; + gboolean folder_property = FALSE; + +- if (!event) return FALSE; +- +- if (event->button != 3) +- return FALSE; +- + if (!gtk_tree_selection_get_selected + (folderview->selection, NULL, &iter)) + return FALSE; +@@ -1861,15 +1856,13 @@ + item->stype != F_VIRTUAL); + SET_VISIBILITY(ifactory, "/Edit search condition...", + item->stype == F_VIRTUAL); +- + #undef SET_SENS + #undef SET_VISIBILITY + #undef SET_VISIBILITY2 + + syl_plugin_signal_emit("folderview-menu-popup", ifactory); + +- gtk_menu_popup(GTK_MENU(popup), NULL, NULL, NULL, NULL, +- event->button, event->time); ++ gtk_menu_popup(GTK_MENU(popup), NULL, NULL, NULL, NULL, 3, event_time); + + return FALSE; + } +@@ -1910,7 +1903,7 @@ + (folderview->selected); + } + gtk_tree_selection_select_path(folderview->selection, path); +- folderview_menu_popup(folderview, event); ++ folderview_menu_popup(folderview, event->time); + gtk_tree_path_free(path); + return TRUE; + } +@@ -2016,6 +2009,16 @@ + } + } + break; ++ case GDK_Menu: ++ if (folderview->selected) { ++ selected = gtk_tree_row_reference_get_path ++ (folderview->selected); ++ gtk_tree_selection_select_path(folderview->selection, selected); ++ folderview_menu_popup(folderview, event->time); ++ gtk_tree_path_free(selected); ++ return TRUE; ++ } ++ break; + default: + break; + } +diff -ur sylpheed-3.1.4_orig/src/mimeview.c sylpheed-3.1.4/src/mimeview.c +--- sylpheed-3.1.4_orig/src/mimeview.c 2012-10-03 17:25:03.255072309 +0200 ++++ sylpheed-3.1.4/src/mimeview.c 2012-10-03 17:25:41.652355859 +0200 +@@ -838,6 +838,51 @@ + } + } + ++static gint mimeview_popup_menu(gint event_button, gint event_time, ++ MimeView *mimeview) ++{ ++ MimeInfo *partinfo; ++ ++ partinfo = mimeview_get_selected_part(mimeview); ++ if (partinfo && (partinfo->mime_type == MIME_TEXT || ++ partinfo->mime_type == MIME_TEXT_HTML || ++ partinfo->mime_type == MIME_MESSAGE_RFC822 || ++ partinfo->mime_type == MIME_IMAGE || ++ partinfo->mime_type == MIME_MULTIPART)) ++ menu_set_sensitive(mimeview->popupfactory, "/Display as text", FALSE); ++ else ++ menu_set_sensitive(mimeview->popupfactory, "/Display as text", TRUE); ++ ++ if (partinfo && partinfo->mime_type == MIME_APPLICATION_OCTET_STREAM) ++ menu_set_sensitive(mimeview->popupfactory, "/Open", FALSE); ++ else ++ menu_set_sensitive(mimeview->popupfactory, "/Open", TRUE); ++ ++ if (partinfo && (partinfo->mime_type == MIME_TEXT || ++ partinfo->mime_type == MIME_TEXT_HTML || ++ partinfo->mime_type == MIME_MESSAGE_RFC822)) ++ menu_set_sensitive(mimeview->popupfactory, "/Print...", TRUE); ++ else ++ menu_set_sensitive(mimeview->popupfactory, "/Print...", FALSE); ++ ++ if (partinfo && partinfo->mime_type == MIME_MESSAGE_RFC822) { ++ gtk_widget_show(mimeview->reply_separator); ++ gtk_widget_show(mimeview->reply_menuitem); ++ } else { ++ gtk_widget_hide(mimeview->reply_separator); ++ gtk_widget_hide(mimeview->reply_menuitem); ++ } ++#if USE_GPGME ++ menu_set_sensitive(mimeview->popupfactory, ++ "/Check signature", ++ mimeview_is_signed(mimeview)); ++#endif ++ ++ gtk_menu_popup(GTK_MENU(mimeview->popupmenu), NULL, NULL, NULL, NULL, ++ event_button, event_time); ++ return TRUE; ++} ++ + static gint mimeview_button_pressed(GtkWidget *widget, GdkEventButton *event, + MimeView *mimeview) + { +@@ -861,51 +906,7 @@ + /* call external program for image, audio or html */ + mimeview_launch(mimeview); + } else if (event->button == 3) { +- partinfo = mimeview_get_selected_part(mimeview); +- if (partinfo && (partinfo->mime_type == MIME_TEXT || +- partinfo->mime_type == MIME_TEXT_HTML || +- partinfo->mime_type == MIME_MESSAGE_RFC822 || +- partinfo->mime_type == MIME_IMAGE || +- partinfo->mime_type == MIME_MULTIPART)) +- menu_set_sensitive(mimeview->popupfactory, +- "/Display as text", FALSE); +- else +- menu_set_sensitive(mimeview->popupfactory, +- "/Display as text", TRUE); +- if (partinfo && +- partinfo->mime_type == MIME_APPLICATION_OCTET_STREAM) +- menu_set_sensitive(mimeview->popupfactory, +- "/Open", FALSE); +- else +- menu_set_sensitive(mimeview->popupfactory, +- "/Open", TRUE); +- +- if (partinfo && (partinfo->mime_type == MIME_TEXT || +- partinfo->mime_type == MIME_TEXT_HTML || +- partinfo->mime_type == MIME_MESSAGE_RFC822)) +- menu_set_sensitive(mimeview->popupfactory, +- "/Print...", TRUE); +- else +- menu_set_sensitive(mimeview->popupfactory, +- "/Print...", FALSE); +- +- if (partinfo && partinfo->mime_type == MIME_MESSAGE_RFC822) { +- gtk_widget_show(mimeview->reply_separator); +- gtk_widget_show(mimeview->reply_menuitem); +- } else { +- gtk_widget_hide(mimeview->reply_separator); +- gtk_widget_hide(mimeview->reply_menuitem); +- } +-#if USE_GPGME +- menu_set_sensitive(mimeview->popupfactory, +- "/Check signature", +- mimeview_is_signed(mimeview)); +-#endif +- +- gtk_menu_popup(GTK_MENU(mimeview->popupmenu), +- NULL, NULL, NULL, NULL, +- event->button, event->time); +- return TRUE; ++ return mimeview_popup_menu(event->button, event->time, mimeview); + } + + return FALSE; +@@ -981,6 +982,10 @@ + if (summaryview) + summary_pass_key_press_event(summaryview, event); + break; ++ case GDK_Menu: ++ if (summaryview) ++ return mimeview_popup_menu(3, event->time, mimeview); ++ break; + default: + break; + } +diff -ur sylpheed-3.1.4_orig/src/summaryview.c sylpheed-3.1.4/src/summaryview.c +--- sylpheed-3.1.4_orig/src/summaryview.c 2012-10-03 17:25:03.256072316 +0200 ++++ sylpheed-3.1.4/src/summaryview.c 2012-10-03 17:25:41.654355873 +0200 +@@ -5898,6 +5898,7 @@ + return TRUE; + } else if (event->button == 3) { + /* right clicked */ ++ printf("debug dla ubogich\n"); + syl_plugin_signal_emit("summaryview-menu-popup", + summaryview->popupfactory); + gtk_menu_popup(GTK_MENU(summaryview->popupmenu), NULL, NULL, +@@ -5983,6 +5984,13 @@ + case GDK_Escape: + gtk_widget_grab_focus(summaryview->folderview->treeview); + return TRUE; ++ case GDK_Menu: ++ syl_plugin_signal_emit("summaryview-menu-popup", ++ summaryview->popupfactory); ++ gtk_menu_popup(GTK_MENU(summaryview->popupmenu), NULL, NULL, ++ NULL, NULL, 3, event->time); ++ return TRUE; ++ break; + default: + break; + } +Only in sylpheed-3.1.4_orig/src: version.h +Only in sylpheed-3.1.4_orig: sylpheed.spec diff --git a/mail-client/sylpheed/files/sylpheed-r3033.diff b/mail-client/sylpheed/files/sylpheed-r3033.diff new file mode 100644 index 0000000..1d84628 --- /dev/null +++ b/mail-client/sylpheed/files/sylpheed-r3033.diff @@ -0,0 +1,23 @@ +------------------------------------------------------------------------ +r3033 | hiro | 2012-03-26 16:36:06 +0900 (Mon, 26 Mar 2012) | 1 line + +removed direct inclusion of and (fixes Bug #53). +------------------------------------------------------------------------ +Index: libsylph/defs.h +=================================================================== +--- libsylph/defs.h (revision 3032) ++++ libsylph/defs.h (revision 3033) +@@ -24,12 +24,8 @@ + # include "config.h" + #endif + +-#include ++#include + +-#ifdef G_OS_WIN32 +-# include +-#endif +- + #if HAVE_PATHS_H + # include + #endif diff --git a/mail-client/sylpheed/sylpheed-2.7.1-r99.ebuild b/mail-client/sylpheed/sylpheed-3.1.4-r99.ebuild similarity index 52% rename from mail-client/sylpheed/sylpheed-2.7.1-r99.ebuild rename to mail-client/sylpheed/sylpheed-3.1.4-r99.ebuild index 239a4c9..f84623d 100644 --- a/mail-client/sylpheed/sylpheed-2.7.1-r99.ebuild +++ b/mail-client/sylpheed/sylpheed-3.1.4-r99.ebuild @@ -1,74 +1,60 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-2.7.1.ebuild,v 1.2 2010/03/13 16:03:24 hattya Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-3.1.4.ebuild,v 1.9 2012/08/19 15:55:09 armin76 Exp $ -inherit autotools eutils +EAPI="4" -IUSE="crypt ipv6 ldap nls pda spell ssl xface" +inherit eutils DESCRIPTION="A lightweight email client and newsreader" HOMEPAGE="http://sylpheed.sraoss.jp/" SRC_URI="http://sylpheed.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2.1" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="crypt ipv6 ldap nls oniguruma pda spell ssl xface" -COMMON_DEPEND=">=x11-libs/gtk+-2.4 - nls? ( >=sys-devel/gettext-0.12.1 ) - crypt? ( >=app-crypt/gpgme-1 ) +CDEPEND="x11-libs/gtk+:2 + nls? ( sys-devel/gettext ) + crypt? ( app-crypt/gpgme ) ldap? ( net-nds/openldap ) + oniguruma? ( dev-libs/oniguruma ) pda? ( app-pda/jpilot ) - spell? ( app-text/gtkspell ) + spell? ( app-text/gtkspell:2 ) ssl? ( dev-libs/openssl )" -DEPEND="${COMMON_DEPEND} - dev-util/pkgconfig - xface? ( >=media-libs/compface-1.4 )" -RDEPEND="${COMMON_DEPEND} +RDEPEND="${CDEPEND} app-misc/mime-types - net-misc/curl - x11-misc/shared-mime-info" - -AT_M4DIR="ac" - -src_unpack() { - - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${PN}-2.[457]-*.diff - - use crypt || cp ac/missing/gpgme.m4 ac - - eautoreconf + net-misc/curl" +DEPEND="${CDEPEND} + virtual/pkgconfig + xface? ( media-libs/compface )" +src_prepare() { + epatch "${FILESDIR}/${PN}-${PV}-menu_key_support.patch" + epatch "${FILESDIR}"/${PN}-r3033.diff } -src_compile() { - +src_configure() { local htmldir=/usr/share/doc/${PF}/html - econf \ $(use_enable crypt gpgme) \ $(use_enable ipv6) \ $(use_enable ldap) \ + $(use_enable oniguruma) \ $(use_enable pda jpilot) \ $(use_enable spell gtkspell) \ $(use_enable ssl) \ $(use_enable xface compface) \ --with-manualdir=${htmldir}/manual \ --with-faqdir=${htmldir}/faq \ - || die - emake || die - + --disable-updatecheck } src_install() { - - emake DESTDIR="${D}" install || die - + emake DESTDIR="${D}" install dodoc AUTHORS ChangeLog* NEWS* README* TODO* + doicon *.png domenu *.desktop - }