Hello community,

here is the log from the commit of package xsane for openSUSE:Factory checked 
in at 2012-10-16 12:59:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xsane (Old)
 and      /work/SRC/openSUSE:Factory/.xsane.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "xsane", Maintainer is "lnus...@suse.com"

Changes:
--------
--- /work/SRC/openSUSE:Factory/xsane/xsane.changes      2012-02-28 
19:26:19.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.xsane.new/xsane.changes 2012-10-16 
12:59:07.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Oct 15 10:19:52 UTC 2012 - pgaj...@suse.com
+
+- fixed build with libpng15
+  * libpng15.patch
+
+-------------------------------------------------------------------

New:
----
  xsane-libpng15.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xsane.spec ++++++
--- /var/tmp/diff_new_pack.LRCNY0/_old  2012-10-16 12:59:08.000000000 +0200
+++ /var/tmp/diff_new_pack.LRCNY0/_new  2012-10-16 12:59:08.000000000 +0200
@@ -29,6 +29,8 @@
 Patch:          %{name}-desktop.patch
 # fix printf using locale dependent float representation
 Patch1:         xsane_fix_pdf_floats.patch
+# fix build with libpng15
+Patch2:         xsane-libpng15.patch
 # Patch100... is SUSE specific stuff:
 # Patch100 suppresses the disclaimer of warranty and liability dialog
 # and adds a modification note and adds a openSUSE Bugzilla URL
@@ -90,6 +92,7 @@
 sed -i "s/ zh / zh_TW /" configure.in configure
 %patch
 %patch1 -p1
+%patch2 -p1
 # Patch100 suppresses the disclaimer of warranty and liability dialog
 # and adds a modification note and adds a openSUSE Bugzilla URL
 # to make the change obvious for the user and direct bug reports to us:

++++++ xsane-libpng15.patch ++++++
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649800
--- xsane-0.998.orig/src/xsane-save.c
+++ xsane-0.998/src/xsane-save.c
@@ -4928,8 +4928,11 @@ int xsane_save_png(FILE *outfile, int co
     xsane_back_gtk_error(buf, TRUE);
     return -1; /* error */
   }
-
+#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4
+  if ( setjmp( png_jmpbuf ( png_ptr ) ) )
+#else
   if (setjmp(png_ptr->jmpbuf))
+#endif
   {
     snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG);
     xsane_back_gtk_error(buf, TRUE);
@@ -5119,7 +5122,11 @@ int xsane_save_png_16(FILE *outfile, int
     return -1; /* error */
   }
 
+#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4
+  if ( setjmp( png_jmpbuf ( png_ptr ) ) )
+#else
   if (setjmp(png_ptr->jmpbuf))
+#endif
   {
     snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG);
     xsane_back_gtk_error(buf, TRUE);

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to