From dcd31e5a81ce246bc8460d1ecce005154b0c6bde Mon Sep 17 00:00:00 2001 From: Marinus Schraal <foser@gentoo.org> Date: Mon, 14 Feb 2005 16:05:42 +0000 Subject: add patch for buildtime issue --- net-ftp/gftp/ChangeLog | 7 ++- net-ftp/gftp/Manifest | 3 ++ net-ftp/gftp/files/digest-gftp-2.0.18 | 1 - net-ftp/gftp/files/digest-gftp-2.0.18-r1 | 1 + net-ftp/gftp/files/gftp-2.0.18-fix_gtk1.patch | 31 ++++++++++++ net-ftp/gftp/gftp-2.0.18-r1.ebuild | 73 +++++++++++++++++++++++++++ net-ftp/gftp/gftp-2.0.18.ebuild | 59 ---------------------- 7 files changed, 114 insertions(+), 61 deletions(-) delete mode 100644 net-ftp/gftp/files/digest-gftp-2.0.18 create mode 100644 net-ftp/gftp/files/digest-gftp-2.0.18-r1 create mode 100644 net-ftp/gftp/files/gftp-2.0.18-fix_gtk1.patch create mode 100644 net-ftp/gftp/gftp-2.0.18-r1.ebuild delete mode 100644 net-ftp/gftp/gftp-2.0.18.ebuild (limited to 'net-ftp/gftp') diff --git a/net-ftp/gftp/ChangeLog b/net-ftp/gftp/ChangeLog index 67c65855c3e6..e7c9a1fd016d 100644 --- a/net-ftp/gftp/ChangeLog +++ b/net-ftp/gftp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-ftp/gftp # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/ChangeLog,v 1.38 2005/02/14 15:15:17 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/ChangeLog,v 1.39 2005/02/14 16:05:42 foser Exp $ + +*gftp-2.0.18-r1 (14 Feb 2005) + + 14 Feb 2005; foser <foser@gentoo.org> gftp-2.0.18-r1.ebuild : + Add patch to fix buildtime issue (#80845) 14 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> gftp-2.0.18.ebuild: stable on amd64. see #81994 diff --git a/net-ftp/gftp/Manifest b/net-ftp/gftp/Manifest index a949a792f6b4..4807191b2bd0 100644 --- a/net-ftp/gftp/Manifest +++ b/net-ftp/gftp/Manifest @@ -1,3 +1,4 @@ +MD5 cf3fdd7dd8aa846765af20635e6def5c gftp-2.0.18-r1.ebuild 1465 MD5 78d63cb9cc2782d47f9e63c25457e0e0 gftp-2.0.14.ebuild 968 MD5 87bb122a99d1d5abc6eb9cffbb26535e gftp-2.0.18.ebuild 1325 MD5 eb32a9a12641bb35892806c33d63cc4e gftp-2.0.16-r1.ebuild 1439 @@ -10,5 +11,7 @@ MD5 f016b30f08a26f30a03721cff7a19ac9 files/digest-gftp-2.0.15 65 MD5 f65f1e254dd63668b5f0db33b4158383 files/digest-gftp-2.0.17 65 MD5 429ea419b557eb768b0be6daa3c8b7e7 files/digest-gftp-2.0.18 65 MD5 77ce85d4218034ac35a17bf59af5b790 files/digest-gftp-2.0.16-r1 65 +MD5 429ea419b557eb768b0be6daa3c8b7e7 files/digest-gftp-2.0.18-r1 65 MD5 ce3187f3e4f80bfb35cf8bef798eb40d files/gftp-2.0.15-64bit_fixes.patch 16360 +MD5 81d77310a3638462af932e435590ab5d files/gftp-2.0.18-fix_gtk1.patch 1095 MD5 23e7696a3f6f2c368d11ca9aaadb7797 files/gftp-2.0.16-ipv6_fix.patch 3279 diff --git a/net-ftp/gftp/files/digest-gftp-2.0.18 b/net-ftp/gftp/files/digest-gftp-2.0.18 deleted file mode 100644 index c99f186437a4..000000000000 --- a/net-ftp/gftp/files/digest-gftp-2.0.18 +++ /dev/null @@ -1 +0,0 @@ -MD5 44b19442d06f6dc68c7211d66029d826 gftp-2.0.18.tar.bz2 1374850 diff --git a/net-ftp/gftp/files/digest-gftp-2.0.18-r1 b/net-ftp/gftp/files/digest-gftp-2.0.18-r1 new file mode 100644 index 000000000000..c99f186437a4 --- /dev/null +++ b/net-ftp/gftp/files/digest-gftp-2.0.18-r1 @@ -0,0 +1 @@ +MD5 44b19442d06f6dc68c7211d66029d826 gftp-2.0.18.tar.bz2 1374850 diff --git a/net-ftp/gftp/files/gftp-2.0.18-fix_gtk1.patch b/net-ftp/gftp/files/gftp-2.0.18-fix_gtk1.patch new file mode 100644 index 000000000000..a7fd44ef3cbe --- /dev/null +++ b/net-ftp/gftp/files/gftp-2.0.18-fix_gtk1.patch @@ -0,0 +1,31 @@ +diff -uNr gftp-2.0.18/src/gtk/options_dialog.c gftp-2.0.18.patched/src/gtk/options_dialog.c +--- gftp-2.0.18/src/gtk/options_dialog.c 2005-01-04 14:32:20.000000000 +0100 ++++ gftp-2.0.18.patched/src/gtk/options_dialog.c 2005-02-14 16:44:10.064677160 +0100 +@@ -1002,7 +1002,7 @@ + gtk_widget_show (box); + + #if GTK_MAJOR_VERSION == 1 +- tempwid = gtk_label_new (_("Type:")) ++ tempwid = gtk_label_new (_("Type:")); + #else + tempwid = gtk_label_new_with_mnemonic (_("_Type:")); + #endif +diff -uNr gftp-2.0.18/src/text/gftp-text.c gftp-2.0.18.patched/src/text/gftp-text.c +--- gftp-2.0.18/src/text/gftp-text.c 2005-01-25 02:11:00.000000000 +0100 ++++ gftp-2.0.18.patched/src/text/gftp-text.c 2005-02-14 16:44:12.299337440 +0100 +@@ -185,6 +185,7 @@ + else + infd = stdin; + ++#if GLIB_MAJOR_VERSION > 1 + locale_question = g_locale_from_utf8 (question, -1, NULL, NULL, NULL); + if (locale_question != NULL) + { +@@ -193,6 +194,7 @@ + g_free (locale_question); + } + else ++#endif + printf ("%s%s%s ", GFTPUI_COMMON_COLOR_BLUE, question, + GFTPUI_COMMON_COLOR_DEFAULT); + diff --git a/net-ftp/gftp/gftp-2.0.18-r1.ebuild b/net-ftp/gftp/gftp-2.0.18-r1.ebuild new file mode 100644 index 000000000000..9e21d36415ec --- /dev/null +++ b/net-ftp/gftp/gftp-2.0.18-r1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.18-r1.ebuild,v 1.1 2005/02/14 16:05:42 foser Exp $ + +inherit eutils + +DESCRIPTION="Gnome based FTP Client" +SRC_URI="http://www.gftp.org/${P}.tar.bz2" +HOMEPAGE="http://www.gftp.org" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc64" +IUSE="nls gtk gtk2 ssl" + +DEPEND="virtual/x11 + ssl? ( dev-libs/openssl ) + gtk? ( + gtk2? ( >=x11-libs/gtk+-2 ) + !gtk2? ( =x11-libs/gtk+-1.2* ) ) + !gtk? ( sys-libs/readline + sys-libs/ncurses + =dev-libs/glib-1.2* )" + +#RDEPEND="nls? ( sys-devel/gettext )" + +src_unpack() { + + unpack ${A} + + cd ${S} + # fix building gtk1 backend (#80845) + epatch ${FILESDIR}/${P}-fix_gtk1.patch + +} + +src_compile() { + + local myconf + + use nls \ + && myconf="--enable-nls" \ + || myconf="--disable-nls" + + # do not use enable-{gtk20,gtkport} they are not recognized + # and will disable building the gtkport alltogether + if use gtk + then + einfo "gtk+ enabled" + use gtk2 \ + && einfo "gtk2 enabled" \ + || myconf="${myconf} --disable-gtk20" + else + einfo "gtk+ and gtk2 disabled" + myconf="${myconf} --disable-gtkport --disable-gtk20" + fi + + use ssl \ + && myconf="${myconf}" \ + || myconf="${myconf} --disable-ssl" + + econf ${myconf} || die + emake || die + +} + +src_install() { + make DESTDIR=${D} install || die + + dodoc COPYING ChangeLog README* THANKS \ + TODO docs/USERS-GUIDE + +} diff --git a/net-ftp/gftp/gftp-2.0.18.ebuild b/net-ftp/gftp/gftp-2.0.18.ebuild deleted file mode 100644 index b42ebf96554a..000000000000 --- a/net-ftp/gftp/gftp-2.0.18.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.18.ebuild,v 1.3 2005/02/14 15:15:17 luckyduck Exp $ - -DESCRIPTION="Gnome based FTP Client" -SRC_URI="http://www.gftp.org/${P}.tar.bz2" -HOMEPAGE="http://www.gftp.org" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~x86 ~ppc ~sparc amd64 ~ppc64" -IUSE="nls gtk gtk2 ssl" - -DEPEND="virtual/x11 - ssl? ( dev-libs/openssl ) - gtk? ( - gtk2? ( >=x11-libs/gtk+-2 ) - !gtk2? ( =x11-libs/gtk+-1.2* ) ) - !gtk? ( sys-libs/readline - sys-libs/ncurses - =dev-libs/glib-1.2* )" - -#RDEPEND="nls? ( sys-devel/gettext )" - -src_compile() { - local myconf - - use nls \ - && myconf="--enable-nls" \ - || myconf="--disable-nls" - - # do not use enable-{gtk20,gtkport} they are not recognized - # and will disable building the gtkport alltogether - if use gtk - then - einfo "gtk+ enabled" - use gtk2 \ - && einfo "gtk2 enabled" \ - || myconf="${myconf} --disable-gtk20" - else - einfo "gtk+ and gtk2 disabled" - myconf="${myconf} --disable-gtkport --disable-gtk20" - fi - - use ssl \ - && myconf="${myconf}" \ - || myconf="${myconf} --disable-ssl" - - econf ${myconf} || die - emake || die -} - -src_install() { - make DESTDIR=${D} install || die - - dodoc COPYING ChangeLog README* THANKS \ - TODO docs/USERS-GUIDE - -} -- cgit v1.2.3-65-gdbad