diff --git a/x11-plugins/pidgin-libnotify/Manifest b/x11-plugins/pidgin-libnotify/Manifest index 1129feacf..cdc05c155 100644 --- a/x11-plugins/pidgin-libnotify/Manifest +++ b/x11-plugins/pidgin-libnotify/Manifest @@ -1,7 +1,8 @@ AUX fix-notify-osd.diff 801 RMD160 6e8a3d4986dc310df8dd7048f2e8380e069916e5 SHA1 7808b3a31e0627a94dfd3069568cd22328f61ceb SHA256 417f66e77fad5580fdb4e6b15296fc85a37bd916678c7062b5fce8fc58e0042c AUX no_text_in_messages.diff 1683 RMD160 f766b4d71eb74bfd411f2d9ffb4100774fdce41f SHA1 121c98b44f71a8842a78f73ae59a0cd403422070 SHA256 79b79c4f8933a0ea67b2892387c919591e1bf9e40ffa2523d81296903d7b3f5f AUX notify_file_transfers.diff 5487 RMD160 cea60eea3eab5007e316e6995e277b4b0efcd176 SHA1 18e3150096421ef171926536253c276b9630ce49 SHA256 1943416293b4248425c7abcb827e9b2f97a22cd6ac46e99ae8a84d5eade6af7e +AUX pidgin-libnotify-0.14-libnotify-0.7-support.patch 780 RMD160 cbd0c9c61d4f3fcca2f765cf7b3d166ac888bc42 SHA1 c1d28339fe72d14deea6b96f7fc4013873bc16c3 SHA256 43e40fb227a3b4bbfba11b99c0aa67fc1f4bfce1ead40466160a3392d5654fb9 AUX pidgin-libnotify-showbutton.patch 425 RMD160 6713fe0e16ad1d444a6f212d7f8c1972aa1659fa SHA1 7fe8bd4cf83b789b1da53af4ec81221667d8a3c2 SHA256 897a1f99255476110dd3d5e888134f255e60e9539f65e8c3c516640a0790838b AUX pidgin-libnotify_best_name.diff 673 RMD160 378111da40e1344cbfb479fcdf72d0fcf323c76e SHA1 1a28ae428275386350b36646ca50312c14b0355a SHA256 81e144ca0809cf0b11c28aab64eff5ed28c9398f31a2c46d57fb126e98e80b81 DIST pidgin-libnotify-0.14.tar.gz 316365 RMD160 39d3f1a6339bb76c774273367b4a2e67c2a4b375 SHA1 005e9663c7a36f68b9572341654818720a1e571a SHA256 74f4a9f20e0a483df39974178f1f2380786176189512bcd438e4ada280ec3abe -EBUILD pidgin-libnotify-0.14-r1.ebuild 1529 RMD160 4ab172ffb5d7c4cb1e1b80a95cc631b36093f4a1 SHA1 a9e60741ad39277e7046bc7773363db33cc97e64 SHA256 99972a9ad165539fcd1a9378af56fc67a05d93f8a08bb584cab1a059cb34e3fc +EBUILD pidgin-libnotify-0.14-r1.ebuild 1664 RMD160 054b2977433385df31cfb38cf676eb89746de77b SHA1 428727c7abe30fbb8b032f7ec612e972e481a39c SHA256 7af130901e63de8d0c2f5298a16998953336b4450d3aad8d4d100b77562f1181 diff --git a/x11-plugins/pidgin-libnotify/files/pidgin-libnotify-0.14-libnotify-0.7-support.patch b/x11-plugins/pidgin-libnotify/files/pidgin-libnotify-0.14-libnotify-0.7-support.patch new file mode 100644 index 000000000..649da35a9 --- /dev/null +++ b/x11-plugins/pidgin-libnotify/files/pidgin-libnotify-0.14-libnotify-0.7-support.patch @@ -0,0 +1,16 @@ +diff -ur pidgin-libnotify-0.14/src/pidgin-libnotify.c pidgin-libnotify-0.14.new/src/pidgin-libnotify.c +--- pidgin-libnotify-0.14/src/pidgin-libnotify.c 2008-12-14 17:45:51.000000000 +0000 ++++ pidgin-libnotify-0.14.new/src/pidgin-libnotify.c 2011-03-14 21:09:23.523914000 +0000 +@@ -286,7 +286,12 @@ + g_free (tr_body); + return; + } ++/* the fourth argument was removed in libnotify 0.7.0 */ ++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7) + notification = notify_notification_new (title, tr_body, NULL, NULL); ++#else ++ notification = notify_notification_new (title, tr_body, NULL); ++#endif + purple_debug_info (PLUGIN_ID, "notify(), new: " + "title: '%s', body: '%s', buddy: '%s'\n", + title, tr_body, best_name (buddy)); diff --git a/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r1.ebuild b/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r1.ebuild index 31c5ce0d4..671ba998a 100644 --- a/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r1.ebuild +++ b/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r1.ebuild @@ -23,6 +23,9 @@ DEPEND="${RDEPEND} dev-util/pkgconfig" src_prepare() { + epatch "${FILESDIR}"/${P}-libnotify-0.7-support.patch + # Source: Thev00d00 + # Make it build with libnotify 0.7 epatch "${FILESDIR}"/pidgin-libnotify-showbutton.patch # A collection of patches submitted to the (dead?) upstream # Source: Debian @@ -35,7 +38,7 @@ src_prepare() { # Source: Sourceforge patches page # Enables file transfer notifications epatch "${FILESDIR}"/notify_file_transfers.diff - # Source: Thev00d00, + # Source: Thev00d00 # A version of the same patch found on ${HOMEPAGE} # Use what Purple thinks is the most appropriate name epatch "${FILESDIR}"/pidgin-libnotify_best_name.diff @@ -44,6 +47,7 @@ src_prepare() { src_configure() { econf \ --disable-static \ + --disable-deprecated \ $(use_enable debug) \ $(use_enable nls) }