Source: jigzo Version: 0.6.1-5 Severity: wishlist Tags: patch User: [email protected] Usertags: libpng15-transition
Hi,
I uploaded libpng 1.5 to experimental.
libpng maintainers plan to transition from libpng 1.2 to 1.5.
I am checking build it the package depend to libpng.
I noticed your package FTBFS by libpng 1.5. I attached build log.
And I created a patch which revise this problem.
Could you check and apply this patch?
NOTE: This patch specifies the version of "libpng-dev" for build test.
Best regards,
Nobuhiro
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
diff -Nru jigzo-0.6.1/debian/changelog jigzo-0.6.1/debian/changelog --- jigzo-0.6.1/debian/changelog 2011-07-28 01:20:30.000000000 +0900 +++ jigzo-0.6.1/debian/changelog 2011-11-24 01:35:55.000000000 +0900 @@ -1,3 +1,10 @@ +jigzo (0.6.1-5.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTBFS with libpng 1.5. + + -- Nobuhiro Iwamatsu <[email protected]> Thu, 24 Nov 2011 01:35:44 +0900 + jigzo (0.6.1-5) unstable; urgency=low * Bump Standards-Version to 3.9.2. diff -Nru jigzo-0.6.1/debian/control jigzo-0.6.1/debian/control --- jigzo-0.6.1/debian/control 2011-07-22 08:15:07.000000000 +0900 +++ jigzo-0.6.1/debian/control 2011-11-24 01:36:11.000000000 +0900 @@ -2,7 +2,7 @@ Section: games Priority: optional Maintainer: Elías Alejandro Año Mendoza <[email protected]> -Build-Depends: debhelper (>= 8.0.0), libjpeg-dev, libpng12-dev, libsdl1.2-dev, libsdl-mixer1.2-dev +Build-Depends: debhelper (>= 8.0.0), libjpeg-dev, libpng-dev (>= 1.5), libsdl1.2-dev, libsdl-mixer1.2-dev Standards-Version: 3.9.2 Homepage: http://www.resorama.com/jigzo/ diff -Nru jigzo-0.6.1/debian/patches/libpng15.patch jigzo-0.6.1/debian/patches/libpng15.patch --- jigzo-0.6.1/debian/patches/libpng15.patch 1970-01-01 09:00:00.000000000 +0900 +++ jigzo-0.6.1/debian/patches/libpng15.patch 2011-11-24 02:40:04.000000000 +0900 @@ -0,0 +1,41 @@ +Description: <short summary of the patch> + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + jigzo (0.6.1-5.1) unstable; urgency=low + . + * Non-maintainer upload. + * Fix FTBFS with libpng 1.5. +Author: Nobuhiro Iwamatsu <[email protected]> + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- jigzo-0.6.1.orig/src/Loader.cxx ++++ jigzo-0.6.1/src/Loader.cxx +@@ -195,8 +195,11 @@ void PngLoader::Load(const std::string& + int bit_depth, color_type, interlace_type; + png_read_info(png_ptr, info_ptr); + png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ &color_type, &interlace_type, NULL, NULL); ++#else + &color_type, &interlace_type, int_p_NULL, int_p_NULL); +- ++#endif + int row_bytes = png_get_rowbytes(png_ptr, info_ptr); + + png_bytep *row_pointers = diff -Nru jigzo-0.6.1/debian/patches/series jigzo-0.6.1/debian/patches/series --- jigzo-0.6.1/debian/patches/series 2011-07-20 07:02:58.000000000 +0900 +++ jigzo-0.6.1/debian/patches/series 2011-11-24 02:40:24.000000000 +0900 @@ -1,3 +1,4 @@ 01_paths.patch 03_gcc_4_3.patch 04_any_resolution.patch +libpng15.patch
jigzo_0.6.1-5.2_amd64.build.gz
Description: GNU Zip compressed data
