ports/118002: [patch] x11-themes/buffy unbreak fix build with GCC 4.2

["Pietro Cerutti" <Pietro Cerutti]

>Number:         118002
>Category:       ports
>Synopsis:       [patch] x11-themes/buffy unbreak fix build with GCC 4.2
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 12 14:00:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Pietro Cerutti
>Release:        FreeBSD 8.0-CURRENT i386
>Organization:
Bern University of Applied Sciences 
>Environment:


System: FreeBSD 8.0-CURRENT #9: Fri Nov  9 14:50:37 CET 2007
    root at gahrtop.localhost:/usr/obj/usr/src/sys/MSI1034



>Description:


- fixed a few "static declaration follows non-static declaration" problems.
- added USE_LDCONFIG=yes in Makefile


>How-To-Repeat:


cd /usr/ports/x11-themes/buffy && make 


>Fix:


--- _buffy.diff begins here ---
--- Makefile.orig	2007-11-12 14:39:50.000000000 +0100
+++ Makefile	2007-11-12 14:49:45.000000000 +0100
@@ -20,17 +20,12 @@
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_GNOME=	gtk12
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Broken with gcc 4.2
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/ltconfig
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- /dev/null	2007-11-12 14:49:18.000000000 +0100
+++ files/patch-gtk-engine_draw.c	2007-11-12 14:44:19.000000000 +0100
@@ -0,0 +1,74 @@
+--- gtk-engine/draw.c.orig	2007-11-12 14:41:47.000000000 +0100
++++ gtk-engine/draw.c	2007-11-12 14:43:43.000000000 +0100
+@@ -97,7 +97,7 @@
+ };
+ 
+ 
+-static void
++void
+ draw_shadow(GtkStyle * style, GdkWindow * window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle * area, GtkWidget * widget, gchar * detail, gint x, gint y, gint width, gint height)
+ {
+ 
+@@ -260,7 +260,7 @@
+ }
+ 
+ 
+-static void
++void
+ draw_arrow(GtkStyle * style, GdkWindow * window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle * area, GtkWidget * widget, gchar * detail, GtkArrowType arrow_type, gint fill, gint x, gint y, gint width, gint height)
+ {
+ 
+@@ -351,7 +351,7 @@
+ 	gdk_draw_polygon(window, shadowGCs[1], TRUE, points, 3);
+ }
+ 
+-static void
++void
+ draw_diamond(GtkStyle * style, GdkWindow * window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle * area, GtkWidget * widget, gchar * detail, gint x, gint y, gint width, gint height)
+ {
+ 	gint            half_width;
+@@ -441,7 +441,7 @@
+ 	}
+ }
+ 
+-static void
++void
+ draw_string(GtkStyle * style, GdkWindow * window, GtkStateType state_type, GdkRectangle * area, GtkWidget * widget, gchar * detail, gint x, gint y, const gchar * string)
+ {
+ 
+@@ -467,7 +467,7 @@
+ 
+ }
+ 
+-static void
++void
+ draw_box(GtkStyle * style, GdkWindow * window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle * area, GtkWidget * widget, gchar * detail, gint x, gint y, gint width, gint height)
+ {
+ 	g_return_if_fail(style != NULL);
+@@ -764,7 +764,7 @@
+ 
+ 
+ 
+-static void
++void
+ draw_check(GtkStyle * style, GdkWindow * window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle * area, GtkWidget * widget, gchar * detail, gint x, gint y, gint width, gint height)
+ {
+ 
+@@ -836,7 +836,7 @@
+ 	}
+ }
+ 
+-static void
++void
+ draw_shadow_gap(GtkStyle * style, GdkWindow * window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle * area, GtkWidget * widget, gchar * detail, gint x, gint y, gint width, gint height, GtkPositionType gap_side, gint gap_x, gint gap_width)
+ {
+ 	GdkRectangle    rect;
+@@ -889,7 +889,7 @@
+ 	gdk_gc_set_clip_rectangle(style->bg_gc[GTK_STATE_NORMAL], NULL);
+ }
+ 
+-static void
++void
+ draw_box_gap(GtkStyle * style, GdkWindow * window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle * area, GtkWidget * widget, gchar * detail, gint x, gint y, gint width, gint height, GtkPositionType gap_side, gint gap_x, gint gap_width)
+ {
+ 	GdkRectangle    rect;
--- _buffy.diff ends here ---



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