Date: Fri, 1 Jul 2005 16:03:23 +0200 (CEST) From: Jonas Sonntag <jonas@schiebtsich.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Jonas Sonntag <jonas@schiebtsich.net> Subject: ports/82860: maintainer-update, patch Message-ID: <200507011403.j61E3Ndg082854@admin.jbhosting.de> Resent-Message-ID: <200507011410.j61EAJcr007022@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 82860 >Category: ports >Synopsis: maintainer-update, patch >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Jul 01 14:10:19 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Jonas Sonntag >Release: >Organization: >Environment: System: FreeBSD sc-ws3.setcom 5.4-RELEASE-p2 FreeBSD 5.4-RELEASE-p2 #6: Thu Jun 9 17:34:36 CEST 2005 root@sc-ws3.setcom:/usr/obj/u sr/src/sys/SETCOM-WS i386 >Description: port is two months behind development, taking over since maintainer is unresponsive upgrade 0.95 to 0.95.3 >How-To-Repeat: >Fix: attached patch removed files: files/patch-0.95-gtk2.6, files/patch-Configure --- net--gtk-gnutella.diff begins here --- diff -ruN gtk-gnutella.orig/Makefile gtk-gnutella/Makefile --- gtk-gnutella.orig/Makefile Mon Dec 20 13:20:50 2004 +++ gtk-gnutella/Makefile Thu Jun 30 14:17:14 2005 @@ -27,7 +27,7 @@ # PORTNAME= gtk-gnutella -PORTVERSION= 0.95 +PORTVERSION= 0.95.3 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://gtk-gnutella.sourceforge.net/download/ \ diff -ruN gtk-gnutella.orig/distinfo gtk-gnutella/distinfo --- gtk-gnutella.orig/distinfo Mon Dec 20 13:20:50 2004 +++ gtk-gnutella/distinfo Thu Jun 30 14:17:14 2005 @@ -1,2 +1,2 @@ -MD5 (gtk-gnutella-0.95.tar.bz2) = de2ff4973c975ee16cdd69ca72c06bcd -SIZE (gtk-gnutella-0.95.tar.bz2) = 2191028 +MD5 (gtk-gnutella-0.95.3.tar.bz2) = bde94b95622f895294bffac8cecbe67a +SIZE (gtk-gnutella-0.95.3.tar.bz2) = 2306819 diff -ruN gtk-gnutella.orig/files/patch-0.95-gtk2.6 gtk-gnutella/files/patch-0.95-gtk2.6 --- gtk-gnutella.orig/files/patch-0.95-gtk2.6 Tue Mar 15 03:19:18 2005 +++ gtk-gnutella/files/patch-0.95-gtk2.6 Thu Jan 1 01:00:00 1970 @@ -1,40 +0,0 @@ -diff -ur gtk-gnutella-0.95-old/src/ui/gtk/gtk2/pbarcellrenderer.c gtk-gnutella-0.95/src/ui/gtk/gtk2/pbarcellrenderer.c ---- src/ui/gtk/gtk2/pbarcellrenderer.c 2005-01-25 01:24:15.291080696 -0500 -+++ 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 ---- src/ui/gtk/gtk2/pbarcellrenderer.h 2005-01-25 01:24:15.291080696 -0500 -+++ 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 -ruN gtk-gnutella.orig/files/patch-Configure gtk-gnutella/files/patch-Configure --- gtk-gnutella.orig/files/patch-Configure Mon Jun 21 19:57:52 2004 +++ gtk-gnutella/files/patch-Configure Thu Jan 1 01:00:00 1970 @@ -1,24 +0,0 @@ ---- Configure.orig Wed Jun 9 01:49:22 2004 -+++ Configure Sat Jun 12 16:48:17 2004 -@@ -3874,8 +3874,8 @@ - $rm -f t.c - - : see if ucnv_open_2_6 exists --set ucnv_open_2_6 d_ucnv_open_2_6 --eval $inlibc -+: set ucnv_open_2_6 d_ucnv_open_2_6 -+: eval $inlibc - - : check whether we have a working ICU library - echo " " -@@ -3883,8 +3883,8 @@ - case " $libs " in - *" -licuuc "*) - has_icu=y -- case "$i_uni_putil$d_ucnv_open_2_6" in -- "$define$define") -+ case "$i_uni_putil" in -+ "$define") - echo "Your ICU library is workable." >&4 - val="$define" - ;; --- net--gtk-gnutella.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507011403.j61E3Ndg082854>