Added support for >=libnotify-0.7

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

4 files changed, 35 insertions, 4 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index cc4d42a7ec5f..a0cf9e287ae3 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/xchat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.292 2011/01/19 21:23:30 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.293 2011/01/30 09:32:21 polynomial-c Exp $
+
+  30 Jan 2011; Lars Wendler <polynomial-c@gentoo.org> xchat-2.8.8-r1.ebuild,
+  +files/xchat-2.8.8-libnotify07.patch:
+  Added support for >=libnotify-0.7
 
   19 Jan 2011; Lars Wendler <polynomial-c@gentoo.org> xchat-2.8.8-r1.ebuild:
   Renamed xchatnogtk USE flag to gtk. Thanks to Pablo Barros for bringing my
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index 539e7bac289d..e1866753f5f1 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -1,10 +1,11 @@
 AUX xc286-smallfixes.diff 2020 RMD160 91c654320b7b1f9d6b13f7b226fb4cec26054319 SHA1 b13eb421f6d72fca195b398c606d9413aec57fc4 SHA256 08c31e4d8d792f101047362cb25c529389c9fa254e2139a678491ee4e1fe58ff
 AUX xchat-2.8.6-shm-pixmaps.patch 2711 RMD160 0052d6981752d19cf4876180f00a57b4c503f0c8 SHA1 3731d5c7ac04f053da923406fc73df37ff7802df SHA256 984174ea711fbb7b2d7817e838fb5ad54f4c414ca5f6004994f15bf790279060
+AUX xchat-2.8.8-libnotify07.patch 1461 RMD160 6f49bcba9c5101822ead4b9cce7484de855fa8a6 SHA1 a053fba4e1911d1ee6a8248fe19e344797920fe3 SHA256 aaa656fde8a9644d19bda1604ba213a275621430558fcfe97f9064a5b7902acf
 AUX xchat-input-box4.patch 1116 RMD160 a5f51ab0505b3f9724a7be6ed0199b60e94b6189 SHA1 055270f24defcdc327292bafb06ad21b8a4230e5 SHA256 a9f2e833afe4066d0e1e9f404eae79c90caa9c0a6a53c5201e6d3498a6ad3b6b
 DIST xchat-2.8.6.tar.bz2 1423645 RMD160 bc199e3b58a9db3dfd9f2af6bac7fb6162c53d6e SHA1 7a7463e65cb26c680ed70dd96cec98bcc05435a4 SHA256 8c89dbf36304b99363a7f090d695447653102b4528ca2aa367a2abe5cff1746d
 DIST xchat-2.8.8.tar.bz2 1509993 RMD160 1bc3e0ff00e15c83588dd21a3ef3e8e34f953331 SHA1 a4ac161e4e40f4bbabc492675a1ff4380dba8d68 SHA256 0d6d69437b5e1e45f3e66270fe369344943de8a1190e498fafa5296315a27db0
 DIST xchat-dccserver-0.6.patch.bz2 49320 RMD160 24cc9bd414b1dd0e7e38ba9a49d12257aeb89e68 SHA1 e7b8b58cf7f647ff8778c7542cd46e9b22987385 SHA256 90a49a8d810380020c507c1a36f02e7d972cf92b5e4802dcd5cc518cba29078f
 EBUILD xchat-2.8.6-r2.ebuild 2809 RMD160 ef7c11cef8a96acaeb1ebc05a0b6e6c59de738c9 SHA1 45cc0900a12f3b0d1d1a4c15beb65cec21d63bc6 SHA256 a27b5975fba8cffe708a67749fefb6d31361d78ab4cd98423fa7028d9b87e078
