diff --git a/.cvsignore b/.cvsignore index a80137a..293abd5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xsane-0.994.tar.gz +xsane-0.995.tar.gz diff --git a/sources b/sources index 98587a4..1f290a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d02656026797a46a84bda63006f5668 xsane-0.994.tar.gz +5aaedb75973c3b13b136edec714e3fe8 xsane-0.995.tar.gz diff --git a/xsane-0.90-htmlview.patch b/xsane-0.90-htmlview.patch deleted file mode 100644 index 13b3817..0000000 --- a/xsane-0.90-htmlview.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xsane-0.95/src/xsane.h.htmlview 2004-08-13 08:48:06.000000000 +0100 -+++ xsane-0.95/src/xsane.h 2004-12-03 14:39:05.854256418 +0000 -@@ -205,7 +205,7 @@ - # elif defined(HAVE_OS2_H) - # define DEFAULT_BROWSER "netscape" - # else --# define DEFAULT_BROWSER "netscape" -+# define DEFAULT_BROWSER "htmlview" - # endif - #endif - diff --git a/xsane-0.92_gimp2.0.patch b/xsane-0.92_gimp2.0.patch deleted file mode 100644 index f051b89..0000000 --- a/xsane-0.92_gimp2.0.patch +++ /dev/null @@ -1,680 +0,0 @@ ---- xsane-0.95/include/config.h.in.gimp2.0 2004-05-13 21:54:28.000000000 +0100 -+++ xsane-0.95/include/config.h.in 2004-12-03 14:42:27.122829622 +0000 -@@ -290,6 +290,9 @@ - /* Define if you have libtiff. */ - #undef HAVE_LIBTIFF - -+/* Define to 1 if GIMP 1.2 support wanted */ -+#undef ENABLE_GIMP_1_2 -+ - #ifndef HAVE_STRNCASECMP - /* OS/2 needs this */ - # define strncasecmp(a, b, c) strnicmp(a, b, c) ---- /dev/null 2004-11-17 13:17:38.626505248 +0000 -+++ xsane-0.95/acinclude.m4 2004-12-03 14:42:23.944436131 +0000 -@@ -0,0 +1,623 @@ -+###################################################################### -+# Configure paths for GTK+2 -+# Oliver Rauch 2002-06-17 -+ -+dnl AM_PATH_GTK2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -+dnl Test for GTK+-2.0.x, and define GTK_CFLAGS and GTK_LIBS -+dnl -+AC_DEFUN(AM_PATH_GTK2, -+[ -+ AC_ARG_ENABLE(gtk2, [ --disable-gtk2 Do not use gtk+-2.0.x], USE_GTK2=$enableval, USE_GTK2=yes) -+ -+ if test $USE_GTK2 != no ; then -+ min_gtk_version=ifelse([$1], ,2.0.0,$1) -+ if `pkg-config --atleast-pkgconfig-version=0` ; then -+ AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) -+ if `pkg-config gtk+-2.0 --atleast-version=$min_gtk_version` ; then -+ GTK_CFLAGS=`pkg-config gtk+-2.0 --cflags` -+ GTK_LIBS=`pkg-config gtk+-2.0 --libs` -+ AC_MSG_RESULT(yes) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ ifelse([$3], , :, [$3]) -+ fi -+ else -+ AC_MSG_WARN(***************************************************************) -+ AC_MSG_WARN(*** pgk-config is not avilable: test for gtk2 not possible ****) -+ AC_MSG_WARN(***************************************************************) -+ ifelse([$3], , :, [$3]) -+ fi -+ else -+ ifelse([$3], , :, [$3]) -+ fi -+ -+ -+ AC_SUBST(GTK_CFLAGS) -+ AC_SUBST(GTK_LIBS) -+] -+) -+ -+# Configure paths for GTK+ -+# Owen Taylor 97-11-3 -+dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -+dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS -+dnl -+AC_DEFUN(AM_PATH_GTK, -+[dnl -+dnl Get the cflags and libraries from the gtk-config script -+dnl -+ AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], -+ gtk_config_prefix="$withval", gtk_config_prefix="") -+ AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)], -+ gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") -+ AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program], , enable_gtktest=yes) -+ -+ if test x$gtk_config_exec_prefix != x ; then -+ gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" -+ if test x${GTK_CONFIG+set} != xset ; then -+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config -+ fi -+ fi -+ if test x$gtk_config_prefix != x ; then -+ gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" -+ if test x${GTK_CONFIG+set} != xset ; then -+ GTK_CONFIG=$gtk_config_prefix/bin/gtk-config -+ fi -+ fi -+ -+ AC_PATH_PROG(GTK_CONFIG, gtk-config, no) -+ min_gtk_version=ifelse([$1], ,0.99.7,$1) -+ AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) -+ no_gtk="" -+ if test "$GTK_CONFIG" = "no" ; then -+ no_gtk=yes -+ else -+ GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` -+ GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` -+ gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ if test "x$enable_gtktest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$LIBS $GTK_LIBS" -+dnl -+dnl Now check if the installed GTK is sufficiently new. (Also sanity -+dnl checks the results of gtk-config to some extent) -+dnl -+ rm -f conf.gtktest -+ AC_TRY_RUN([ -+#include -+#include -+ -+int -+main () -+{ -+ int major, minor, micro; -+ -+ system ("touch conf.gtktest"); -+ -+ if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_gtk_version"); -+ exit(1); -+ } -+ -+ if ((gtk_major_version != $gtk_config_major_version) || -+ (gtk_minor_version != $gtk_config_minor_version) || -+ (gtk_micro_version != $gtk_config_micro_version)) -+ { -+ printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", -+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ printf ("*** was found! If gtk-config was correct, then it is best\n"); -+ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); -+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -+ printf("*** required on your system.\n"); -+ printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); -+ printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); -+ printf("*** before re-running configure\n"); -+ } -+ else -+ { -+ if ((gtk_major_version > major) || -+ ((gtk_major_version == major) && (gtk_minor_version > minor)) || -+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", -+ major, minor, micro); -+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); -+ printf("***\n"); -+ printf("*** If you have already installed a sufficiently new version, this error\n"); -+ printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); -+ printf("*** correct copy of gtk-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ } -+ } -+ return 1; -+} -+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_gtk" = x ; then -+ AC_MSG_RESULT(yes) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$GTK_CONFIG" = "no" ; then -+ echo "*** The gtk-config script installed by GTK could not be found" -+ echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the GTK_CONFIG environment variable to the" -+ echo "*** full path to gtk-config." -+ else -+ if test -f conf.gtktest ; then -+ : -+ else -+ echo "*** Could not run GTK test program, checking why..." -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$LIBS $GTK_LIBS" -+ AC_TRY_LINK([ -+#include -+#include -+], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], -+ [ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding GTK or finding the wrong" -+ echo "*** version of GTK. If it is not finding GTK, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -+ echo "***" -+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" -+ echo "*** came with the system with the command" -+ echo "***" -+ echo "*** rpm --erase --nodeps gtk gtk-devel" ], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means GTK was incorrectly installed" -+ echo "*** or that you have moved GTK since it was installed. In the latter case, you" -+ echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ GTK_CFLAGS="" -+ GTK_LIBS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(GTK_CFLAGS) -+ AC_SUBST(GTK_LIBS) -+ rm -f conf.gtktest -+]) -+ -+ -+###################################################################### -+# Configure paths for The GIMP -+# Oliver Rauch 2000-12-28 -+ -+dnl AM_PATH_GIMP([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -+dnl Test for GIMP, and define GIMP_CFLAGS and GIMP_LIBS -+dnl -+AC_DEFUN(AM_PATH_GIMP, -+[dnl -+dnl Get the cflags and libraries from the gimp-config script -+dnl -+ AC_ARG_WITH(gimp-prefix,[ --with-gimp-prefix=PFX Prefix where GIMP is installed (optional)], -+ gimp_config_prefix="$withval", gimp_config_prefix="") -+ AC_ARG_WITH(gimp-exec-prefix,[ --with-gimp-exec-prefix=PFX Exec prefix where GIMP is installed (optional)], -+ gimp_config_exec_prefix="$withval", gimp_config_exec_prefix="") -+ AC_ARG_ENABLE(gimptest, [ --disable-gimptest Do not try to compile and run a test GIMP program], , enable_gimptest=yes) -+ -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ ac_save_GTK_CFLAGS="$GTK_CFLAGS" -+ ac_save_GTK_LIBS="$GTK_LIBS" -+ -+ if test x$gimp_config_exec_prefix != x ; then -+ gimp_config_args="$gimp_config_args --exec-prefix=$gimp_config_exec_prefix" -+ if test x${GIMP_CONFIG+set} != xset ; then -+ GIMP_CONFIG=$gimp_config_exec_prefix/bin/gimp-config -+ fi -+ fi -+ -+ if test x$gimp_config_prefix != x ; then -+ gimp_config_args="$gimp_config_args --prefix=$gimp_config_prefix" -+ if test x${GIMP_CONFIG+set} != xset ; then -+ GIMP_CONFIG=$gimp_config_prefix/bin/gimp-config -+ fi -+ fi -+ -+ AC_PATH_PROG(GIMP_CONFIG, gimp-config, no) -+ if test "$GIMP_CONFIG" = "no" ; then -+ if test x$gimp_config_exec_prefix != x ; then -+ gimp_config_args="$gimp_config_args --exec-prefix=$gimp_config_exec_prefix" -+ if test x${GIMP_TOOL+set} != xset ; then -+ GIMP_TOOL=$gimp_config_exec_prefix/bin/gimptool -+ fi -+ fi -+ if test x$gimp_config_prefix != x ; then -+ gimp_config_args="$gimp_config_args --prefix=$gimp_config_prefix" -+ if test x${GIMP_TOOL+set} != xset ; then -+ GIMP_TOOL=$gimp_config_prefix/bin/gimptool -+ fi -+ fi -+ AC_PATH_PROG(GIMP_TOOL, gimptool, no) -+ GIMP_CONFIG=$GIMP_TOOL -+ fi -+ -+ min_gimp_version=ifelse([$1], ,1.0.0,$1) -+ no_gimp="" -+ -+ if test "$GIMP_CONFIG" = "no" ; then -+dnl we do not have gimp-config (gimp-1.0.x does not have gimp-config) -+dnl so we have to use the GTK_* things for testing for gimp.h and gimpfeatures.h -+ ac_save_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="${CPPFLAGS} ${GTK_CFLAGS}" -+ AC_CHECK_HEADERS(libgimp/gimp.h, GIMP_LIBS="-lgimp", no_gimp=yes) -+ AC_CHECK_HEADERS(libgimp/gimpfeatures.h) -+ CPPFLAGS="$ac_save_CPPFLAGS" -+ CFLAGS="${CFLAGS} ${GTK_CFLAGS}" -+ LIBS="${LIBS} ${GTK_LIBS} ${GIMP_LIBS}" -+ if test "x$no_gimp" = x ; then -+ AC_MSG_CHECKING(GIMP compilation) -+ gimp_config_major_version=-1 -+ gimp_config_minor_version=0 -+ gimp_config_micro_version=0 -+ fi -+ else -+dnl Ok, we have gimp-config and so we do not need the GTK_* things because they are -+dnl included in the output of gimp-config -+ GTK_CFLAGS="" -+ GTK_LIBS="" -+ GIMP_CFLAGS=`$GIMP_CONFIG $gimp_config_args --cflags` -+ GIMP_LIBS=`$GIMP_CONFIG $gimp_config_args --libs`" -lgimp" -+ gimp_config_major_version=`$GIMP_CONFIG $gimp_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ gimp_config_minor_version=`$GIMP_CONFIG $gimp_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ gimp_config_micro_version=`$GIMP_CONFIG $gimp_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ CFLAGS="${CFLAGS} ${GIMP_CFLAGS}" -+ LIBS="${LIBS} ${GIMP_LIBS}" -+ AC_MSG_CHECKING(for GIMP - version >= $min_gimp_version) -+ fi -+ -+dnl -+dnl Now check if the installed GIMP is sufficiently new. (Also sanity -+dnl checks the results of gimp-config to some extent -+dnl -+ if test "x$no_gimp" = x ; then -+ if test "x$enable_gimptest" = "xyes" ; then -+ rm -f conf.gimptest -+ AC_TRY_RUN([ -+#include -+#include -+ -+#define GIMP_TEST_CHECK_VERSION(major, minor, micro) \ -+ ($gimp_config_major_version > (major) || \ -+ ($gimp_config_major_version == (major) && $gimp_config_minor_version > (minor)) || \ -+ ($gimp_config_major_version == (major) && $gimp_config_minor_version == (minor) && \ -+ $gimp_config_micro_version >= (micro))) -+ -+#if !GIMP_TEST_CHECK_VERSION(1,1,25) -+# define GimpPlugInInfo GPlugInInfo /* do test with gimp interface version 1.0 */ -+#endif -+ -+GimpPlugInInfo PLUG_IN_INFO = -+{ -+ NULL, NULL, NULL, NULL -+}; -+ -+ -+int -+main () -+{ -+ int major, minor, micro; -+ -+ system ("touch conf.gimptest"); -+ -+ if (sscanf("$min_gimp_version", "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_gimp_version"); -+ exit(1); -+ } -+ -+ if ( ($gimp_config_major_version != -1) && -+ ((gimp_major_version != $gimp_config_major_version) || -+ (gimp_minor_version != $gimp_config_minor_version) || -+ (gimp_micro_version != $gimp_config_micro_version)) ) -+ { -+ printf("\n*** 'gimp-config --version' returned %d.%d.%d, but GIMP (%d.%d.%d)\n", -+ $gimp_config_major_version, $gimp_config_minor_version, $gimp_config_micro_version, -+ gimp_major_version, gimp_minor_version, gimp_micro_version); -+ printf ("*** was found! If gimp-config was correct, then it is best\n"); -+ printf ("*** to remove the old version of GIMP. You may also be able to fix the error\n"); -+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -+ printf("*** required on your system.\n"); -+ printf("*** If gimp-config was wrong, set the environment variable GIMP_CONFIG\n"); -+ printf("*** to point to the correct copy of gimp-config, and remove the file config.cache\n"); -+ printf("*** before re-running configure\n"); -+ } -+ else -+ { -+ if ((gimp_major_version > major) || -+ ((gimp_major_version == major) && (gimp_minor_version > minor)) || -+ ((gimp_major_version == major) && (gimp_minor_version == minor) && (gimp_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** An old version of GIMP (%d.%d.%d) was found.\n", -+ gimp_major_version, gimp_minor_version, gimp_micro_version); -+ printf("*** You need a version of GIMP newer than %d.%d.%d. The latest version of\n", -+ major, minor, micro); -+ printf("*** GIMP is always available from ftp://ftp.gimp.org.\n"); -+ printf("***\n"); -+ printf("*** If you have already installed a sufficiently new version, this error\n"); -+ printf("*** probably means that the wrong copy of the gimp-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of GIMP, but you can also set the GIMP_CONFIG environment to point to the\n"); -+ printf("*** correct copy of gimp-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ } -+ } -+ return 1; -+} -+], , no_gimp=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ fi -+ fi -+ -+ if test "x$no_gimp" = x ; then -+dnl gimp test succeeded or not tested -+ if test "x$enable_gimptest" = "xyes" ; then -+ AC_MSG_RESULT(yes) -+ else -+ AC_MSG_RESULT(not tested) -+ fi -+ if test "$GIMP_CONFIG" != "no" ; then -+ ac_save_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="${CPPFLAGS} ${GIMP_CFLAGS}" -+ AC_CHECK_HEADERS(libgimp/gimp.h) -+ AC_CHECK_HEADERS(libgimp/gimpfeatures.h) -+ CPPFLAGS="$ac_save_CPPFLAGS" -+ fi -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test -f conf.gimptest ; then -+ : -+ else -+ echo "*** Could not run GIMP test program, checking why..." -+ CFLAGS="$CFLAGS $GIMP_CFLAGS" -+ LIBS="$LIBS $GIMP_LIBS" -+ AC_TRY_LINK([ -+#include -+#include -+#define GIMP_TEST_CHECK_VERSION(major, minor, micro) \ -+ ($gimp_config_major_version > (major) || \ -+ ($gimp_config_major_version == (major) && $gimp_config_minor_version > (minor)) || \ -+ ($gimp_config_major_version == (major) && $gimp_config_minor_version == (minor) && \ -+ $gimp_config_micro_version >= (micro))) -+ -+#if !GIMP_TEST_CHECK_VERSION(1,1,25) -+# define GimpPlugInInfo GPlugInInfo /* do test with gimp interface version 1.0 */ -+#endif -+GimpPlugInInfo PLUG_IN_INFO = { NULL, NULL, NULL, NULL }; -+], [ return ((gimp_major_version) || (gimp_minor_version) || (gimp_micro_version)); ], -+ [ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding GIMP or finding the wrong" -+ echo "*** version of GIMP. If it is not finding GIMP, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -+ echo "***" -+ echo "***" ]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+dnl ok, gimp does not work, so we have to use the gtk_* things again -+ GIMP_CFLAGS="" -+ GIMP_LIBS="" -+ GTK_CFLAGS="$ac_save_GTK_CFLAGS" -+ GTK_LIBS="$ac_save_GTK_LIBS" -+ CFLAGS="${CFLAGS} ${GTK_CFLAGS}" -+ LIBS="${LIBS} ${GTK_LIBS} ${GIMP_LIBS}" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(GIMP_CFLAGS) -+ AC_SUBST(GIMP_LIBS) -+ rm -f conf.gimptest -+]) -+ -+ -+# ******************************************************************** -+# Configure paths for SANE -+# Oliver Rauch 2000-10-30 -+ -+dnl AM_PATH_SANE([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -+dnl Test for SANE, and define SANE_CFLAGS and SANE_LIBS -+dnl -+AC_DEFUN(AM_PATH_SANE, -+[dnl -+dnl Get the cflags and libraries from the sane-config script -+dnl -+ AC_ARG_WITH(sane-prefix,[ --with-sane-prefix=PFX Prefix where SANE is installed (optional)], -+ sane_config_prefix="$withval", sane_config_prefix="") -+ AC_ARG_WITH(sane-exec-prefix,[ --with-sane-exec-prefix=PFX Exec prefix where SANE is installed (optional)], -+ sane_config_exec_prefix="$withval", sane_config_exec_prefix="") -+ AC_ARG_ENABLE(sanetest, [ --disable-sanetest Do not try to compile and run a test SANE program], , enable_sanetest=yes) -+ -+ if test x$sane_config_exec_prefix != x ; then -+ sane_config_args="$sane_config_args --exec-prefix=$sane_config_exec_prefix" -+ if test x${SANE_CONFIG+set} != xset ; then -+ SANE_CONFIG=$sane_config_exec_prefix/bin/sane-config -+ fi -+ fi -+ if test x$sane_config_prefix != x ; then -+ sane_config_args="$sane_config_args --prefix=$sane_config_prefix" -+ if test x${SANE_CONFIG+set} != xset ; then -+ SANE_CONFIG=$sane_config_prefix/bin/sane-config -+ fi -+ fi -+ -+ AC_PATH_PROG(SANE_CONFIG, sane-config, no) -+ min_sane_version=ifelse([$1], ,1.0.0,$1) -+ AC_MSG_CHECKING(for SANE - version >= $min_sane_version) -+ no_sane="" -+ if test "$SANE_CONFIG" = "no" ; then -+ no_sane=yes -+ else -+ SANE_CFLAGS=`$SANE_CONFIG $sane_config_args --cflags` -+ SANE_LDFLAGS=`$SANE_CONFIG $sane_config_args --ldflags` -+# SANE_LIBS=`$SANE_CONFIG $sane_config_args --libs` -+ SANE_LIBS=`$SANE_CONFIG $sane_config_args --libs | sed -e 's/-lintl//g'` -+ SANE_PREFIX=`$SANE_CONFIG $sane_config_args --prefix` -+ sane_config_major_version=`$SANE_CONFIG $sane_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ sane_config_minor_version=`$SANE_CONFIG $sane_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ sane_config_micro_version=`$SANE_CONFIG $sane_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ if test "x$enable_sanetest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LDFLAGS="$LDFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $SANE_CFLAGS" -+ LDFLAGS="$LDFLAGS $SANE_LDFLAGS" -+ LIBS="$LIBS $SANE_LIBS" -+dnl -+dnl Now check if the installed SANE is sufficiently new. (Also sanity -+dnl checks the results of sane-config to some extent -+dnl -+ rm -f conf.sanetest -+ AC_TRY_RUN([ -+#include -+#include -+ -+int -+main () -+{ -+ int major, minor, micro; -+ -+ system ("touch conf.sanetest"); -+ -+ if (sscanf("$min_sane_version", "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_sane_version"); -+ exit(1); -+ } -+ -+ if ( ($sane_config_major_version == major) && -+ ( ($sane_config_minor_version > minor) || -+ ( ($sane_config_minor_version == minor) && ($sane_config_micro_version >= micro)))) -+ { -+ return 0; -+ } -+ else if ($sane_config_major_version > major) -+ { -+ printf("\n*** A too new version of SANE (%d.%d.%d) was found.\n", -+ $sane_config_major_version, $sane_config_minor_version, $sane_config_micro_version); -+ printf("*** You need a version of SANE with the major version number %d.\n", major); -+ } -+ else -+ { -+ printf("\n*** An old version of SANE (%d.%d.%d) was found.\n", -+ $sane_config_major_version, $sane_config_minor_version, $sane_config_micro_version); -+ printf("*** You need a version of SANE newer than %d.%d.%d. The latest version of\n", -+ major, minor, micro); -+ } -+ -+ printf("*** SANE is always available from ftp://ftp.mostang.com\n"); -+ printf("***\n"); -+ printf("*** If you have already installed a sufficient version, this error\n"); -+ printf("*** probably means that the wrong copy of the sane-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of SANE, but you can also set the SANE_CONFIG environment to point to the\n"); -+ printf("*** correct copy of sane-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ -+ return 1; -+} -+],, no_sane=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LDFLAGS="$ac_save_LDFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_sane" = x ; then -+ AC_MSG_RESULT(yes) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$SANE_CONFIG" = "no" ; then -+ echo "*** The sane-config script installed by SANE could not be found" -+ echo "*** If SANE was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the SANE_CONFIG environment variable to the" -+ echo "*** full path to sane-config." -+ else -+ if test -f conf.sanetest ; then -+ : -+ else -+ echo "*** Could not run SANE test program, checking why..." -+ CFLAGS="$CFLAGS $SANE_CFLAGS" -+ LIBS="$LIBS $SANE_LIBS" -+ LDFLAGS="$LDFLAGS $SANE_LDFLAGS" -+ AC_TRY_LINK([ -+#include -+#include -+], [ return (SANE_CURRENT_MAJOR); ], -+ [ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding SANE or finding the wrong" -+ echo "*** version of SANE. If it is not finding SANE, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -+ echo "***" ] -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means SANE was incorrectly installed" -+ echo "*** or that you have moved SANE since it was installed. In the latter case, you" -+ echo "*** may want to edit the sane-config script: $SANE_CONFIG" ]) -+ CFLAGS="$ac_save_CFLAGS" -+ LDFLAGS="$ac_save_LDFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ SANE_CFLAGS="" -+ SANE_LDFLAGS="" -+ SANE_LIBS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(SANE_LDFLAGS) -+ AC_SUBST(SANE_CFLAGS) -+ AC_SUBST(SANE_LIBS) -+ AC_SUBST(SANE_PREFIX) -+ rm -f conf.sanetest -+]) -+ ---- xsane-0.95/aclocal.m4.gimp2.0 2004-05-13 23:13:14.000000000 +0100 -+++ xsane-0.95/aclocal.m4 2004-12-03 14:43:56.443784871 +0000 -@@ -1,4 +1,4 @@ --# generated automatically by aclocal 1.8.3 -*- Autoconf -*- -+# generated automatically by aclocal 1.9.3 -*- Autoconf -*- - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 - # Free Software Foundation, Inc. -@@ -49,6 +49,5 @@ - m4_include([m4/gimp-2.0.m4]) - m4_include([m4/gimp-orauch.m4]) - m4_include([m4/gtk-2.0.m4]) --m4_include([m4/gtk.m4]) - m4_include([m4/msnative-struct.m4]) --m4_include([m4/sane.m4]) -+m4_include([acinclude.m4]) ---- xsane-0.95/configure.in.gimp2.0 2004-08-12 22:10:22.000000000 +0100 -+++ xsane-0.95/configure.in 2004-12-03 14:42:27.117830576 +0000 -@@ -41,7 +41,13 @@ - dnl Check for gimp plugin support, default is enabled - AC_MSG_CHECKING([whether GIMP plugin is requested]) - AC_ARG_ENABLE(gimp, [ --disable-gimp do not include GIMP plugin mode], USE_GIMP=$enableval, USE_GIMP=yes) --AC_MSG_RESULT($USE_GIMP) -+AC_ARG_ENABLE(gimp12, [ --enable-gimp12 include GIMP 1.2 plugin mode (defaults to GIMP 2.0)], USE_GIMP12=$enableval, USE_GIMP12="no") -+if test "${USE_GIMP12}" = "yes"; then -+ AC_MSG_RESULT([yes, GIMP 1.2]) -+ USE_GIMP="no" -+else -+ AC_MSG_RESULT([$USE_GIMP, GIMP 2.0]) -+fi - - if test "${USE_GIMP}" = "yes"; then - dnl Check for gimp-2 plugin support, default is enabled -@@ -234,6 +240,8 @@ - - AC_SUBST(XSANE_ICON) - -+AC_SUBST(CATALOGS) -+ - AC_ARG_ENABLE(foo1, [ - Used environment variables that can be set by user: - CFLAGS, CPPFLAGS, LDFLAGS, LIBS]) diff --git a/xsane-0.99-medium-definitions.patch b/xsane-0.99-medium-definitions.patch deleted file mode 100644 index 691efe1..0000000 --- a/xsane-0.99-medium-definitions.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- xsane-0.99/src/xsane-preferences.c.medium-definitions 2005-12-29 12:18:09.000000000 +0100 -+++ xsane-0.99/src/xsane-preferences.c 2006-04-04 17:53:11.000000000 +0200 -@@ -446,6 +446,13 @@ - { - break; - } -+ else if (!strcmp(name, "medium-definitions")) -+ { -+ /* Ignore medium_definitions */ -+ SANE_Word discard; -+ xsane_rc_io_w_space(&w, 3); -+ xsane_rc_io_w_word(&w, &discard); -+ } - else if (i == NELEMS(desc)) - { - DBG(DBG_info2, "preferences identifier %s unknown\n", name); diff --git a/xsane-0.994-showeulaonce.patch b/xsane-0.994-showeulaonce.patch deleted file mode 100644 index ad8bb41..0000000 --- a/xsane-0.994-showeulaonce.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- xsane-0.994/src/xsane.c.showeulaonce 2007-02-25 23:21:06.000000000 +0100 -+++ xsane-0.994/src/xsane.c 2007-04-04 15:03:33.000000000 +0200 -@@ -5825,6 +5825,11 @@ - DBG(DBG_info, "user did not accept eula, we abort\n"); - return 1; /* User did not accept eula */ - } -+ else -+ { -+ /* User did accept eula */ -+ xsane_pref_save(); -+ } - } - - xsane_pref_restore_media(); diff --git a/xsane-0.995-xdg-open.patch b/xsane-0.995-xdg-open.patch new file mode 100644 index 0000000..db1f9bd --- /dev/null +++ b/xsane-0.995-xdg-open.patch @@ -0,0 +1,12 @@ +diff -up xsane-0.995/src/xsane.h.xdg-open xsane-0.995/src/xsane.h +--- xsane-0.995/src/xsane.h.xdg-open 2007-08-13 09:20:32.000000000 +0200 ++++ xsane-0.995/src/xsane.h 2007-11-23 11:50:49.000000000 +0100 +@@ -251,7 +251,7 @@ + # elif defined(HAVE_OS2_H) + # define DEFAULT_BROWSER "netscape" + # else +-# define DEFAULT_BROWSER "netscape" ++# define DEFAULT_BROWSER "xdg-open" + # endif + #endif + diff --git a/xsane.spec b/xsane.spec index 22ed166..da9cffa 100644 --- a/xsane.spec +++ b/xsane.spec @@ -2,15 +2,12 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface -Version: 0.994 -Release: 4%{?dist} +Version: 0.995 +Release: 1%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane.desktop Source2: xsane.conf.in -Patch0: xsane-0.90-htmlview.patch -Patch1: xsane-0.99-medium-definitions.patch -Patch2: xsane-0.92_gimp2.0.patch -Patch3: xsane-0.994-showeulaonce.patch +Patch0: xsane-0.995-xdg-open.patch License: GPLv2+ URL: http://www.xsane.org/ Group: Applications/Multimedia @@ -19,8 +16,6 @@ BuildRequires: sane-backends-devel gimp-devel libpng-devel libjpeg-devel BuildRequires: desktop-file-utils >= 0.2.92 BuildRequires: libtiff-devel BuildRequires: gettext-devel -BuildRequires: automake -BuildRequires: autoconf BuildRequires: sed ExcludeArch: s390 s390x @@ -43,15 +38,9 @@ installed to use this package. %prep %setup -q -%patch0 -p1 -b .htmlview -%patch1 -p1 -b .medium-definitions -%patch2 -p1 -b .gimp2.0 -%patch3 -p1 -b .showeulaonce +%patch0 -p1 -b .xdg-open %build -%{expand:%%define optflags %{optflags} -DGIMP_ENABLE_COMPAT_CRUFT=1} -aclocal -I m4 -autoconf %configure --enable-gimp make LDFLAGS= @@ -114,6 +103,10 @@ fi %config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf %changelog +* Thu Oct 15 2007 Nils Philippsen - 0.995-1 +- version 0.995 +- remove obsolete gimp2.0, medium-definitions, showeulaonce patches + * Thu Oct 15 2007 Nils Philippsen - explicitely enable building the gimp plugin in configure call - reorder spec file sections