Revision: 76550 http://trac.macports.org/changeset/76550 Author: l2g@macports.org Date: 2011-02-27 14:41:45 -0800 (Sun, 27 Feb 2011) Log Message: ----------- xsane: new version 0.998 (#22457, maintainer request) Modified Paths: -------------- trunk/dports/graphics/xsane/Portfile trunk/dports/graphics/xsane/files/patch-gtk_adjustment_new.diff Removed Paths: ------------- trunk/dports/graphics/xsane/files/patch-src-xsane-back-gtk.c.diff Modified: trunk/dports/graphics/xsane/Portfile =================================================================== --- trunk/dports/graphics/xsane/Portfile 2011-02-27 22:33:00 UTC (rev 76549) +++ trunk/dports/graphics/xsane/Portfile 2011-02-27 22:41:45 UTC (rev 76550) @@ -4,8 +4,7 @@ PortSystem 1.0 name xsane -version 0.996 -revision 4 +version 0.998 categories graphics x11 maintainers puffin.lb.shuttle.de:michael.klein openmaintainer description X11 frontend for SANE @@ -21,16 +20,15 @@ ftp://gd.tuwien.ac.at/api/sane/xsane/ \ ftp://sunsite.uio.no/pub/sane/xsane/ -checksums md5 7dcbcdf0e83322d7c0a543672d9ca2d8 \ - sha1 2f2a709b577463cc57d6dacec4a530a8c4feb8c6 \ - rmd160 c927274a1d09aa74c95fc2a55f4494b261840f23 +checksums md5 936f1cc76b37caa8f285e1e15ac7e0aa \ + sha1 59e238b310979f71a8e15b692eab3c5b2ce6fc32 \ + rmd160 aecf63ac3f15b878d01b697ac3ca95de34d18323 depends_lib lib:libgimp-2.0:gimp2 \ port:gtk2 \ port:sane-backends -patchfiles patch-src-xsane-back-gtk.c.diff \ - patch-sane-options-handling-fix.diff \ +patchfiles patch-sane-options-handling-fix.diff \ patch-gtk_adjustment_new.diff destroot.destdir prefix=${destroot}${prefix} Modified: trunk/dports/graphics/xsane/files/patch-gtk_adjustment_new.diff =================================================================== --- trunk/dports/graphics/xsane/files/patch-gtk_adjustment_new.diff 2011-02-27 22:33:00 UTC (rev 76549) +++ trunk/dports/graphics/xsane/files/patch-gtk_adjustment_new.diff 2011-02-27 22:41:45 UTC (rev 76550) @@ -1,26 +1,6 @@ ---- src/xsane.c.orig 2002-10-02 13:02:50.000000000 +0200 -+++ src/xsane.c 2009-11-04 22:04:30.000000000 +0100 -@@ -1218,7 +1218,7 @@ - gtk_widget_show(pixmapwidget); - - /* adf pages maximum */ -- adjustment = gtk_adjustment_new(preferences.adf_pages_max, 1, 9999, 1, 10, 1); -+ adjustment = gtk_adjustment_new(preferences.adf_pages_max, 1, 9999, 1, 10, 0); - xsane_spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(adjustment), 0, 0); - gtk_widget_set_size_request(xsane_spinbutton, 55, -1); - gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(xsane_spinbutton), FALSE); -@@ -1317,7 +1317,7 @@ - - - /* number of copies */ -- adjustment = gtk_adjustment_new(xsane.copy_number, 1, 99, 1, 10, 1); -+ adjustment = gtk_adjustment_new(xsane.copy_number, 1, 99, 1, 10, 0); - xsane_spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(adjustment), 0, 0); - gtk_widget_set_size_request(xsane_spinbutton, 40, -1); - gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(xsane_spinbutton), FALSE); --- src/xsane-front-gtk.c.orig 2010-03-25 22:47:14.000000000 +0100 +++ src/xsane-front-gtk.c 2010-03-25 22:49:40.000000000 +0100 -@@ -1153,6 +1153,7 @@ +@@ -1163,6 +1163,7 @@ /* spinbutton */ if (preferences.show_range_mode & 4) { @@ -28,7 +8,7 @@ spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(*data), 0, digits); if (preferences.show_range_mode & 3) /* slider also visible */ { -@@ -1246,6 +1247,7 @@ +@@ -1255,6 +1256,7 @@ /* spinbutton */ if (preferences.show_range_mode & 4) { @@ -38,7 +18,7 @@ xsane_back_gtk_set_tooltip(xsane.tooltips, spinbutton, desc); --- src/xsane-back-gtk.c.orig 2007-08-13 09:49:34.000000000 +0200 +++ src/xsane-back-gtk.c 2010-03-25 22:42:07.000000000 +0100 -@@ -2029,6 +2029,7 @@ +@@ -2028,6 +2028,7 @@ digits = 5; } #endif Deleted: trunk/dports/graphics/xsane/files/patch-src-xsane-back-gtk.c.diff =================================================================== --- trunk/dports/graphics/xsane/files/patch-src-xsane-back-gtk.c.diff 2011-02-27 22:33:00 UTC (rev 76549) +++ trunk/dports/graphics/xsane/files/patch-src-xsane-back-gtk.c.diff 2011-02-27 22:41:45 UTC (rev 76550) @@ -1,11 +0,0 @@ ---- src/xsane-back-gtk.c.orig 2009-07-10 11:14:43.000000000 -0700 -+++ src/xsane-back-gtk.c 2009-07-10 11:15:40.000000000 -0700 -@@ -2612,7 +2612,7 @@ - continue; - } - -- if (!(opt->cap & SANE_CAP_ALWAYS_SETTABLE)) -+ if (!(opt->cap)) - { - gtk_widget_set_sensitive(xsane.element[i].widget, sensitive); - }