-EBUILD xchat-2.8.8-r1.ebuild 2798 RMD160 b3ffb5ad98dfc1579288a29e23abcce2e3b603ed SHA1 481bcfe0dc167a9f0bb169dc84c7772f0df5e177 SHA256 fa4893a63a37625a4c6952c18e24a694e74dd44ddcd6f9811ba1af57b210b192
-MISC ChangeLog 43549 RMD160 df37c5ccd7b0482f556c389de6c487322a7ebb37 SHA1 bde884a8d088748514b8329c141067341ec867e9 SHA256 6883f4eaf861bb9be109c5e99f409efa3cce5f8b47d72735a2d1981fd093533b
+EBUILD xchat-2.8.8-r1.ebuild 2844 RMD160 38c41ee2356a4df9b041c7f754ef01a56e645212 SHA1 fea539facccb664213b6f19d17046725c85832fc SHA256 f45be879ce65e093cb96bdb41b7b625372ed82a5f5e1d17c0fe565ff560c6e07
+MISC ChangeLog 43703 RMD160 0bc4bedbaec0391ac12911ac9aa113c4f53b6164 SHA1 85b964996b11c2708acd2a715d10bb1e7dd7a012 SHA256 91182288c93a0b51a40f4f0c7d0b3058c2bcad3b9079095ca8891a3227916d1c
 MISC metadata.xml 616 RMD160 9c8aea431330569cc9ee7d639072aff4373ac976 SHA1 7dc786ec0feca78b6a0cdef18acb28c1c77aa6c0 SHA256 626f8b55f28bfe0c9e0a0ddd953ff7325969beade7f5cd528888ae3ba78d9dcf
diff --git a/net-irc/xchat/files/xchat-2.8.8-libnotify07.patch b/net-irc/xchat/files/xchat-2.8.8-libnotify07.patch
new file mode 100644
index 000000000000..2a6dce9a268d
--- /dev/null
+++ b/net-irc/xchat/files/xchat-2.8.8-libnotify07.patch
@@ -0,0 +1,24 @@
+diff -up xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07 xchat-2.8.8/src/fe-gtk/plugin-tray.c
+--- xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07	2010-11-15 17:32:15.708325783 -0500
++++ xchat-2.8.8/src/fe-gtk/plugin-tray.c	2010-11-15 18:05:17.322141789 -0500
+@@ -125,8 +125,9 @@ static void *nn_mod = NULL;
+ /* prototypes */
+ static gboolean (*nn_init) (char *);
+ static void (*nn_uninit) (void);
+-static void *(*nn_new_with_status_icon) (const gchar *summary, const gchar *message, const gchar *icon, GtkStatusIcon *status_icon);
+-static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, GtkWidget *attach);
++/* recent versions of libnotify don't take the fourth GtkWidget argument, but passing an
++ * extra NULL argument will be fine */
++static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, gpointer dummy);
+ static gboolean (*nn_show) (void *noti, GError **error);
+ static void (*nn_set_timeout) (void *noti, gint timeout);
+ 
+@@ -160,8 +161,6 @@ libnotify_notify_new (const char *title,
+ 			goto bad;
+ 		if (!g_module_symbol (nn_mod, "notify_uninit", (gpointer)&nn_uninit))
+ 			goto bad;
+-		if (!g_module_symbol (nn_mod, "notify_notification_new_with_status_icon", (gpointer)&nn_new_with_status_icon))
+-			goto bad;
+ 		if (!g_module_symbol (nn_mod, "notify_notification_new", (gpointer)&nn_new))
+ 			goto bad;
+ 		if (!g_module_symbol (nn_mod, "notify_notification_show", (gpointer)&nn_show))
diff --git a/net-irc/xchat/xchat-2.8.8-r1.ebuild b/net-irc/xchat/xchat-2.8.8-r1.ebuild
index 83241fb6ec70..903caf72c62e 100644
--- a/net-irc/xchat/xchat-2.8.8-r1.ebuild
+++ b/net-irc/xchat/xchat-2.8.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild,v 1.3 2011/01/19 21:23:30 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild,v 1.4 2011/01/30 09:32:21 polynomial-c Exp $
 
 EAPI=2
 
@@ -43,6 +43,8 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-input-box4.patch
+	epatch "${FILESDIR}"/${P}-libnotify07.patch
+
 	use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2
 
 	# use libdir/xchat/plugins as the plugin directory