compile fix for gtk2.2

4 files changed, 44 insertions, 2 deletions

diff --git a/net-ftp/gftp/ChangeLog b/net-ftp/gftp/ChangeLog
index d170610fddfa..aeb41661961e 100644
--- a/net-ftp/gftp/ChangeLog
+++ b/net-ftp/gftp/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-ftp/gftp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/ChangeLog,v 1.15 2003/04/05 03:25:57 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/ChangeLog,v 1.16 2003/04/13 22:43:52 liquidx Exp $
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
@@ -22,6 +22,10 @@
 
 *gftp-2.0.13 (23 Jul 2002)
 
+  13 Apr 2003; Alastair Tse <liquidx@gentoo.org> gftp-2.0.13.ebuild,
+  files/gftp-2.0.13-gtk2.2.patch:
+  fix compile problems with gtk2.2
+
   20 Aug 2002; Mark Guertin <gerk@gentoo.org> gftp-2.0.13.ebuild :
   Added ppc to keywords
 
diff --git a/net-ftp/gftp/Manifest b/net-ftp/gftp/Manifest
new file mode 100644
index 000000000000..a855b64b690e
--- /dev/null
+++ b/net-ftp/gftp/Manifest
@@ -0,0 +1,8 @@
+MD5 9470bf52f8a653dd4a26f1a71a604292 ChangeLog 2386
+MD5 799ae8f467b0fc4c5086c7b09fedeb8b gftp-2.0.13.ebuild 1032
+MD5 cb97912c4eeeabec9fe34baf6fc5fdfa gftp-2.0.14.ebuild 997
+MD5 80be8d608e0679dd6a92c30e3c7369f7 gftp-2.0.14_rc1.ebuild 1022
+MD5 8e7b5678687f0a6685df59ecfc697c86 files/digest-gftp-2.0.13 63
+MD5 4a567cc97f7b5318979193135b98eafd files/digest-gftp-2.0.14 64
+MD5 35ad6821c6e09d90227714f8b087f565 files/digest-gftp-2.0.14_rc1 67
+MD5 ad3e717963c174555b2afb27f7c2a61e files/gftp-2.0.13-gtk2.2.patch 1013
diff --git a/net-ftp/gftp/files/gftp-2.0.13-gtk2.2.patch b/net-ftp/gftp/files/gftp-2.0.13-gtk2.2.patch
new file mode 100644
index 000000000000..5f47249f3817
--- /dev/null
+++ b/net-ftp/gftp/files/gftp-2.0.13-gtk2.2.patch
@@ -0,0 +1,22 @@
+--- src/gtk/gftp-gtk.c	2002-07-17 13:05:33.000000000 +0100
++++ src/gtk/gftp-gtk.c	2003-04-13 22:53:01.000000000 +0100
+@@ -62,7 +62,7 @@
+ GtkWidget * stop_btn, * hostedit, * useredit, * passedit, * portedit, * logwdw,
+           * dlwdw, * protocol_menu, * optionmenu;
+ GtkAdjustment * logwdw_vadj;
+-#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION == 0
++#if GTK_MAJOR_VERSION > 1
+ GtkTextMark * logwdw_textmark;
+ #endif
+ int local_start, remote_start, trans_start, log_start, tools_start;
+--- src/gtk/gftp-gtk.h	2002-07-17 11:37:18.000000000 +0100
++++ src/gtk/gftp-gtk.h	2003-04-13 22:58:46.000000000 +0100
+@@ -102,7 +102,7 @@
+ extern GtkWidget * stop_btn, * hostedit, * useredit, * passedit,
+                  * portedit, * logwdw, * dlwdw, * protocol_menu, * optionmenu;
+ extern GtkAdjustment * logwdw_vadj;
+-#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION == 0
++#if GTK_MAJOR_VERSION > 1
+ extern GtkTextMark * logwdw_textmark;
+ #endif
+ extern int local_start, remote_start, trans_start, log_start, tools_start;
diff --git a/net-ftp/gftp/gftp-2.0.13.ebuild b/net-ftp/gftp/gftp-2.0.13.ebuild
index 188c7d030e4f..149695a98034 100644
--- a/net-ftp/gftp/gftp-2.0.13.ebuild
+++ b/net-ftp/gftp/gftp-2.0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.13.ebuild,v 1.6 2003/02/13 14:03:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.13.ebuild,v 1.7 2003/04/13 22:43:52 liquidx Exp $
 
 IUSE="nls gtk2"
 
@@ -19,6 +19,14 @@ DEPEND="virtual/x11
 
 RDEPEND="nls? ( sys-devel/gettext )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# fix to allow compiling against >=x11-libs/gtk+-2.2
+	# for gftp-2.0.13 only, fixed in 2.0.14
+	patch -p0 < ${FILESDIR}/${P}-gtk2.2.patch || die "died applying patch"
+}
+
 src_compile() {
 	local myconf