diff options
| -rw-r--r-- | net-p2p/giftui/ChangeLog | 11 | ||||
| -rw-r--r-- | net-p2p/giftui/files/0.4.1-gentoo-r1.patch | 55 | ||||
| -rw-r--r-- | net-p2p/giftui/files/0.4.1-gentoo.patch | 66 | ||||
| -rw-r--r-- | net-p2p/giftui/files/digest-giftui-0.3.1 | 3 | ||||
| -rw-r--r-- | net-p2p/giftui/files/digest-giftui-0.4.1-r1 (renamed from net-p2p/giftui/files/digest-giftui-0.4.1) | 0 | ||||
| -rw-r--r-- | net-p2p/giftui/giftui-0.3.1.ebuild | 21 | ||||
| -rw-r--r-- | net-p2p/giftui/giftui-0.4.1-r1.ebuild (renamed from net-p2p/giftui/giftui-0.4.1.ebuild) | 23 |
7 files changed, 71 insertions, 108 deletions
diff --git a/net-p2p/giftui/ChangeLog b/net-p2p/giftui/ChangeLog index 959440e76c33..32e4a5270e94 100644 --- a/net-p2p/giftui/ChangeLog +++ b/net-p2p/giftui/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-p2p/giftui -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/giftui/ChangeLog,v 1.21 2007/02/21 20:15:27 armin76 Exp $ +# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/giftui/ChangeLog,v 1.22 2008/01/15 19:05:19 armin76 Exp $ + +*giftui-0.4.1-r1 (15 Jan 2008) + + 15 Jan 2008; Raúl Porcel <armin76@gentoo.org> -files/0.4.1-gentoo.patch, + +files/0.4.1-gentoo-r1.patch, -giftui-0.3.1.ebuild, -giftui-0.4.1.ebuild, + +giftui-0.4.1-r1.ebuild: + Fix autotools and fix not starting with newer gtk+ 21 Feb 2007; Raúl Porcel <armin76@gentoo.org> files/digest-giftui-0.4.1, Manifest: diff --git a/net-p2p/giftui/files/0.4.1-gentoo-r1.patch b/net-p2p/giftui/files/0.4.1-gentoo-r1.patch new file mode 100644 index 000000000000..531812165391 --- /dev/null +++ b/net-p2p/giftui/files/0.4.1-gentoo-r1.patch @@ -0,0 +1,55 @@ +--- giftui-0.4.1.orig/src/ui_transfer_cb.c ++++ giftui-0.4.1/src/ui_transfer_cb.c +@@ -18,12 +18,12 @@ + */ + + #include "main.h" ++#include "gtkcellrendererprogress.h" + + #include <string.h> + #include <libgift/libgift.h> + #include <gtk/gtk.h> + +-#include "gtkcellrendererprogress.h" + + #include "io.h" + #include "event.h" +--- giftui-0.4.1.orig/src/ui_transfer.c ++++ giftui-0.4.1/src/ui_transfer.c +@@ -18,13 +18,13 @@ + */ + + #include "main.h" ++#include "gtkcellrendererprogress.h" + + #include <string.h> + #include <libgift/libgift.h> + #include <gdk/gdkkeysyms.h> + #include <gtk/gtk.h> + +-#include "gtkcellrendererprogress.h" + + #include "io.h" + #include "event.h" +--- giftui-0.4.1.orig/src/main.c ++++ giftui-0.4.1/src/main.c +@@ -197,6 +197,8 @@ + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + #endif ++ /* init GObject system */ ++ g_type_init(); + + /* configuration init & load */ + giftui_config_init (); +--- giftui-0.4.1.orig/src/ui_about.c ++++ giftui-0.4.1/src/ui_about.c +@@ -153,7 +153,7 @@ + gtk_container_add (GTK_CONTAINER (scrolled), about->list); + + /* create columns */ +- for (i = 0; i < ABOUT_ICON ; i++) ++ for (i = 0; i < ABOUT_VERSION ; i++) + { + column = gtk_tree_view_column_new (); + gtk_tree_view_column_set_title (column, column_headers[i]); diff --git a/net-p2p/giftui/files/0.4.1-gentoo.patch b/net-p2p/giftui/files/0.4.1-gentoo.patch deleted file mode 100644 index afda790f3266..000000000000 --- a/net-p2p/giftui/files/0.4.1-gentoo.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -Naur giftui-0.4.1/src/main.c giftui-0.4.1.new/src/main.c ---- giftui-0.4.1/src/main.c 2004-05-06 01:55:02.000000000 -0500 -+++ giftui-0.4.1.new/src/main.c 2004-08-18 22:30:08.600960640 -0500 -@@ -197,6 +197,12 @@ - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); - #endif -+ -+ /* init GObject system */ -+ g_type_init (); -+ -+ /* GTK+ init */ -+ gtk_init (&argc, &argv); - - /* configuration init & load */ - giftui_config_init (); -@@ -214,10 +220,6 @@ - - return EXIT_FAILURE; - } -- -- -- /* GTK+ init */ -- gtk_init (&argc, &argv); - - return EXIT_SUCCESS; - } ---- giftui-0.4.1/src/ui_transfer_cb.old 2004-05-06 08:54:58.000000000 +0200 -+++ giftui-0.4.1/src/ui_transfer_cb.c 2005-03-06 17:06:12.000000000 +0100 -@@ -23,8 +23,6 @@ - #include <libgift/libgift.h> - #include <gtk/gtk.h> - --#include "gtkcellrendererprogress.h" -- - #include "io.h" - #include "event.h" - #include "configure.h" ---- giftui-0.4.1/src/ui_transfer.c.old 2004-05-13 19:46:11.000000000 +0200 -+++ giftui-0.4.1/src/ui_transfer.c 2005-03-06 17:05:18.000000000 +0100 -@@ -24,8 +24,6 @@ - #include <gdk/gdkkeysyms.h> - #include <gtk/gtk.h> - --#include "gtkcellrendererprogress.h" -- - #include "io.h" - #include "event.h" - #include "configure.h" ---- giftui-0.4.1/src/ui_transfer.h.old 2004-05-06 08:55:01.000000000 +0200 -+++ giftui-0.4.1/src/ui_transfer.h 2005-03-06 17:05:52.000000000 +0100 -@@ -38,6 +38,14 @@ - - #define GIFTUI_TRANSFERFILE(arg) ((GiftuiTransferFile_t *) (arg)) - -+typedef enum -+{ -+ GTK_CELL_RENDERER_PROGRESS_ACTIVE, -+ GTK_CELL_RENDERER_PROGRESS_COMPLETED, -+ GTK_CELL_RENDERER_PROGRESS_PAUSED, -+ GTK_CELL_RENDERER_PROGRESS_CANCELED -+} GtkCellRendererProgressColor; -+ - typedef struct _GiftuiTransfer GiftuiTransfer; - typedef struct _GiftuiTransferClass GiftuiTransferClass; - diff --git a/net-p2p/giftui/files/digest-giftui-0.3.1 b/net-p2p/giftui/files/digest-giftui-0.3.1 deleted file mode 100644 index 97bf8f34ea7d..000000000000 --- a/net-p2p/giftui/files/digest-giftui-0.3.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 5c689e94e74feda449615ed41de2c802 giftui-0.3.1.tar.bz2 263631 -RMD160 1e23026c3d63245a994c1798f91c841fa90d72f0 giftui-0.3.1.tar.bz2 263631 -SHA256 57916909ca07f6c384dfc0adfbec358125a5b46257083a2bec55649a349b1006 giftui-0.3.1.tar.bz2 263631 diff --git a/net-p2p/giftui/files/digest-giftui-0.4.1 b/net-p2p/giftui/files/digest-giftui-0.4.1-r1 index 3fe59d9319a0..3fe59d9319a0 100644 --- a/net-p2p/giftui/files/digest-giftui-0.4.1 +++ b/net-p2p/giftui/files/digest-giftui-0.4.1-r1 diff --git a/net-p2p/giftui/giftui-0.3.1.ebuild b/net-p2p/giftui/giftui-0.3.1.ebuild deleted file mode 100644 index fb318914e82c..000000000000 --- a/net-p2p/giftui/giftui-0.3.1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/giftui/giftui-0.3.1.ebuild,v 1.10 2007/01/10 14:00:49 armin76 Exp $ - -IUSE="" -DESCRIPTION="A GTK+2 giFT frontend" -HOMEPAGE="http://giftui.sourceforge.net/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ~sparc ~amd64" - -DEPEND=">=x11-libs/gtk+-2.0.3 - net-p2p/gift - dev-util/pkgconfig" - -src_install() { - make DESTDIR=${D} giftuidocdir=/usr/share/doc/${PF} install - prepalldocs -} diff --git a/net-p2p/giftui/giftui-0.4.1.ebuild b/net-p2p/giftui/giftui-0.4.1-r1.ebuild index 078459d6f442..69080a07edd8 100644 --- a/net-p2p/giftui/giftui-0.4.1.ebuild +++ b/net-p2p/giftui/giftui-0.4.1-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/giftui/giftui-0.4.1.ebuild,v 1.11 2007/01/10 14:00:49 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/giftui/giftui-0.4.1-r1.ebuild,v 1.1 2008/01/15 19:05:19 armin76 Exp $ -inherit gnome2 eutils +inherit gnome2 eutils autotools DESCRIPTION="A GTK+2 giFT frontend" HOMEPAGE="http://giftui.sourceforge.net/" @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/giftui/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~sparc ~amd64 ~ppc" +KEYWORDS="~amd64 ~ppc ~sparc x86" IUSE="" RDEPEND=">=x11-libs/gtk+-2.4.3 @@ -18,24 +18,15 @@ RDEPEND=">=x11-libs/gtk+-2.4.3 >=gnome-base/gconf-2.6.0 dev-util/pkgconfig" DEPEND="${RDEPEND} - >=sys-devel/automake-1.7.8 - >=sys-devel/autoconf-2.58 sys-apps/sed" src_unpack() { unpack ${A} - cd ${S} - epatch ${FILESDIR}/${PV}-gentoo.patch + cd "${S}" + epatch ${FILESDIR}/${PV}-gentoo-r1.patch sed -i -e 's:/doc/giftui:/share/doc/${P}:g' Makefile* - export WANT_AUTOMAKE=1.7 - export WANT_AUTOCONF=2.5 - autoconf || die - automake || die -} -src_compile() { - econf || die - emake || die + eautoreconf } src_install() { |