ports/89630: net/gtk-gnutella [maintainer-update]

[Jonas Sonntag]

>Number:         89630
>Category:       ports
>Synopsis:       net/gtk-gnutella [maintainer-update]
>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:   Sun Nov 27 13:30:05 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Jonas Sonntag
>Release:        FreeBSD 4.11-RELEASE-p11 i386
>Organization:
>Environment:
System: FreeBSD tesla.setcom.de 4.11-RELEASE-p11 FreeBSD 4.11-RELEASE-p11 #5: Mon Jul 4 13:21:43 CEST 2005 jsonntag at tesla.setcom.de:/usr/obj/usr/src/sys/TESLA_COIL i386


	
>Description:
	fix build on 4.x using patch obtained from gtk-gnutella CVS
	
>How-To-Repeat:
	
>Fix:

	

--- gtk-gnutella0.96.b_1.patch begins here ---
diff -ruN gtk-gnutella.orig/Makefile gtk-gnutella/Makefile
--- gtk-gnutella.orig/Makefile	Sun Nov 27 13:47:46 2005
+++ gtk-gnutella/Makefile	Sun Nov 27 13:47:55 2005
@@ -60,10 +60,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=		"Does not compile"
-.endif
-
 .if !defined(INTERACTIVE_CONFIGURE)
 CONFIGURE_ARGS+=	-d -e
 .endif
diff -ruN gtk-gnutella.orig/files/patch-gcc2.diff gtk-gnutella/files/patch-gcc2.diff
--- gtk-gnutella.orig/files/patch-gcc2.diff	Thu Jan  1 01:00:00 1970
+++ gtk-gnutella/files/patch-gcc2.diff	Sun Nov 27 13:48:29 2005
@@ -0,0 +1,52 @@
+--- src/core/rx_inflate.h.orig	Tue Nov 22 22:47:05 2005
++++ src/core/rx_inflate.h	Sat Nov 26 18:15:09 2005
+@@ -46,7 +46,7 @@
+ struct rx_inflate_cb {
+ 	void (*add_rx_inflated)(gpointer owner, gint amount);
+ 	void (*inflate_error)(gpointer owner,
+-			const gchar *reason, ...) G_GNUC_PRINTF(2, 3);
++			const gchar *reason, ...) PRINTF_FUNC_PTR(2, 3);
+ };
+ 
+ /**
+--- src/core/rx_chunk.h.orig	Tue Nov 22 22:47:05 2005
++++ src/core/rx_chunk.h	Sat Nov 26 18:15:09 2005
+@@ -45,7 +45,7 @@
+  */
+ struct rx_chunk_cb {
+ 	void (*chunk_error)(gpointer owner,
+-			const gchar *reason, ...) G_GNUC_PRINTF(2, 3);
++			const gchar *reason, ...) PRINTF_FUNC_PTR(2, 3);
+ 	void (*chunk_end)(gpointer owner);
+ };
+ 
+--- src/core/rx_link.h.orig	Tue Nov 22 22:47:05 2005
++++ src/core/rx_link.h	Sat Nov 26 18:15:09 2005
+@@ -46,7 +46,7 @@
+ struct rx_link_cb {
+ 	void (*add_rx_given)(gpointer owner, gint amount);
+ 	void (*read_error)(gpointer owner,
+-			const gchar *reason, ...) G_GNUC_PRINTF(2, 3);
++			const gchar *reason, ...) PRINTF_FUNC_PTR(2, 3);
+ 	void (*got_eof)(gpointer owner);
+ };
+ 
+--- src/common.h.orig	Tue Nov 22 22:47:03 2005
++++ src/common.h	Sat Nov 26 18:15:08 2005
+@@ -366,6 +366,16 @@
+ #define NON_NULL_PARAM(x) __attribute__((nonnull x))
+ #else /* GCC < 3.3 */
+ #define NON_NULL_PARAM(x)
++#endif
++
++/**
++ * This is the same G_GNUC_FORMAT() but for function pointers. Older versions
++ * of GCC do not allow function attributes for function pointers.
++ */
++#if HAVE_GCC(3, 0)
++#define PRINTF_FUNC_PTR(x, y) __attribute__((format(printf, (x), (y))))
++#else /* GCC < 3.0 */
++#define PRINTF_FUNC_PTR(x, y)
+ #endif
+ 
+ /* Functions using this attribute cause a warning if the returned
--- gtk-gnutella0.96.b_1.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: