Date: Sun, 20 Mar 2005 12:02:48 -0800 (PST) From: Alex Varju <freebsd-ports@varju.ca> To: FreeBSD-gnats-submit@FreeBSD.org Cc: joeldiaz@bellsouth.net Subject: ports/79059: [PATCH] net/giFTui: Fix build with Gnome 2.10 Message-ID: <200503202002.j2KK2man006323@snapple.webct.com> Resent-Message-ID: <200503202010.j2KKA1qb051737@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 79059
>Category: ports
>Synopsis: [PATCH] net/giFTui: Fix build with Gnome 2.10
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Mar 20 20:10:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Alex Varju
>Release: FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD snapple.webct.com 5.3-STABLE FreeBSD 5.3-STABLE #13: Wed Nov 3 11:31:28 PST
>Description:
giFTui includes code that comes with Gnome 2.10, which causes build failures.
I've extracted the relevant fixes from the giFTui CVS repository.
While here, I've also attempted to make portlint happier.
PORTREVISION has not been bumped, as there are no functional changes.
Added file(s):
- files/patch-gtkcellrendererprogress
Port maintainer (joeldiaz@bellsouth.net) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- giFTui-0.4.1_3.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/freebsd/cvsroot/ports/net/giftui/Makefile,v
retrieving revision 1.4
diff -u -u -r1.4 Makefile
--- Makefile 12 Mar 2005 10:52:20 -0000 1.4
+++ Makefile 20 Mar 2005 19:52:05 -0000
@@ -22,6 +22,25 @@
USE_X_PREFIX= yes
USE_GNOME= gconf2 gtk20
USE_GMAKE= yes
+USE_REINPLACE= yes
GNU_CONFIGURE= yes
+GCONF_SCHEMAS= giftui.schemas
+
+.if !defined(NOPORTDOCS)
+PORTDOCS= AUTHORS COPYING ChangeLog NEWS README TODO
+.endif
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|^giftuidatadir=.*|giftuidatadir=${DATADIR}|g' \
+ ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|^giftuidocdir =.*|giftuidocdir =${DOCSDIR}|g' \
+ ${WRKSRC}/Makefile.in
+
+post-install:
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+.endif
+
.include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/freebsd/cvsroot/ports/net/giftui/pkg-plist,v
retrieving revision 1.2
diff -u -u -r1.2 pkg-plist
--- pkg-plist 7 Jul 2004 16:23:47 -0000 1.2
+++ pkg-plist 20 Mar 2005 19:51:59 -0000
@@ -1,31 +1,21 @@
bin/giftui
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/giftui.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/giftui.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/giftui.schemas > /dev/null || /usr/bin/true
share/applications/giftui.desktop
-share/doc/giftui/AUTHORS
-share/doc/giftui/COPYING
-share/doc/giftui/ChangeLog
-share/doc/giftui/NEWS
-share/doc/giftui/README
-share/doc/giftui/TODO
-share/giftui/icons/fasttrack-down.png
-share/giftui/icons/fasttrack-network.png
-share/giftui/icons/fasttrack-search.png
-share/giftui/icons/fasttrack-up.png
-share/giftui/icons/gnutella-down.png
-share/giftui/icons/gnutella-network.png
-share/giftui/icons/gnutella-search.png
-share/giftui/icons/gnutella-up.png
-share/giftui/icons/openft-down.png
-share/giftui/icons/openft-network.png
-share/giftui/icons/openft-search.png
-share/giftui/icons/openft-up.png
-share/giftui/icons/opennap-down.png
-share/giftui/icons/opennap-network.png
-share/giftui/icons/opennap-search.png
-share/giftui/icons/opennap-up.png
+%%DATADIR%%/icons/fasttrack-down.png
+%%DATADIR%%/icons/fasttrack-network.png
+%%DATADIR%%/icons/fasttrack-search.png
+%%DATADIR%%/icons/fasttrack-up.png
+%%DATADIR%%/icons/gnutella-down.png
+%%DATADIR%%/icons/gnutella-network.png
+%%DATADIR%%/icons/gnutella-search.png
+%%DATADIR%%/icons/gnutella-up.png
+%%DATADIR%%/icons/openft-down.png
+%%DATADIR%%/icons/openft-network.png
+%%DATADIR%%/icons/openft-search.png
+%%DATADIR%%/icons/openft-up.png
+%%DATADIR%%/icons/opennap-down.png
+%%DATADIR%%/icons/opennap-network.png
+%%DATADIR%%/icons/opennap-search.png
+%%DATADIR%%/icons/opennap-up.png
share/pixmaps/giftui.png
-@dirrm share/giftui/icons
-@dirrm share/giftui
-@dirrm share/doc/giftui
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
Index: files/patch-Makefile.in
===================================================================
RCS file: /home/freebsd/cvsroot/ports/net/giftui/files/patch-Makefile.in,v
retrieving revision 1.1
diff -u -u -r1.1 patch-Makefile.in
--- files/patch-Makefile.in 6 Jun 2004 11:20:56 -0000 1.1
+++ files/patch-Makefile.in 20 Mar 2005 19:43:47 -0000
@@ -1,11 +1,11 @@
---- Makefile.in.orig Mon May 17 01:26:53 2004
-+++ Makefile.in Wed May 26 18:31:08 2004
-@@ -138,7 +138,7 @@
+--- Makefile.in.orig Sun May 16 22:26:53 2004
++++ Makefile.in Sun Mar 20 11:43:00 2005
+@@ -513,7 +513,7 @@
- SUBDIRS = data po src
+ info-am:
+
+-install-data-am: install-giftuidocDATA
++install-data-am:
+
+ install-exec-am:
--giftuidocdir = $(prefix)/doc/giftui
-+giftuidocdir = $(prefix)/share/doc/giftui
- giftuidoc_DATA = \
- README \
- COPYING \
Index: files/patch-gtkcellrendererprogress
===================================================================
RCS file: files/patch-gtkcellrendererprogress
diff -N files/patch-gtkcellrendererprogress
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-gtkcellrendererprogress 20 Mar 2005 19:12:44 -0000
@@ -0,0 +1,141 @@
+Index: src/Makefile.am
+===================================================================
+RCS file: /cvsroot/giftui/giftui/src/Makefile.am,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -p -r1.2 -r1.3
+--- src/Makefile.am 15 May 2004 05:45:36 -0000 1.2
++++ src/Makefile.am 27 Jul 2004 08:18:09 -0000 1.3
+@@ -10,7 +10,6 @@ giftui_SOURCES = \
+ io.c io.h\
+ main.c main.h\
+ util.c util.h\
+- gtkcellrendererprogress.c gtkcellrendererprogress.h\
+ ui_parent.c ui_parent.h\
+ ui_child.c ui_child.h\
+ ui.h\
+Index: src/Makefile.in
+===================================================================
+RCS file: /cvsroot/giftui/giftui/src/Makefile.in,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -p -r1.2 -r1.3
+--- src/Makefile.in 15 May 2004 05:45:36 -0000 1.2
++++ src/Makefile.in 27 Jul 2004 08:18:09 -0000 1.3
+@@ -147,7 +147,6 @@ giftui_SOURCES = \
+ io.c io.h\
+ main.c main.h\
+ util.c util.h\
+- gtkcellrendererprogress.c gtkcellrendererprogress.h\
+ ui_parent.c ui_parent.h\
+ ui_child.c ui_child.h\
+ ui.h\
+@@ -175,13 +174,12 @@ bin_PROGRAMS = giftui$(EXEEXT)
+ PROGRAMS = $(bin_PROGRAMS)
+
+ am_giftui_OBJECTS = configure.$(OBJEXT) event.$(OBJEXT) io.$(OBJEXT) \
+- main.$(OBJEXT) util.$(OBJEXT) gtkcellrendererprogress.$(OBJEXT) \
+- ui_parent.$(OBJEXT) ui_child.$(OBJEXT) ui_menu.$(OBJEXT) \
+- ui_notebook.$(OBJEXT) ui_about.$(OBJEXT) ui_browse.$(OBJEXT) \
+- ui_connect.$(OBJEXT) ui_icon.$(OBJEXT) ui_pref.$(OBJEXT) \
+- ui_search.$(OBJEXT) ui_search_cb.$(OBJEXT) \
+- ui_transfer.$(OBJEXT) ui_transfer_cb.$(OBJEXT) \
+- ui_util.$(OBJEXT)
++ main.$(OBJEXT) util.$(OBJEXT) ui_parent.$(OBJEXT) \
++ ui_child.$(OBJEXT) ui_menu.$(OBJEXT) ui_notebook.$(OBJEXT) \
++ ui_about.$(OBJEXT) ui_browse.$(OBJEXT) ui_connect.$(OBJEXT) \
++ ui_icon.$(OBJEXT) ui_pref.$(OBJEXT) ui_search.$(OBJEXT) \
++ ui_search_cb.$(OBJEXT) ui_transfer.$(OBJEXT) \
++ ui_transfer_cb.$(OBJEXT) ui_util.$(OBJEXT)
+ giftui_OBJECTS = $(am_giftui_OBJECTS)
+ giftui_DEPENDENCIES =
+ giftui_LDFLAGS =
+@@ -190,7 +188,6 @@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/configure.Po ./$(DEPDIR)/event.Po \
+-@AMDEP_TRUE@ ./$(DEPDIR)/gtkcellrendererprogress.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/io.Po ./$(DEPDIR)/main.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/ui_about.Po ./$(DEPDIR)/ui_browse.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/ui_child.Po ./$(DEPDIR)/ui_connect.Po \
+@@ -272,7 +269,6 @@ distclean-compile:
+
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/configure.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkcellrendererprogress.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/io.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_about.Po@am__quote@
+Index: src/main.c
+===================================================================
+RCS file: /cvsroot/giftui/giftui/src/main.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- src/main.c 6 May 2004 06:55:02 -0000 1.1.1.1
++++ src/main.c 27 Jul 2004 08:18:09 -0000 1.2
+@@ -32,6 +32,7 @@
+ #include "ui.h"
+ #include "ui_connect.h"
+ #include "ui_menu.h"
++#include "ui_transfer.h"
+
+ static GtkWidget *window;
+
+Index: src/ui_transfer.c
+===================================================================
+RCS file: /cvsroot/giftui/giftui/src/ui_transfer.c,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -p -r1.2 -r1.3
+--- src/ui_transfer.c 15 May 2004 05:45:36 -0000 1.2
++++ src/ui_transfer.c 27 Jul 2004 08:18:09 -0000 1.3
+@@ -24,8 +24,6 @@
+ #include <gdk/gdkkeysyms.h>
+ #include <gtk/gtk.h>
+
+-#include "gtkcellrendererprogress.h"
+-
+ #include "io.h"
+ #include "event.h"
+ #include "configure.h"
+Index: src/ui_transfer.h
+===================================================================
+RCS file: /cvsroot/giftui/giftui/src/ui_transfer.h,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- src/ui_transfer.h 6 May 2004 06:55:01 -0000 1.1.1.1
++++ src/ui_transfer.h 27 Jul 2004 08:18:09 -0000 1.2
+@@ -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;
+
+Index: src/ui_transfer_cb.c
+===================================================================
+RCS file: /cvsroot/giftui/giftui/src/ui_transfer_cb.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- src/ui_transfer_cb.c 6 May 2004 06:54:58 -0000 1.1.1.1
++++ src/ui_transfer_cb.c 27 Jul 2004 08:31:49 -0000 1.2
+@@ -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_3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200503202002.j2KK2man006323>