add gtk-2.6 patch, #79125

Package-Manager: portage-2.0.51-r15

8 files changed, 156 insertions, 15 deletions

diff --git a/net-p2p/gtk-gnutella/ChangeLog b/net-p2p/gtk-gnutella/ChangeLog
index 139d4a64e706..ed6a923e7c15 100644
--- a/net-p2p/gtk-gnutella/ChangeLog
+++ b/net-p2p/gtk-gnutella/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/gtk-gnutella
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/ChangeLog,v 1.35 2004/11/28 22:01:50 squinky86 Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/ChangeLog,v 1.36 2005/01/30 20:46:05 squinky86 Exp $
+
+*gtk-gnutella-0.95-r1 (30 Jan 2005)
+
+  30 Jan 2005; Jon Hood <squinky86@gentoo.org> +files/0.95-gtk2.6.patch,
+  +gtk-gnutella-0.95-r1.ebuild:
+  Add gtk patch, #79125; thanks Jani Alanko <jpalan@utu.fi> and Tim Hentenaar
+  <tth@one.net>.
 
 *gtk-gnutella-0.95 (28 Nov 2004)
 
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index eb4c83b466d9..12173f4d8c6d 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,11 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 525f40efe30add307b4ce1300da83c23 gtk-gnutella-0.95.ebuild 2173
-MD5 4dc203e83278b8ac3f22b6160b61c8c3 gtk-gnutella-0.93.3.ebuild 2170
-MD5 294bb31515a44112e192d5d2d49a8d50 gtk-gnutella-0.94.ebuild 2169
-MD5 9be670fbd93ca929d28d541023a5ac21 ChangeLog 6745
+MD5 ac7b5fdd25081e770b893bdb03ccb396 gtk-gnutella-0.95.ebuild 2173
+MD5 fe69f7664dc6bd27f2fff6a10c2c7b14 gtk-gnutella-0.95-r1.ebuild 2271
+MD5 ebfcbcbd629e41daf43f4812e1c0bf01 gtk-gnutella-0.93.3.ebuild 2171
+MD5 7a3c478921c6f4ce5514dc7ac9a248c6 gtk-gnutella-0.94.ebuild 2170
+MD5 0793db8068e0bafca501e33bbb11a817 ChangeLog 6983
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
+MD5 4fe4d39aa46ee9377a21fd889a537111 files/digest-gtk-gnutella-0.95-r1 71
+MD5 ae9bb9e16331554a4cb95a17526ae2e5 files/0.95-gtk2.6.patch 1475
 MD5 e65fa40ee2f1d02bdb6f329e7ed2f577 files/digest-gtk-gnutella-0.93.3 73
 MD5 0083753249fe618068f133b145544070 files/digest-gtk-gnutella-0.94 71
 MD5 4fe4d39aa46ee9377a21fd889a537111 files/digest-gtk-gnutella-0.95 71
