mingw-w64-gdk-pixbuf2: 2.31.6 -> 2.31.7

3 files changed, 46 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 02781081eb00..e1e5c420113f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-gdk-pixbuf2
 	pkgdesc = An image loading library (mingw-w64)
-	pkgver = 2.31.6
+	pkgver = 2.31.7
 	pkgrel = 1
 	url = http://www.gtk.org
 	arch = any
@@ -17,8 +17,10 @@ pkgbase = mingw-w64-gdk-pixbuf2
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://download.gnome.org/sources/gdk-pixbuf/2.31/gdk-pixbuf-2.31.6.tar.xz
-	sha256sums = 111203d6f295d69d36e7190204248331cd37285130ac483becdedcd3f0135d18
+	source = https://download.gnome.org/sources/gdk-pixbuf/2.31/gdk-pixbuf-2.31.7.tar.xz
+	source = gdk-pixbuf2-bug-754154-fix-non-glibc-build.patch
+	sha256sums = 4736e009168857ce8bb19291f0887c1dc6551cbc3c46d5ffcd034e133e4fd610
+	sha256sums = a8b752b97c40f47473f1aa2b17063aded232c1921bbe797c8d44a6d644cdaa16
 
 pkgname = mingw-w64-gdk-pixbuf2
 
diff --git a/PKGBUILD b/PKGBUILD
index 04eff621c58d..afad942db899 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mingw-w64-gdk-pixbuf2
-pkgver=2.31.6
+pkgver=2.31.7
 pkgrel=1
 pkgdesc='An image loading library (mingw-w64)'
 arch=(any)
@@ -18,13 +18,16 @@ depends=(
   'mingw-w64-libtiff')
 options=(!strip !buildflags staticlibs)
 source=(
-  "https://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz")
-sha256sums=('111203d6f295d69d36e7190204248331cd37285130ac483becdedcd3f0135d18')
+  "https://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz"
+  'gdk-pixbuf2-bug-754154-fix-non-glibc-build.patch')
+sha256sums=('4736e009168857ce8bb19291f0887c1dc6551cbc3c46d5ffcd034e133e4fd610'
+            'a8b752b97c40f47473f1aa2b17063aded232c1921bbe797c8d44a6d644cdaa16')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 build() {
   cd "${srcdir}/gdk-pixbuf-${pkgver}"
+  patch -p1 < "${srcdir}/${source[1]}"
   for _arch in ${_architectures}; do
     mkdir -p "build-${_arch}"
     cd "build-${_arch}"
diff --git a/gdk-pixbuf2-bug-754154-fix-non-glibc-build.patch b/gdk-pixbuf2-bug-754154-fix-non-glibc-build.patch
new file mode 100644
index 000000000000..f0838339433f
--- /dev/null
+++ b/gdk-pixbuf2-bug-754154-fix-non-glibc-build.patch
@@ -0,0 +1,35 @@
+From 844bf5d40cce33a75088a6c5ab1bc82970fbfa0b Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 1 Sep 2015 17:23:06 -0500
+Subject: [PATCH] Fix build on non-linux systems after commit
+ b07c3bffffefb8573ad9ffcf926c07cb9f93d08b
+
+https://bugzilla.gnome.org/show_bug.cgi?id=754154
+---
+ tests/Makefile.am | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 01d8e42..d5dca44 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -18,10 +18,15 @@ LDADD = \
+ 
+ noinst_PROGRAMS += 			\
+ 	pixbuf-read			\
+-	pixbuf-lowmem			\
+ 	pixbuf-random			\
+ 	$(NULL)
+ 
++if OS_LINUX
++noinst_PROGRAMS += 			\
++	pixbuf-lowmem			\
++	$(NULL)
++endif
++
+ test_programs = 			\
+ 	animation			\
+ 	cve-2015-4491			\
+-- 
+2.5.1
+