Control: tags 650571 + pending Dear maintainer,
I've prepared an NMU for xbubble (versioned as 0.5.11.2-3.3) and uploaded it to DELAYED/7. Please feel free to tell me if I should delay it longer. Regards. diff -Nru xbubble-0.5.11.2/debian/changelog xbubble-0.5.11.2/debian/changelog --- xbubble-0.5.11.2/debian/changelog 2012-04-30 10:24:10.000000000 +0200 +++ xbubble-0.5.11.2/debian/changelog 2016-01-07 23:19:40.000000000 +0100 @@ -1,3 +1,10 @@ +xbubble (0.5.11.2-3.3) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS for libpng16 -- Patch from Noguhiro (Closes: #650571) + + -- Tobias Frost <t...@debian.org> Thu, 07 Jan 2016 23:19:40 +0100 + xbubble (0.5.11.2-3.2) unstable; urgency=low * Non-maintainer upload. diff -Nru xbubble-0.5.11.2/debian/patches/libpng15.patch xbubble-0.5.11.2/debian/patches/libpng15.patch --- xbubble-0.5.11.2/debian/patches/libpng15.patch 1970-01-01 01:00:00.000000000 +0100 +++ xbubble-0.5.11.2/debian/patches/libpng15.patch 2016-01-07 22:57:23.000000000 +0100 @@ -0,0 +1,53 @@ +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. + . + xbubble (0.5.11.2-3.2) unstable; urgency=low + . + * Non-maintainer upload. + * Fixes FTBFS: loadpng.c ignoring return value of fread (Closes: #664910). +Author: Thomas Goirand <z...@debian.org> +Bug-Debian: http://bugs.debian.org/664910 + +--- +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> + +--- xbubble-0.5.11.2.orig/src/loadpng.c ++++ xbubble-0.5.11.2/src/loadpng.c +@@ -80,7 +80,11 @@ unsigned char * load_png_file( const cha + return NULL; + } + /* libpng does a longjmp here when it encounters an error */ ++#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_read_struct( &png_ptr, &info_ptr, NULL); + fclose(fd); + return NULL; +@@ -102,7 +106,11 @@ unsigned char * load_png_file( const cha + png_set_gray_to_rgb(png_ptr); + + /* detect alpha layer */ ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if ((png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_ALPHA) || ++#else + if (( info_ptr->color_type & PNG_COLOR_MASK_ALPHA )|| ++#endif + ( png_get_valid( png_ptr, info_ptr, PNG_INFO_tRNS ))) + *has_alpha = 1; + else diff -Nru xbubble-0.5.11.2/debian/patches/series xbubble-0.5.11.2/debian/patches/series --- xbubble-0.5.11.2/debian/patches/series 2012-04-30 10:33:26.000000000 +0200 +++ xbubble-0.5.11.2/debian/patches/series 2016-01-07 23:14:16.000000000 +0100 @@ -1,3 +1,4 @@ 10-game.c.patch Fixes-FTBFS-with-loadpng.c-ignoring-return-value-of-fread Check-returns-from-the-realpath-function-in-data_file-function +libpng15.patch
