add patch to update NULLs for later libpng versions

2 files changed, 24 insertions, 8 deletions

diff --git a/NULL-updates.patch b/NULL-updates.patch
new file mode 100644
index 000000000000..e37390906fa4
--- /dev/null
+++ b/NULL-updates.patch
@@ -0,0 +1,14 @@
+--- a/xcf2png.c	2016-09-17 09:57:18.537771893 -0600
++++ b/xcf2png.c	2016-09-17 09:57:46.797525769 -0600
+@@ -71,9 +71,9 @@
+   
+   outfile = openout(flatspec.output_filename);
+   libpng = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+-                                   png_voidp_NULL,
++                                   NULL,
+                                    my_error_callback,
+-                                   png_error_ptr_NULL);
++                                   NULL);
+   if( !libpng )
+     FatalUnexpected(_("Couldn't initialize libpng library"));
+   
diff --git a/PKGBUILD b/PKGBUILD
index d069934f8706..3b4cdd8223bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,30 +8,32 @@ pkgdesc="GNOME thumbnailer for GIMP XCF files."
 arch=('i686' 'x86_64')
 url="https://download.gnome.org/sources/gnome-xcf-thumbnailer/"
 license=('GPL2')
-depends=('glib2' 'libpng12>=1.2.13')
+depends=('glib2' 'libpng')
 optdepends=('gimp: Required to create thumbnails')
 source=("https://download.gnome.org/sources/gnome-xcf-thumbnailer/${pkgver}/gnome-xcf-thumbnailer-${pkgver}.tar.bz2"
         "gnome-xcf-thumbnailer.thumbnailer"
         "no-popt.patch"
-        "CVE-2009-0217.patch")
+        "CVE-2009-0217.patch"
+        "NULL-updates.patch")
 sha256sums=('d0489a00a493242f65db22e2861d37f59c540055dd1aa573bb09886180ab4bd0'
             '401c9d7eb3a47a223110599c54af0b9feddc8026a1fc812df866ff19e7e33ac0'
             '9f3e31804362a7c6d3224e9fd61dd3c4cddc872eafa9b754ddab7aaa30bad8aa'
-            '8a56cf5cd9fdb1aa677f93236c110572450c5f702cd3cb8fa5517ecbe6b0f1a8')
+            '8a56cf5cd9fdb1aa677f93236c110572450c5f702cd3cb8fa5517ecbe6b0f1a8'
+            '1637e7b2d2904729b20174fb55ef554d4b70a56b55897e7393088591d862cf8e')
 
 prepare(){
   # Patches used by Debian to build
   patch -d gnome-xcf-thumbnailer-$pkgver -p1 < no-popt.patch
   patch -d gnome-xcf-thumbnailer-$pkgver -p1 < CVE-2009-0217.patch
+
+  # libpng12 does not distribute headers any more. We must adjust to be
+  # buildable with recent versions of libpng.
+  patch -d gnome-xcf-thumbnailer-$pkgver -p1 < NULL-updates.patch
 }
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  
-  LIBPNG_CFLAGS=-I/usr/include/libpng12 \
-    LIBPNG_LIBS=-lpng12 \
-    ./configure --prefix=/usr
-  
+  ./configure --prefix=/usr
   make
 }