Better patch for >=libnotify-0.7

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

5 files changed, 161 insertions, 23 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index a0cf9e287ae3..bc9968181da8 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,13 @@
 # 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.293 2011/01/30 09:32:21 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.294 2011/01/30 09:51:43 polynomial-c Exp $
+
+*xchat-2.8.8-r2 (30 Jan 2011)
+
+  30 Jan 2011; Lars Wendler <polynomial-c@gentoo.org> xchat-2.8.8-r1.ebuild,
+  +xchat-2.8.8-r2.ebuild, files/xchat-2.8.8-libnotify07.patch:
+  Better patch for >=libnotify-0.7. Don't impose this to stable users yet so
+  moving this to -r2.
 
   30 Jan 2011; Lars Wendler <polynomial-c@gentoo.org> xchat-2.8.8-r1.ebuild,
   +files/xchat-2.8.8-libnotify07.patch:
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index e1866753f5f1..ae3bc5e76470 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -1,11 +1,12 @@
 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-2.8.8-libnotify07.patch 1705 RMD160 7e18b5dc3b0ca420d50f349b860f516f53c7a780 SHA1 fab2c7053b5889d7a0aa65a25a3bda2958c47125 SHA256 dc63ab7c32091a02b3c3a3e743ab209be52d584b75b577b55d9859a8f9dac0e0
 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 2844 RMD160 38c41ee2356a4df9b041c7f754ef01a56e645212 SHA1 fea539facccb664213b6f19d17046725c85832fc SHA256 f45be879ce65e093cb96bdb41b7b625372ed82a5f5e1d17c0fe565ff560c6e07
-MISC ChangeLog 43703 RMD160 0bc4bedbaec0391ac12911ac9aa113c4f53b6164 SHA1 85b964996b11c2708acd2a715d10bb1e7dd7a012 SHA256 91182288c93a0b51a40f4f0c7d0b3058c2bcad3b9079095ca8891a3227916d1c
+EBUILD xchat-2.8.8-r1.ebuild 2799 RMD160 a6ca5a56b8a87d2a1f14e5da2d58e5b01cee28e8 SHA1 8816e624696c03f04656b22254f4c3f55c1a632b SHA256 fc1e9e24e2b55645c4ca4ab1145a482c2d4ed4a7d1ffa5f73f359ebb57a67b6c
+EBUILD xchat-2.8.8-r2.ebuild 2853 RMD160 6e9ffffa9950f555ea0924098c2e9394861b131b SHA1 06013d5c3e8f30d64547c694d464fb3a26e3f235 SHA256 0afc2ea73e298d0ba734200b60281b308f06a443b8b1a158694f452e622a2f91
+MISC ChangeLog 43974 RMD160 f3cb3813b4b68fa6636c93f9dd5a1648baed259a SHA1 7a09d42f84880d65401ddd785f1c8ce7830e37fa SHA256 61fbd2af5f18e8d80471d741b9b3b603e3f952838d9c216d954854be84e9ed77
 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
