Package: netsurf Version: 3.2+dfsg-2.2 Severity: serious Tags: patch pending
Dear maintainer, I've prepared an NMU for netsurf (versioned as 3.2+dfsg-2.3). The diff is attached to this message. This fixes an FTBFS surfaced with libpng1.6 with s390x. Uploading directly as soon as I have the bug number -- to get forward with the libpng transtion; (it won't change netsurf's RC bugginess status) Regards. diff -Nru netsurf-3.2+dfsg/debian/changelog netsurf-3.2+dfsg/debian/changelog --- netsurf-3.2+dfsg/debian/changelog 2015-06-02 23:30:03.000000000 +0200 +++ netsurf-3.2+dfsg/debian/changelog 2016-04-10 16:17:41.000000000 +0200 @@ -1,3 +1,10 @@ +netsurf (3.2+dfsg-2.3) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix compilation error on s390x -- use libpng native types. (Closes: #xxxxxx) + + -- Tobias Frost <t...@debian.org> Sun, 10 Apr 2016 16:16:38 +0200 + netsurf (3.2+dfsg-2.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru netsurf-3.2+dfsg/debian/patches/libpng16-fix.patch netsurf-3.2+dfsg/debian/patches/libpng16-fix.patch --- netsurf-3.2+dfsg/debian/patches/libpng16-fix.patch 1970-01-01 01:00:00.000000000 +0100 +++ netsurf-3.2+dfsg/debian/patches/libpng16-fix.patch 2016-04-10 16:25:18.000000000 +0200 @@ -0,0 +1,24 @@ +Description: use png native types, they are platform dependent. + (and also silence some warnings about missing memcpy prototype) +Author: Tobias Frost <t...@debian.org> +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/netsurf/framebuffer/convert_image.c ++++ b/netsurf/framebuffer/convert_image.c +@@ -21,6 +21,7 @@ + #include <stdio.h> + #include <png.h> + #include <stdlib.h> ++#include <string.h> + + #if PNG_LIBPNG_VER < 10209 + #define png_set_expand_gray_1_2_4_to_8(png) png_set_gray_1_2_4_to_8(png) +@@ -219,7 +220,7 @@ + { + int bit_depth, color_type, interlace, intent; + double gamma; +- unsigned long width, height; ++ png_uint_32 width, height; + + /* Read the PNG details */ + png_get_IHDR(png, info, &width, &height, &bit_depth, diff -Nru netsurf-3.2+dfsg/debian/patches/series netsurf-3.2+dfsg/debian/patches/series --- netsurf-3.2+dfsg/debian/patches/series 2015-06-02 02:59:55.000000000 +0200 +++ netsurf-3.2+dfsg/debian/patches/series 2016-04-10 16:18:07.000000000 +0200 @@ -1,3 +1,4 @@ set-netsurf-config.patch change-install-binary-targets change-how-gdk-image.patch +libpng16-fix.patch
