File inkscape-0.48.0-libpng.patch of Package mingw32-inkscape

Overview Repositories Revisions Requests Users Attributes Meta

File inkscape-0.48.0-libpng.patch of Package mingw32-inkscape (Revision e63178271f9e48ef0fe7daefcef22cae)

Currently displaying revision e63178271f9e48ef0fe7daefcef22cae , Show latest

--- configure.ac	2009-11-16 21:45:59.000000000 +0100
+++ configure.ac	2010-02-11 13:16:33.000000000 +0100
@@ -198,7 +198,29 @@
 dnl ******************************
 dnl Check for libpng 
 dnl ******************************
+for l in libpng libpng14 libpng12; do
+  AC_MSG_CHECKING(for $l version >= 1.2)
+  if $PKG_CONFIG --exists $l ; then
+    if test "`$PKG_CONFIG --modversion $l |  cut -d. -f1`" -gt "1" -o\
+        "`$PKG_CONFIG --modversion $l |  cut -d. -f1`" -eq "1" -a \
+        "`$PKG_CONFIG --modversion $l |  cut -d. -f2`" -ge "2" ; then
+      AC_MSG_RESULT(yes)
+      PNG_LIBS=`$PKG_CONFIG --libs $l`
+      png_ok=yes
+      break
+	else
+      AC_MSG_RESULT(no)
+	  png_ok=no
+    fi
+  else
+    AC_MSG_RESULT(no)
+    png_ok=no
+  fi
+done
+if test "$png_ok" != yes; then
+  PNG_LIBS="-lpng"
 AC_CHECK_LIB(png, png_read_info, [AC_CHECK_HEADER(png.h, png_ok=yes, png_ok=yes)], png_ok=no, -lz -lm)
+fi
 if test "x$png_ok" != "xyes"; then
 	AC_MSG_ERROR([libpng >= 1.2 is needed to compile inkscape])
 fi
@@ -746,7 +768,7 @@
 fi
 
 dnl Shouldn't we test for libpng and libz?
-INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lX11 -lxml2"
+INKSCAPE_LIBS="$INKSCAPE_LIBS $PNG_LIBS -lz -lxml2"
 if test "x$openmp_ok" = "xyes"; then
 	INKSCAPE_LIBS="$INKSCAPE_LIBS -lgomp"
 fi
--- src/sp-image.cpp	2010-07-13 05:48:40.691600000 +0200
+++ src/sp-image.cpp	2011-02-18 00:42:54.810779256 +0100
@@ -388,7 +388,7 @@
                 {
                     char* name = 0;
                     int compression_type = 0;
-                    char* profile = 0;
+                    png_bytep profile = 0;
                     png_uint_32 proflen = 0;
                     if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) {
 //                                         g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type);
--- src/extension/internal/pdfinput/svg-builder.cpp	2010-07-13 05:48:40.691600000 +0200
+++ src/extension/internal/pdfinput/svg-builder.cpp	2011-02-21 13:55:54.432144612 +0100
@@ -1440,7 +1440,7 @@
         return NULL;
     }
     // Set error handler
-    if (setjmp(png_ptr->jmpbuf)) {
+    if (setjmp(png_jmpbuf(png_ptr))) {
         png_destroy_write_struct(&png_ptr, &info_ptr);
         return NULL;
     }
--- src/helper/png-write.cpp	2010-07-13 05:48:40.691600000 +0200
+++ src/helper/png-write.cpp	2011-02-21 13:55:54.432144612 +0100
@@ -165,7 +165,7 @@
     /* Set error handling.  REQUIRED if you aren't supplying your own
      * error hadnling functions in the png_create_write_struct() call.
      */
-    if (setjmp(png_ptr->jmpbuf)) {
+    if (setjmp(png_jmpbuf(png_ptr))) {
         /* If we get here, we had a problem reading the file */
         fclose(fp);
         png_destroy_write_struct(&png_ptr, &info_ptr);

Places

File inkscape-0.48.0-libpng.patch of Package mingw32-inkscape (Revision e63178271f9e48ef0fe7daefcef22cae)

Places