Source: silly Version: 0.1.0-2 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
diff -Nru silly-0.1.0/debian/changelog silly-0.1.0/debian/changelog --- silly-0.1.0/debian/changelog 2011-07-24 04:02:17.000000000 +0900 +++ silly-0.1.0/debian/changelog 2011-08-11 11:30:54.000000000 +0900 @@ -1,3 +1,10 @@ +silly (0.1.0-2.1) unstable; urgency=low + + * Non-maintainer upload. + * libpng15 transition. + + -- Nobuhiro Iwamatsu <[email protected]> Thu, 11 Aug 2011 11:30:41 +0900 + silly (0.1.0-2) unstable; urgency=low * In this new revision *.la file is not being shipped anymore. This is done to diff -Nru silly-0.1.0/debian/control silly-0.1.0/debian/control --- silly-0.1.0/debian/control 2011-07-24 03:47:23.000000000 +0900 +++ silly-0.1.0/debian/control 2011-08-11 11:31:35.000000000 +0900 @@ -1,7 +1,7 @@ Source: silly Priority: extra Maintainer: Muammar El Khatib <[email protected]> -Build-Depends: debhelper (>= 7), autotools-dev, libpng12-dev, libjpeg-dev, +Build-Depends: debhelper (>= 7), autotools-dev, libpng-dev, libjpeg-dev, doxygen Standards-Version: 3.9.2 Section: libs diff -Nru silly-0.1.0/debian/patches/debian-changes-0.1.0-2.1 silly-0.1.0/debian/patches/debian-changes-0.1.0-2.1 --- silly-0.1.0/debian/patches/debian-changes-0.1.0-2.1 1970-01-01 09:00:00.000000000 +0900 +++ silly-0.1.0/debian/patches/debian-changes-0.1.0-2.1 2011-08-11 11:31:38.000000000 +0900 @@ -0,0 +1,40 @@ +Description: Upstream changes introduced in version 0.1.0-2.1 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + silly (0.1.0-2.1) unstable; urgency=low + . + * Non-maintainer upload. + * libpng15 transition. + . + The person named in the Author field signed this changelog entry. +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> + +--- silly-0.1.0.orig/src/loaders/SILLYPNGImageLoader.cpp ++++ silly-0.1.0/src/loaders/SILLYPNGImageLoader.cpp +@@ -66,7 +66,11 @@ void PNG_error_function(png_structp png_ + // printf("PNG Error: %s\n", error); + // copied from libpng's pngerror.cpp + jmp_buf buf; ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ memcpy(buf, png_jmpbuf((png_ptr)), sizeof(jmp_buf)); ++#else + memcpy(buf, png_ptr->jmpbuf, sizeof(jmp_buf)); ++#endif + longjmp(buf, 1); + } + diff -Nru silly-0.1.0/debian/patches/series silly-0.1.0/debian/patches/series --- silly-0.1.0/debian/patches/series 1970-01-01 09:00:00.000000000 +0900 +++ silly-0.1.0/debian/patches/series 2011-08-11 11:31:16.000000000 +0900 @@ -0,0 +1 @@ +debian-changes-0.1.0-2.1
