Your message dated Mon, 30 Apr 2012 01:33:02 +0000
with message-id <[email protected]>
and subject line Bug#649839: fixed in jigzo 0.6.1-6
has caused the Debian Bug report #649839,
regarding jigzo: FTBFS: src/Loader.cxx:198:37: error: 'int_p_NULL' was not 
declared in this scope
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
649839: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649839
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
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

Attachment: jigzo_0.6.1-5.2_amd64.build.gz
Description: GNU Zip compressed data


--- End Message ---
--- Begin Message ---
Source: jigzo
Source-Version: 0.6.1-6

We believe that the bug you reported is fixed in the latest version of
jigzo, which is due to be installed in the Debian FTP archive:

jigzo-data_0.6.1-6_all.deb
  to main/j/jigzo/jigzo-data_0.6.1-6_all.deb
jigzo_0.6.1-6.debian.tar.gz
  to main/j/jigzo/jigzo_0.6.1-6.debian.tar.gz
jigzo_0.6.1-6.dsc
  to main/j/jigzo/jigzo_0.6.1-6.dsc
jigzo_0.6.1-6_amd64.deb
  to main/j/jigzo/jigzo_0.6.1-6_amd64.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Elías Alejandro Año Mendoza <[email protected]> (supplier of updated jigzo 
package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Sat, 28 Apr 2012 13:14:44 -0500
Source: jigzo
Binary: jigzo jigzo-data
Architecture: source amd64 all
Version: 0.6.1-6
Distribution: unstable
Urgency: low
Maintainer: Elías Alejandro Año Mendoza <[email protected]>
Changed-By: Elías Alejandro Año Mendoza <[email protected]>
Description: 
 jigzo      - Photo puzzle game for children
 jigzo-data - data of Photo puzzle game for children
Closes: 649839 662382 667216
Changes: 
 jigzo (0.6.1-6) unstable; urgency=low
 .
   * Bump Standards-Version to 3.9.3.
   * Fix FTBFS with GCC-4.7 : add patch 05_gcc_4_7.patch
     +Thanks to Paul Tagliamonte <[email protected]>. (Closes: #667216)
   * Fix FTBFS with libpng 1.5 :add patch 06_libpng_1_5.patch
     +Thanks to Nobuhiro Iwamatsu <[email protected]>. (Closes: #649839)
   * Change Build-Depends from libpng12-dev to libpng-dev.
     +Thanks to Nobuhiro Iwamatsu <[email protected]>. (Closes: #662382)
   * debian/copyright update format as in Debian Policy 3.9.3.
Checksums-Sha1: 
 2631515fc474e50ae949276dbe735c62865fc955 1807 jigzo_0.6.1-6.dsc
 da0feb9b092425a3eb642f05aac51d0d89b71387 10187 jigzo_0.6.1-6.debian.tar.gz
 c42c4d079e937d26a5c99ab712e7c8a7422797d4 49004 jigzo_0.6.1-6_amd64.deb
 535d21cf3de97f58846b0381b14e051b230b0e44 4036480 jigzo-data_0.6.1-6_all.deb
Checksums-Sha256: 
 1cbb9956c9d2c7f845ecbd95da1fc84b101641a349ddbb03b175392e7e50c6bf 1807 
jigzo_0.6.1-6.dsc
 753db9956f07c942ec0fe3ad77cf6559278f67de4e9dce272096ea994e08ce6c 10187 
jigzo_0.6.1-6.debian.tar.gz
 b9a3fea9d4fa4b48bfdac13906230be825ee10410b742e31cd9286d823ea2cc8 49004 
jigzo_0.6.1-6_amd64.deb
 3a6a36d1f8bbe995af9085dd9f7f2f50cb76956b999168c6521b85b8c3e8e464 4036480 
jigzo-data_0.6.1-6_all.deb
Files: 
 443480a85b1056b85fee37dd85a919f5 1807 games optional jigzo_0.6.1-6.dsc
 a09701a589708033de06a5ec22f32af6 10187 games optional 
jigzo_0.6.1-6.debian.tar.gz
 4a24eab5b9e2d006c3aa1ed925d21ee8 49004 games optional jigzo_0.6.1-6_amd64.deb
 6850535c9fb24c69a07ee17d8d7e8fdc 4036480 games optional 
jigzo-data_0.6.1-6_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAEBCAAGBQJPnQQ2AAoJELs6aAGGSaoGV2QQAJin43z4YTJ1OUdWI0vuK3Su
AEF1LJ+LMLSGbOTqXVSozxLJ8QF0VlXbyl4Na1HN8mMkwpQOXmJ8lik6V3i6IyoS
mnkff1SnkLjPzx/uU/Hq/ioZIpNuzDAeGZjBCq8tdQ1QYDPX2vV9rIS5koleZ219
RmvzsZbsO9zuCSLa7nhb3aN3T37RpI1JpmAa24916MygT/n5uV9gpGHyiyPiL7bs
GVjSL+P5ekvZkOV1YESTFRx6bUHxWx4k5y1biO1lotc+FdTTwZRjAOUmhYa/0/tc
6Oe2q/xQZuLwvHf517UORxuXAIJUDjtf0b8wzsjb2qpMhphPfrcJBaHKm5JS8ESn
/sTOq0lr/a29gsY8CMhcqj1MW92OFJOgT9TEXFT0uV3huoHaGdeU12mp+jfQtjWI
6mtgHYa7chVs4TDZiX0W8BZsPPFEPyajJ1GxanewAWOu/UabBS0rwkjQjUXn3T18
k2inUmcsn8O7cTmDi5WMwnnCA9UoY2GO1KGY03y0sXL9vaXmLmjg9AllpRSJYTRp
vOXpnRVvgzRYj+uU8oAqdFhs2qq2aaL9Ay6/1W0coNrb0BLzxZ2IXNWcJs79vGa0
/3qXKFc6BMb38BPDET8x3UpESXYFCanPa1YY37W+oayn/9acJv0s4ebgBqpqNixi
g+icywl2v3IaFByMbJuL
=3WRr
-----END PGP SIGNATURE-----



--- End Message ---

Reply via email to