From 7fc170f7935871dccf7df3e6ff429660dbe53004 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sat, 12 Aug 2017 23:24:53 +0200
Subject: [PATCH] gdk-pixbuf2: Update to 2.36.8 (#2706)

Also drop a bogus patch.
The commit said "The function always returned NULL - now fixed", but
(1) that's not the case
(2) returning a random unrelated pointer wont help..
---
 mingw-w64-gdk-pixbuf2/PKGBUILD                       | 10 +++-------
 .../gdk_pixbuf_loader_get_pixbuf.patch               | 12 ------------
 2 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 mingw-w64-gdk-pixbuf2/gdk_pixbuf_loader_get_pixbuf.patch

diff --git a/mingw-w64-gdk-pixbuf2/PKGBUILD b/mingw-w64-gdk-pixbuf2/PKGBUILD
index 5dc335799b..d5c47f2ab7 100644
--- a/mingw-w64-gdk-pixbuf2/PKGBUILD
+++ b/mingw-w64-gdk-pixbuf2/PKGBUILD
@@ -5,8 +5,8 @@
 _realname=gdk-pixbuf2
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.36.6
-pkgrel=2
+pkgver=2.36.8
+pkgrel=1
 pkgdesc="An image loading library (mingw-w64)"
 arch=('any')
 url="http://www.gtk.org"
@@ -24,20 +24,16 @@ options=('emptydirs')
 install=${_realname}-${CARCH}.install
 source=("https://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-${pkgver}.tar.xz"
         0003-fix-dllmain.patch
-        gdk_pixbuf_loader_get_pixbuf.patch
         0001-windows-rework-loaders-cache-relocation-support.patch
         )
-sha256sums=('455eb90c09ed1b71f95f3ebfe1c904c206727e0eeb34fc94e5aaf944663a820c'
+sha256sums=('5d68e5283cdc0bf9bda99c3e6a1d52ad07a03364fa186b6c26cfc86fcd396a19'
             '21bd9b2ba1447267c84f1b445cbcf50c62299254856c1c227cc7ba4babc9f27e'
-            '47a4fb86cb791a7b0544484d62aa1c267745b1a61e594b08a82c12868947ae26'
             '50e5e0f9d6ab91809c1c96522240b0519b70f101c98689c51d493833d3859a5d')
 
 prepare() {
   cd ${srcdir}/gdk-pixbuf-${pkgver}
   msg2 "0003-fix-dllmain.patch"
   patch -p1 -i "${srcdir}"/0003-fix-dllmain.patch
-  msg2 "gdk_pixbuf_loader_get_pixbuf.patch"
-  patch -p1 -i "${srcdir}"/gdk_pixbuf_loader_get_pixbuf.patch
   msg2 "0001-windows-rework-loaders-cache-relocation-support.patch"
   patch -p1 -i "${srcdir}"/0001-windows-rework-loaders-cache-relocation-support.patch
 
diff --git a/mingw-w64-gdk-pixbuf2/gdk_pixbuf_loader_get_pixbuf.patch b/mingw-w64-gdk-pixbuf2/gdk_pixbuf_loader_get_pixbuf.patch
deleted file mode 100644
index e93c2b4f84..0000000000
--- a/mingw-w64-gdk-pixbuf2/gdk_pixbuf_loader_get_pixbuf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gdk-pixbuf-2.36.0.orig/gdk-pixbuf/gdk-pixbuf-loader.c gdk-pixbuf-2.36.0/gdk-pixbuf/gdk-pixbuf-loader.c
---- gdk-pixbuf-2.36.0.orig/gdk-pixbuf/gdk-pixbuf-loader.c	2016-08-02 18:50:41.000000000 +0200
-+++ gdk-pixbuf-2.36.0/gdk-pixbuf/gdk-pixbuf-loader.c	2016-10-20 18:55:04.046471400 +0200
-@@ -735,7 +735,7 @@
-         if (priv->animation)
-                 return gdk_pixbuf_animation_get_static_image (priv->animation);
-         else
--                return NULL;
-+                return priv;
- }
- 
- /**