Author: arekm Date: Fri Feb 10 17:01:54 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 7; libpng build fix
---- Files affected: packages/inkscape: inkscape.spec (1.106 -> 1.107) , inkscape-0.48.1-libpng15.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/inkscape/inkscape.spec diff -u packages/inkscape/inkscape.spec:1.106 packages/inkscape/inkscape.spec:1.107 --- packages/inkscape/inkscape.spec:1.106 Fri Feb 10 15:56:47 2012 +++ packages/inkscape/inkscape.spec Fri Feb 10 18:01:49 2012 @@ -17,13 +17,14 @@ Summary(pl.UTF-8): Edytor skalowalnej grafiki wektorowej Name: inkscape Version: 0.48.2 -Release: 6 +Release: 7 License: GPL v2+, LGPL v2.1+ Group: X11/Applications/Graphics Source0: http://downloads.sourceforge.net/inkscape/%{name}-%{version}%{beta}.tar.bz2 # Source0-md5: f60b98013bd1121b2cc301f3485076ba # workaround for https://bugs.launchpad.net/inkscape/+bug/487038 Patch0: %{name}-ldl.patch +Patch1: %{name}-0.48.1-libpng15.patch URL: http://www.inkscape.org/ BuildRequires: ImageMagick-c++-devel BuildRequires: aspell-devel @@ -78,6 +79,7 @@ %prep %setup -q -n %{name}-%{version}%{beta} %patch0 -p1 +%patch1 -p1 %{__rm} po/[email protected] %{__sed} -i -e 's|en_US@piglatin||' configure.ac @@ -165,6 +167,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.107 2012/02/10 17:01:49 arekm +- rel 7; libpng build fix + Revision 1.106 2012/02/10 14:56:47 arekm - release 6 ================================================================ Index: packages/inkscape/inkscape-0.48.1-libpng15.patch diff -u /dev/null packages/inkscape/inkscape-0.48.1-libpng15.patch:1.1 --- /dev/null Fri Feb 10 18:01:54 2012 +++ packages/inkscape/inkscape-0.48.1-libpng15.patch Fri Feb 10 18:01:49 2012 @@ -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); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/inkscape/inkscape.spec?r1=1.106&r2=1.107&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
