[PATCH] x11-themes/gtk-engines2: [Fix build on 4.x]

[Tod McQuillin]

>Submitter-Id:	current-users
>Originator:	Tod McQuillin
>Organization:	
>Confidential:	no 
>Synopsis:	[PATCH] x11-themes/gtk-engines2: [Fix build on 4.x]
>Severity:	non-critical
>Priority:	low
>Category:	ports 
>Class:		change-request
>Release:	FreeBSD 4.11-STABLE i386
>Environment:
System: FreeBSD plexi.pun-pun.prv 4.11-STABLE FreeBSD 4.11-STABLE #3: Sat Mar 11 09:28:19 JST 2006
>Description:
Move some variable declarations to the beginning of the enclosing
block so that C99-ignorant gcc-2.95 can compile them.

Added file(s):
- files/patch-engines_clearlooks_src_clearlooks_draw.c
- files/patch-engines_clearlooks_src_clearlooks_style.c

Port maintainer (gnome at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- gtk-engines2-2.6.8.patch begins here ---
Index: files/patch-engines_clearlooks_src_clearlooks_draw.c
===================================================================
RCS file: files/patch-engines_clearlooks_src_clearlooks_draw.c
diff -N files/patch-engines_clearlooks_src_clearlooks_draw.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-engines_clearlooks_src_clearlooks_draw.c	16 Mar 2006 02:31:07 -0000
@@ -0,0 +1,19 @@
+--- engines/clearlooks/src/clearlooks_draw.c-	Sat Mar 11 21:18:32 2006
++++ engines/clearlooks/src/clearlooks_draw.c	Thu Mar 16 11:29:03 2006
+@@ -725,13 +725,14 @@
+ 	gboolean has_focus = widget && GTK_WIDGET_HAS_FOCUS (widget);
+ 	
+ 	int cl, cr;
+-	
++	GdkGC *bg_gc;
++
+ 	rtl = cl_get_parent_direction (widget) == GTK_TEXT_DIR_RTL;
+ 	
+ 	cl = rtl ? CL_CORNER_NONE  : CL_CORNER_ROUND;
+ 	cr = rtl ? CL_CORNER_ROUND : CL_CORNER_NONE;
+ 	
+-	GdkGC *bg_gc = cl_get_window_bg_gc(widget, style);
++	bg_gc = cl_get_window_bg_gc(widget, style);
+ 	
+ 	if (rtl)
+ 	{
Index: files/patch-engines_clearlooks_src_clearlooks_style.c
===================================================================
RCS file: files/patch-engines_clearlooks_src_clearlooks_style.c
diff -N files/patch-engines_clearlooks_src_clearlooks_style.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-engines_clearlooks_src_clearlooks_style.c	16 Mar 2006 02:31:25 -0000
@@ -0,0 +1,24 @@
+--- engines/clearlooks/src/clearlooks_style.c-	Sat Mar 11 21:14:40 2006
++++ engines/clearlooks/src/clearlooks_style.c	Thu Mar 16 11:29:07 2006
+@@ -980,14 +980,17 @@
+ 			    *shadow = clearlooks_style->shade_gc[4];
+ 		GdkColor upper_color = *clearlooks_get_spot_color (CLEARLOOKS_RC_STYLE (style->rc_style)),
+ 				 lower_color;
+-		
++		GtkAdjustment *adjustment;
++		GtkOrientation orientation;
++		gint fill_size;
++
+ 		gtk_widget_style_get (widget, "slider-length", &slider_length, NULL);
+ 		
+-		GtkAdjustment *adjustment = gtk_range_get_adjustment (GTK_RANGE (widget));
++		adjustment = gtk_range_get_adjustment (GTK_RANGE (widget));
+ 		
+-		GtkOrientation orientation = GTK_RANGE (widget)->orientation;
++		orientation = GTK_RANGE (widget)->orientation;
+ 		
+-		gint fill_size = ((orientation ? height : width) - slider_length) * 
++		fill_size = ((orientation ? height : width) - slider_length) * 
+ 		                 (1 / ((adjustment->upper - adjustment->lower) / 
+ 		                      (adjustment->value - adjustment->lower)))
+ 		                 + slider_length / 2;
--- gtk-engines2-2.6.8.patch ends here ---