Bug#635946: gnome-xcf-thumbnailer: diff for NMU version 1.0-1.2

[Tobias Frost]

Control: tags 635946 + pending

Dear maintainer,

I've prepared an NMU for gnome-xcf-thumbnailer (versioned as 1.0-1.2) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

Regards.
diff -u gnome-xcf-thumbnailer-1.0/debian/changelog 
gnome-xcf-thumbnailer-1.0/debian/changelog
--- gnome-xcf-thumbnailer-1.0/debian/changelog
+++ gnome-xcf-thumbnailer-1.0/debian/changelog
@@ -1,3 +1,11 @@
+gnome-xcf-thumbnailer (1.0-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "FTBFS with libpng 1.5.2", applying patch from Nobuhiro
+    (Closes: #635946)
+
+ -- Tobias Frost <t...@debian.org>  Wed, 06 Jan 2016 12:00:11 +0100
+
 gnome-xcf-thumbnailer (1.0-1.1) unstable; urgency=medium
 
   * Non-maintainer upload by the Security Team
only in patch2:
unchanged:
--- gnome-xcf-thumbnailer-1.0.orig/xcf2png.c
+++ gnome-xcf-thumbnailer-1.0/xcf2png.c
@@ -70,10 +70,17 @@
   png_bytep ptrans = NULL ;
   
   outfile = openout(flatspec.output_filename);
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+  libpng = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+                                   NULL,
+                                   my_error_callback,
+                                   NULL);
+#else
   libpng = png_create_write_struct(PNG_LIBPNG_VER_STRING,
                                    png_voidp_NULL,
                                    my_error_callback,
                                    png_error_ptr_NULL);
+#endif
   if( !libpng )
     FatalUnexpected(_("Couldn't initialize libpng library"));