Source: torcs
Version: 1.3.1-5
Severity: important
Tags: patch
User: [email protected]
Usertags: libpng15-transition
Hi,
I uploaded libpng 1.5.2 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 created the patch that revise this problem.
Could you check and apply this patch?
Best regards,
Nobuhiro
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.39-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=ja_JP.UTF-8, LC_CTYPE=ja_JP.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
diff -u torcs-1.3.1/debian/changelog torcs-1.3.1/debian/changelog
--- torcs-1.3.1/debian/changelog
+++ torcs-1.3.1/debian/changelog
@@ -1,3 +1,10 @@
+torcs (1.3.1-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * libpng transition.
+
+ -- Nobuhiro Iwamatsu <[email protected]> Wed, 08 Jun 2011 23:24:53 +0900
+
torcs (1.3.1-5) unstable; urgency=low
* Fixed insecure library loading (LD_LIBRARY_PATH) (CVE-2010-3384) Closes: #598306.
only in patch2:
unchanged:
--- torcs-1.3.1.orig/debian/patches/05_libpng15.patch
+++ torcs-1.3.1/debian/patches/05_libpng15.patch
@@ -0,0 +1,28 @@
+--- src/libs/tgfclient/img.cpp 2011-06-08 23:21:37.000000000 +0900
++++ src/libs/tgfclient/img.cpp 2011-06-08 23:22:21.000000000 +0900
+@@ -97,8 +97,11 @@
+ png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
+ return (unsigned char *)NULL;
+ }
+-
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++ if (setjmp(png_jmpbuf(png_ptr)))
++#else
+ if (setjmp(png_ptr->jmpbuf))
++#endif
+ {
+ /* Free all of the memory associated with the png_ptr and info_ptr */
+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+@@ -229,7 +232,11 @@
+ return -1;
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++ if (setjmp(png_jmpbuf(png_ptr))) {
++#else
++ if (setjmp(png_ptr->jmpbuf)) {
++#endif
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ fclose(fp);
+ return -1;
