main/inkscape: fix compilation under libpng 1.5

1 files changed, 33 insertions, 0 deletions

diff --git a/main/inkscape/inkscape-png15.patch b/main/inkscape/inkscape-png15.patch
new file mode 100644
index 0000000000..7318adc5d6
--- /dev/null
+++ b/main/inkscape/inkscape-png15.patch
@@ -0,0 +1,33 @@
+--- inkscape-0.48.1.orig/src/sp-image.cpp
++++ inkscape-0.48.1/src/sp-image.cpp
+@@ -388,7 +388,7 @@
+                 {
+                     char* name = 0;
+                     int compression_type = 0;
+-                    char* profile = 0;
++                    png_byte* 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);
+--- inkscape-0.48.1.orig/src/helper/png-write.cpp
++++ inkscape-0.48.1/src/helper/png-write.cpp
+@@ -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);
+--- inkscape-0.48.1.orig/src/extension/internal/pdfinput/svg-builder.cpp
++++ inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp
+@@ -1443,7 +1443,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;
+     }