diff options
| author | pav <pav@FreeBSD.org> | 2006-03-16 23:55:04 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2006-03-16 23:55:04 +0800 |
| commit | 1aef9baa09253bd2f237c432d9e5424144989658 (patch) | |
| tree | 71185d33728c487c39f4a34b2bb216456bcb54b5 /accessibility | |
| parent | 78755953a5ca0e36eef6af25b68748caea499a3e (diff) | |
| download | freebsd-ports-gnome-1aef9baa09253bd2f237c432d9e5424144989658.tar.gz freebsd-ports-gnome-1aef9baa09253bd2f237c432d9e5424144989658.tar.zst freebsd-ports-gnome-1aef9baa09253bd2f237c432d9e5424144989658.zip | |
- Fix build on FreeBSD 4.X
- Style
PR: ports/94537
Submitted by: Tod McQuillin <devin@spamcop.net>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/gnome-mag/Makefile | 2 | ||||
| -rw-r--r-- | accessibility/gnome-mag/files/patch-magnifier_zoom-region.c | 59 | ||||
| -rw-r--r-- | accessibility/gnomemag/Makefile | 2 | ||||
| -rw-r--r-- | accessibility/gnomemag/files/patch-magnifier_zoom-region.c | 59 |
4 files changed, 120 insertions, 2 deletions
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile index 58b4a9dad455..8779aa268d78 100644 --- a/accessibility/gnome-mag/Makefile +++ b/accessibility/gnome-mag/Makefile @@ -21,7 +21,7 @@ USE_BZIP2= yes 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" diff --git a/accessibility/gnome-mag/files/patch-magnifier_zoom-region.c b/accessibility/gnome-mag/files/patch-magnifier_zoom-region.c new file mode 100644 index 000000000000..b8ab206a3dad --- /dev/null +++ b/accessibility/gnome-mag/files/patch-magnifier_zoom-region.c @@ -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, + µseconds); +@@ -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, + µseconds); + +@@ -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, + µseconds); + 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, µseconds); + diff --git a/accessibility/gnomemag/Makefile b/accessibility/gnomemag/Makefile index 58b4a9dad455..8779aa268d78 100644 --- a/accessibility/gnomemag/Makefile +++ b/accessibility/gnomemag/Makefile @@ -21,7 +21,7 @@ USE_BZIP2= yes 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" diff --git a/accessibility/gnomemag/files/patch-magnifier_zoom-region.c b/accessibility/gnomemag/files/patch-magnifier_zoom-region.c new file mode 100644 index 000000000000..b8ab206a3dad --- /dev/null +++ b/accessibility/gnomemag/files/patch-magnifier_zoom-region.c @@ -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, + µseconds); +@@ -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, + µseconds); + +@@ -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, + µseconds); + 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, µseconds); + |