Source: imlib2
Version: 1.4.4-1
Severity: important
Tags: patch
User: lib...@packages.debian.org
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
diff -Nru imlib2-1.4.4/debian/changelog imlib2-1.4.4/debian/changelog
--- imlib2-1.4.4/debian/changelog 2011-04-03 01:24:26.000000000 +0000
+++ imlib2-1.4.4/debian/changelog 2011-05-26 14:23:48.000000000 +0000
@@ -1,3 +1,10 @@
+imlib2 (1.4.4-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * transition
+
+ -- root <root@xps-iwamatsu> Thu, 26 May 2011 14:23:42 +0000
+
imlib2 (1.4.4-1) unstable; urgency=low
* New upstream release
diff -Nru imlib2-1.4.4/debian/patches/debian-changes-1.4.4-1.1 imlib2-1.4.4/debian/patches/debian-changes-1.4.4-1.1
--- imlib2-1.4.4/debian/patches/debian-changes-1.4.4-1.1 1970-01-01 00:00:00.000000000 +0000
+++ imlib2-1.4.4/debian/patches/debian-changes-1.4.4-1.1 2011-05-26 15:01:31.000000000 +0000
@@ -0,0 +1,74 @@
+Description: Upstream changes introduced in version 1.4.4-1.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:
+ .
+ imlib2 (1.4.4-1.1) unstable; urgency=low
+ .
+ * Non-maintainer upload.
+ * transition
+ .
+ The person named in the Author field signed this changelog entry.
+Author: root <root@xps-iwamatsu>
+
+---
+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>
+
+--- imlib2-1.4.4.orig/src/modules/loaders/loader_png.c
++++ imlib2-1.4.4/src/modules/loaders/loader_png.c
+@@ -58,7 +58,7 @@ load(ImlibImage * im, ImlibProgressFunct
+ fclose(f);
+ return 0;
+ }
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ fclose(f);
+@@ -265,7 +265,7 @@ save(ImlibImage * im, ImlibProgressFunct
+ png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
+ return 0;
+ }
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ fclose(f);
+ png_destroy_write_struct(&png_ptr, (png_infopp) & info_ptr);
+@@ -277,7 +277,6 @@ save(ImlibImage * im, ImlibProgressFunct
+ if ((tag = __imlib_GetTag(im, "interlacing")) && tag->val)
+ {
+ #ifdef PNG_WRITE_INTERLACING_SUPPORTED
+- png_ptr->interlaced = PNG_INTERLACE_ADAM7;
+ num_passes = png_set_interlace_handling(png_ptr);
+ #endif
+ }
+@@ -286,7 +285,8 @@ save(ImlibImage * im, ImlibProgressFunct
+ if (im->flags & F_HAS_ALPHA)
+ {
+ png_set_IHDR(png_ptr, info_ptr, im->w, im->h, 8,
+- PNG_COLOR_TYPE_RGB_ALPHA, png_ptr->interlaced,
++ PNG_COLOR_TYPE_RGB_ALPHA,
++ num_passes == 7 ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE,
+ PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+ #ifdef WORDS_BIGENDIAN
+ png_set_swap_alpha(png_ptr);
+@@ -297,7 +297,8 @@ save(ImlibImage * im, ImlibProgressFunct
+ else
+ {
+ png_set_IHDR(png_ptr, info_ptr, im->w, im->h, 8, PNG_COLOR_TYPE_RGB,
+- png_ptr->interlaced, PNG_COMPRESSION_TYPE_BASE,
++ num_passes == 7 ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE,
++ PNG_COMPRESSION_TYPE_BASE,
+ PNG_FILTER_TYPE_BASE);
+ data = malloc(im->w * 3 * sizeof(char));
+ }
diff -Nru imlib2-1.4.4/debian/patches/series imlib2-1.4.4/debian/patches/series
--- imlib2-1.4.4/debian/patches/series 2011-04-03 01:17:12.000000000 +0000
+++ imlib2-1.4.4/debian/patches/series 2011-05-26 15:00:13.000000000 +0000
@@ -1,2 +1,3 @@
001-removed_data_dir.diff
005-ld-no-as-needed.diff
+debian-changes-1.4.4-1.1
