ports/94537: [PATCH] accessibility/gnomemag: [Fix build on FreeBSD 4.x]

[Tod McQuillin]

>Number:         94537
>Category:       ports
>Synopsis:       [PATCH] accessibility/gnomemag: [Fix build on FreeBSD 4.x]
>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:   Thu Mar 16 15:09:24 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Tod McQuillin
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
>Environment:
System: FreeBSD plexi.pun-pun.prv 4.11-STABLE FreeBSD 4.11-STABLE #3: Sat Mar 11 09:28:19 JST 2006
>Description:
Rewrite some C99isms to work on gcc 2.95 so that it can build on FreeBSD 4.x.

Added file(s):
- files/patch-magnifier_zoom-region.c

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

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

--- gnomemag-0.12.4.patch begins here ---
Index: Makefile
===================================================================
RCS file: /usr/src/cvs-repo/ports/accessibility/gnomemag/Makefile,v
retrieving revision 1.32
diff -u -u -r1.32 Makefile
--- Makefile	15 Mar 2006 05:28:26 -0000	1.32
+++ Makefile	16 Mar 2006 06:42:01 -0000
@@ -21,7 +21,7 @@
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix atspi libbonobo intlhack
 USE_GMAKE=	yes
-GNU_CONFIGURE=  yes
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
Index: files/patch-magnifier_zoom-region.c
===================================================================
RCS file: files/patch-magnifier_zoom-region.c
diff -N files/patch-magnifier_zoom-region.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-magnifier_zoom-region.c	16 Mar 2006 06:37:58 -0000
@@ -0,0 +1,59 @@
+--- magnifier/zoom-region.c~	Tue Feb 14 22:37:24 2006
++++ magnifier/zoom-region.c	Thu Mar 16 15:36:55 2006
+@@ -1794,10 +1794,10 @@
+ 		gdk_window_end_paint (zoom_region->priv->w->window);
+ 		g_timer_stop (mag_timing.scale);
+ 		if (timing_test) {
+-			mag_timing.num_scale_samples++;
+-			
+ 			gulong microseconds;
+ 
++			mag_timing.num_scale_samples++;
++
+ 			mag_timing.scale_val =
+ 			        g_timer_elapsed (mag_timing.scale,
+ 						 &microseconds);
+@@ -1971,12 +1971,11 @@
+ 	float x_scroll_incr, y_scroll_incr;
+ 	int width = magnifier->target_bounds.x2 - magnifier->target_bounds.x1;
+ 	int height = magnifier->target_bounds.y2 - magnifier->target_bounds.y1;
++	gulong microseconds;
+ 
+ 	mag_timing.num_frame_samples++;
+ 	g_timer_stop (mag_timing.frame);
+ 
+-	gulong microseconds;
+-
+ 	mag_timing.frame_val = g_timer_elapsed (mag_timing.frame,
+ 						&microseconds);
+ 
+@@ -2094,10 +2093,10 @@
+ 	g_timer_stop (mag_timing.idle);
+ 
+ 	if (timing_test) {
+-		mag_timing.num_idle_samples++;
+-
+ 		gulong microseconds;
+ 
++		mag_timing.num_idle_samples++;
++
+ 		mag_timing.idle_val = g_timer_elapsed (mag_timing.idle,
+ 						       &microseconds);
+ 		mag_timing.idle_total += mag_timing.idle_val;
+@@ -2472,6 +2471,7 @@
+ 	int screen_height, height;
+ 	int pixel_position;
+ 	int pixel_direction;
++	gulong microseconds;
+ 
+ 	screen_height = gdk_screen_get_height (
+ 		gdk_display_get_screen (magnifier->source_display,
+@@ -2484,8 +2484,6 @@
+ 	roi.x2 = zoom_region->roi.x2;
+ 
+ 	g_timer_stop (mag_timing.process);
+-
+-	gulong microseconds;
+ 
+ 	total_time = g_timer_elapsed (mag_timing.process, &microseconds);
+ 
--- gnomemag-0.12.4.patch ends here ---

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