@@ -13,7 +16,7 @@ MD5 d567f5847cfc94df6b1c79436514016f files/gtk-gnutella.desktop 155
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBqkracAgAdbxYsnERAhdTAJ9AZodI+P8MmpcmOU6TwJjkdU6QQwCfWvzL
-AW9nbju9T+foZu4+ZKtYwxU=
-=F4a4
+iD8DBQFB/UedcAgAdbxYsnERAstcAJ0cXFj3/3gslK0+YJYlH9okbnw0RQCfdKUk
+44vSk/TiEYe3JoDgHQDPnPs=
+=K6ry
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/gtk-gnutella/files/0.95-gtk2.6.patch b/net-p2p/gtk-gnutella/files/0.95-gtk2.6.patch
new file mode 100644
index 000000000000..12f41943e173
--- /dev/null
+++ b/net-p2p/gtk-gnutella/files/0.95-gtk2.6.patch
@@ -0,0 +1,40 @@
+diff -ur gtk-gnutella-0.95-old/src/ui/gtk/gtk2/pbarcellrenderer.c gtk-gnutella-0.95/src/ui/gtk/gtk2/pbarcellrenderer.c
+--- gtk-gnutella-0.95-old/src/ui/gtk/gtk2/pbarcellrenderer.c	2005-01-25 01:24:15.291080696 -0500
++++ gtk-gnutella-0.95/src/ui/gtk/gtk2/pbarcellrenderer.c	2005-01-25 01:37:07.614669664 -0500
+@@ -51,6 +51,9 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
++/* If we're using GTK 2.6, this is obsolete - Tim Hentenaar */
++#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 6
++
+ #include "gtk/gui.h"
+ 
+ RCSID("$Id: 0.95-gtk2.6.patch,v 1.1 2005/01/30 20:46:05 squinky86 Exp $");
+@@ -426,5 +429,5 @@
+ 	G_FREE_NULL(cellprogress->priv);
+ 	(*G_OBJECT_CLASS(parent_class)->finalize)(object);
+ }
+-
++#endif		/* GTK < 2.6 */
+ /* vi: set ts=4: */
+diff -ur gtk-gnutella-0.95-old/src/ui/gtk/gtk2/pbarcellrenderer.h gtk-gnutella-0.95/src/ui/gtk/gtk2/pbarcellrenderer.h
+--- gtk-gnutella-0.95-old/src/ui/gtk/gtk2/pbarcellrenderer.h	2005-01-25 01:24:15.291080696 -0500
++++ gtk-gnutella-0.95/src/ui/gtk/gtk2/pbarcellrenderer.h	2005-01-25 01:35:55.844580376 -0500
+@@ -49,6 +49,9 @@
+ #ifndef _gtk2_pbarcellrenderer_h_
+ #define _gtk2_pbarcellrenderer_h_
+ 
++/* If we're using GTK 2.6, this is obsolete - Tim Hentenaar */
++#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 6
++
+ #include <gtk/gtkcellrenderer.h>
+ #include "gtk/gui.h"
+ 
+@@ -76,5 +79,5 @@
+ GtkCellRenderer* gtk_cell_renderer_progress_new(void);
+ 
+ G_END_DECLS
+-
++#endif	/* GTK < 2.6 */
+ #endif	/* _gtk2_pbarcellrenderer_h_ */
diff --git a/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.95-r1 b/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.95-r1
new file mode 100644
index 000000000000..ce69308b780b
--- /dev/null
+++ b/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.95-r1
@@ -0,0 +1 @@
+MD5 de2ff4973c975ee16cdd69ca72c06bcd gtk-gnutella-0.95.tar.bz2 2191028
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.93.3.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.93.3.ebuild
index c3ec3e9c8fa6..6f78aa23e30f 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-0.93.3.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-0.93.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.93.3.ebuild,v 1.8 2004/10/04 22:01:32 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.93.3.ebuild,v 1.9 2005/01/30 20:46:05 squinky86 Exp $
 
 IUSE="gnome gtk2 xml2 nls"
 
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.94.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.94.ebuild
index 5065e49b7bdf..d178ce53914a 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-0.94.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-0.94.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.94.ebuild,v 1.5 2004/10/04 22:01:32 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.94.ebuild,v 1.6 2005/01/30 20:46:05 squinky86 Exp $
 
 IUSE="gnome gtk2 xml2 nls"
 
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.95-r1.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.95-r1.ebuild
new file mode 100644
index 000000000000..4c2123ea5f2f
--- /dev/null
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-0.95-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.95-r1.ebuild,v 1.1 2005/01/30 20:46:05 squinky86 Exp $
+
+inherit eutils
+
+IUSE="gnome gtk2 xml2 nls"
+
+DESCRIPTION="A GTK+ Gnutella client"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+RESTRICT="nomirror"
+HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+
+DEPEND="xml2? ( dev-libs/libxml2 )
+	gtk2? ( =dev-libs/glib-2* =x11-libs/gtk+-2* )
+	!gtk2? ( =dev-libs/glib-1.2* =x11-libs/gtk+-1.2* )
+	dev-util/yacc
+	nls? ( >=sys-devel/gettext-0.11.5 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gtk2.6.patch
+}
+
+src_compile() {
+	local myconf
+
+	if use gtk2; then
+		myconf="-Dgtkversion=2"
+	else
+		myconf="-Dgtkversion=1"
+	fi
+
+	if use xml2; then
+		myconf="${myconf} -Dd_libxml2"
+	else
+		myconf="${myconf} -Ud_libxml2"
+	fi
+
+	if use nls; then
+		myconf="${myconf} -Dd_enablenls -Dgmsgfmt=\"/usr/bin/msgfmt\" -Dmsgfmt=\"/usr/bin/msgfmt\""
+	else
+		myconf="${myconf} -Ud_enablenls"
+	fi
+
+	./Configure -d -s -e \
+		-Dprefix="/usr" \
+		-Dprivlib="/usr/share/gtk-gnutella" \
+		-Dccflags="${CFLAGS}" \
+		${myconf} \
+		-Doptimize=" " \
+		-Dofficial="true" || die "Configure failed"
+
+	emake || die "Compile failed"
+}
+
+src_install() {
+	dodir /usr/bin
+	make INSTALL_PREFIX=${D} install || die "Install failed"
+	find ${D}/usr/share -type f -exec chmod a-x {} \;
+	dodoc AUTHORS ChangeLog README TODO
+
+	if use gnome; then
+		insinto /usr/share/gnome/apps/Internet
+		doins ${FILESDIR}/gtk-gnutella.desktop || die
+	fi
+}
+
+pkg_postinst() {
+	if use gtk2; then
+		ewarn "The GTK2 interface currently does not have a maintainer--not all"
+		ewarn "options which are available in the GTK1 interface might have made"
+		ewarn "it in the GTK2 interface.  The GTK2 interface also"
+		ewarn "has a known bug which causes an invalid assertion if"
+		ewarn "you select passive search"
+		echo
+	fi
+
+	if ! use xml2; then
+		ewarn "You have installed gtk-gnutella without xml2 support. As such, your"
+		ewarn "search filters may not be saved when you quit the application."
+		einfo "If you would like this feature enabled, re-emerge with USE=\"xml2\"."
+		echo
+	fi
+}
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.95.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.95.ebuild
index 1f87b0fb10d7..1202ba71b84d 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-0.95.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-0.95.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.95.ebuild,v 1.1 2004/11/28 22:01:50 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.95.ebuild,v 1.2 2005/01/30 20:46:05 squinky86 Exp $
 
 IUSE="gnome gtk2 xml2 nls"