Hello community, here is the log from the commit of package inkscape for openSUSE:Factory checked in at 2012-10-16 09:22:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/inkscape (Old) and /work/SRC/openSUSE:Factory/.inkscape.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "inkscape", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/inkscape/inkscape.changes 2012-09-23 21:05:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.inkscape.new/inkscape.changes 2012-10-16 09:22:45.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Oct 3 19:59:49 UTC 2012 - [email protected] + +- build also with libpng15 + * libpng15.patch + +------------------------------------------------------------------- New: ---- inkscape-libpng15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inkscape.spec ++++++ --- /var/tmp/diff_new_pack.erv2QR/_old 2012-10-16 09:22:49.000000000 +0200 +++ /var/tmp/diff_new_pack.erv2QR/_new 2012-10-16 09:22:49.000000000 +0200 @@ -20,7 +20,7 @@ Version: 0.48.3.1 Release: 0 Summary: Vector Illustration Program -License: GPL-2.0 ; LGPL-2.1 +License: GPL-2.0 and LGPL-2.1 Group: Productivity/Graphics/Vector Editors Url: http://www.inkscape.org/ Source: http://downloads.sourceforge.net/project/inkscape/inkscape/0.48.3.1/%{name}-%{version}.tar.bz2 @@ -37,6 +37,8 @@ Patch3: inkscape-poppler20.patch # PATCH-FIX-UPSTREAM inkscape-apply-invert-transform.patch bnc#779560 lp#840625 [email protected] -- Apply invert transform to all image tags. Patch4: inkscape-apply-invert-transform.patch +# PATCH-FIX-UPSTREAM inkscape-libpng15.patch [email protected] -- build with libpng15 +Patch5: inkscape-libpng15.patch BuildRequires: boost-devel BuildRequires: docbook-toys BuildRequires: fdupes @@ -163,6 +165,7 @@ %patch3 -p1 %endif %patch4 -p1 +%patch5 -p1 %build RPM_OPT_FLAGS="%{optflags}" ++++++ inkscape-libpng15.patch ++++++ http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-gfx/inkscape/files/?diff_format=s --- 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); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