index 2a6dce9a268d..af80a65acec4 100644
--- a/net-irc/xchat/files/xchat-2.8.8-libnotify07.patch
+++ b/net-irc/xchat/files/xchat-2.8.8-libnotify07.patch
@@ -1,24 +1,51 @@
-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);
+Port libnotify support to 0.7
+
+* Forwards/backwards-compatible, don't need a recompile when upgrading libnotify
+* Haven't tested with older libnotify, but should work fine
+* nn_new() takes the same no. of arguments because everything except the first
+  argument is optional, and the last argument passed is supposed to be NULL.
+
+---
+--- a/src/fe-gtk/plugin-tray.c
++++ b/src/fe-gtk/plugin-tray.c
+@@ -145,6 +145,7 @@
+ libnotify_notify_new (const char *title, const char *text, GtkStatusIcon *icon)
+ {
+ 	void *noti;
++	int libnotify_version = 0;
  
-@@ -160,8 +161,6 @@ libnotify_notify_new (const char *title,
- 			goto bad;
+ 	if (!nn_mod)
+ 	{
+@@ -152,8 +153,13 @@
+ 		if (!nn_mod)
+ 		{
+ 			nn_mod = g_module_open ("libnotify.so.1", G_MODULE_BIND_LAZY);
+-			if (!nn_mod)
+-				return FALSE;
++			if (!nn_mod) {
++				nn_mod = g_module_open ("libnotify.so.4", G_MODULE_BIND_LAZY);
++				if (!nn_mod)
++					return FALSE;
++				libnotify_version = 4;
++			}
++			libnotify_version = 1;
+ 		}
+ 
+ 		if (!g_module_symbol (nn_mod, "notify_init", (gpointer)&nn_init))
+@@ -161,7 +167,15 @@
  		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))
+ 		if (!g_module_symbol (nn_mod, "notify_notification_new_with_status_icon", (gpointer)&nn_new_with_status_icon))
 -			goto bad;
++			if (libnotify_version == 1)
++				/* We know we're using API version 1, but something is wrong */
++				goto bad;
++			else
++				/* It's probably API version 4, aka libnotify-0.7 */
++				libnotify_version = 4;
++		else
++			/* Only this API version has notify_notification_new_with_status_icon */
++			libnotify_version = 1;
  		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 903caf72c62e..11b82dbd8cbd 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.4 2011/01/30 09:32:21 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild,v 1.5 2011/01/30 09:51:43 polynomial-c Exp $
 
 EAPI=2
 
@@ -43,7 +43,6 @@ 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
 
diff --git a/net-irc/xchat/xchat-2.8.8-r2.ebuild b/net-irc/xchat/xchat-2.8.8-r2.ebuild
new file mode 100644
index 000000000000..8d205eab5cc6
--- /dev/null
+++ b/net-irc/xchat/xchat-2.8.8-r2.ebuild
@@ -0,0 +1,104 @@
+# 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-r2.ebuild,v 1.1 2011/01/30 09:51:43 polynomial-c Exp $
+
+EAPI=2
+
+inherit eutils versionator gnome2 autotools
+
+DESCRIPTION="Graphical IRC client"
+SRC_URI="http://www.xchat.org/files/source/$(get_version_component_range 1-2)/${P}.tar.bz2
+	mirror://sourceforge/${PN}/${P}.tar.bz2
+	xchatdccserver? ( mirror://gentoo/${PN}-dccserver-0.6.patch.bz2 )"
+HOMEPAGE="http://www.xchat.org/"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dbus fastscroll +gtk ipv6 libnotify mmx nls ntlm perl python spell ssl tcl xchatdccserver"
+
+RDEPEND=">=dev-libs/glib-2.6.0
+	gtk? ( >=x11-libs/gtk+-2.10.0 )
+	ssl? ( >=dev-libs/openssl-0.9.6d )
+	perl? ( >=dev-lang/perl-5.8.0 )
+	python? ( >=dev-lang/python-2.2 )
+	tcl? ( dev-lang/tcl )
+	dbus? ( >=dev-libs/dbus-glib-0.71 )
+	spell? ( app-text/gtkspell )
+	libnotify? ( x11-libs/libnotify )
+	ntlm? ( net-libs/libntlm )
+	x11-libs/pango
+	!<net-irc/xchat-gnome-0.9"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.16
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# Added for to fix a sparc seg fault issue by Jason Wever <weeve@gentoo.org>
+	if [[ ${ARCH} = sparc ]] ; then
+		replace-flags "-O[3-9]" "-O2"
+	fi
+}
+
+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
+	if [ $(get_libdir) != "lib" ] ; then
+		sed -i -e 's:${prefix}/lib/xchat:${libdir}/xchat:' \
+			"${S}"/configure.in || die
+	fi
+
+	# xchat sourcecode ships with po/Makefile.in.in from gettext-0.17
+	# which fails with >=gettext-0.18
+	cp /usr/share/gettext/po/Makefile.in.in "${S}"/po/ || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# xchat's configure script uses sys.path to find library path
+	# instead of python-config (#25943)
+	unset PYTHONPATH
+
+	econf \
+		--enable-shm \
+		$(use_enable dbus) \
+		$(use_enable ipv6) \
+		$(use_enable mmx) \
+		$(use_enable nls) \
+		$(use_enable ntlm) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable spell spell gtkspell) \
+		$(use_enable ssl openssl) \
+		$(use_enable tcl) \
+		$(use_enable gtk gtkfe) \
+		$(use_enable fastscroll xft)
+}
+
+src_install() {
+	USE_DESTDIR=1 gnome2_src_install || die "make install failed"
+
+	# install plugin development header
+	insinto /usr/include/xchat
+	doins src/common/xchat-plugin.h || die "doins failed"
+
+	dodoc ChangeLog README* || die "dodoc failed"
+}
+
+pkg_postinst() {
+	elog
+	elog "XChat binary has been renamed from xchat-2 to xchat."
+	elog
+
+	if has_version net-irc/xchat-systray
+	then
+		elog "XChat now includes it's own systray icon, you may want to remove net-irc/xchat-systray."
+		elog
+	fi
+}