[arch-commits] Commit in inkscape/trunk (PKGBUILD libpng15.patch)

Gaetan Bisson bisson at archlinux.org
Tue Jan 24 06:18:18 UTC 2012


    Date: Tuesday, January 24, 2012 @ 01:18:18
  Author: bisson
Revision: 147199

rebuild for libpng-1.5

Added:
  inkscape/trunk/libpng15.patch
Modified:
  inkscape/trunk/PKGBUILD

----------------+
 PKGBUILD       |   10 +++++++---
 libpng15.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-24 05:15:13 UTC (rev 147198)
+++ PKGBUILD	2012-01-24 06:18:18 UTC (rev 147199)
@@ -5,7 +5,7 @@
 
 pkgname=inkscape
 pkgver=0.48.2
-pkgrel=5
+pkgrel=6
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 arch=('i686' 'x86_64')
@@ -20,8 +20,10 @@
             'pyxml: some extensions'
             'uniconvertor: reading/writing to some proprietary formats')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+        'libpng15.patch')
+sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3'
+          'd6512f3cb38ca8e2436dc485aa652490d17b3a52')
 
 install=install
 
@@ -34,6 +36,8 @@
 	sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py
 	sed -i 's|"python"|"python2"|g' src/main.cpp
 
+	patch -p1 -i ../libpng15.patch
+
 	./configure --prefix=/usr \
 		--with-python \
 		--with-perl \

Added: libpng15.patch
===================================================================
--- libpng15.patch	                        (rev 0)
+++ libpng15.patch	2012-01-24 06:18:18 UTC (rev 147199)
@@ -0,0 +1,40 @@
+--- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp
++++ inkscape-0.48.1-mod//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;
+     }
+--- inkscape-0.48.1/src/helper/png-write.cpp
++++ inkscape-0.48.1-mod//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/src/sp-image.cpp
++++ inkscape-0.48.1-mod//src/sp-image.cpp
+@@ -386,9 +386,13 @@
+ 
+ #if defined(PNG_iCCP_SUPPORTED)
+                 {
+-                    char* name = 0;
++                    png_charp name = 0;
+                     int compression_type = 0;
+-                    char* profile = 0;
++#if (PNG_LIBPNG_VER < 10500)
++                    png_charp profile = 0;
++#else
++                    png_bytep profile = 0;
++#endif
+                     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);




More information about the arch-commits mailing list