mingw-w64-gdk-pixbuf2: 2.31.2 -> 2.31.3

4 files changed, 6 insertions, 196 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c6b6cf58146b..83ab3216a9b0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-gdk-pixbuf2
 	pkgdesc = An image loading library (mingw-w64)
-	pkgver = 2.31.2
+	pkgver = 2.31.3
 	pkgrel = 1
 	url = http://www.gtk.org
 	arch = any
@@ -17,12 +17,8 @@ pkgbase = mingw-w64-gdk-pixbuf2
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = http://download.gnome.org/sources/gdk-pixbuf/2.31/gdk-pixbuf-2.31.2.tar.xz
-	source = bug-739441-build-Do-not-include-removed-file-gdk-pixbuf-i18n.h.patch
-	source = bug-745402-win32-include-gi18n-lib.h-appropriately.patch
-	sha256sums = 9e467ed09894c802499fb2399cd9a89ed21c81700ce8f27f970a833efb1e47aa
-	sha256sums = 05d755b2bc55a7dadc26321bfe67b6a383bc931a6127d90f5dd5d3915c3bd30e
-	sha256sums = 7745276e58843e1be15d1eab49df1c4632e713f3a2fe4b0254c3b0da7370a81b
+	source = http://download.gnome.org/sources/gdk-pixbuf/2.31/gdk-pixbuf-2.31.3.tar.xz
+	sha256sums = ddd861747bb7c580acce7cfa3ce38c3f52a9516e66a6477988fd100c8fb9eabc
 
 pkgname = mingw-w64-gdk-pixbuf2
 
diff --git a/PKGBUILD b/PKGBUILD
index fab74aab4b79..0231b6f3058a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mingw-w64-gdk-pixbuf2
-pkgver=2.31.2
+pkgver=2.31.3
 pkgrel=1
 pkgdesc='An image loading library (mingw-w64)'
 arch=(any)
@@ -18,20 +18,13 @@ depends=(
   'mingw-w64-libtiff')
 options=(!strip !buildflags staticlibs)
 source=(
-  "http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz"
-  "bug-739441-build-Do-not-include-removed-file-gdk-pixbuf-i18n.h.patch"
-  "bug-745402-win32-include-gi18n-lib.h-appropriately.patch")
-sha256sums=('9e467ed09894c802499fb2399cd9a89ed21c81700ce8f27f970a833efb1e47aa'
-            '05d755b2bc55a7dadc26321bfe67b6a383bc931a6127d90f5dd5d3915c3bd30e'
-            '7745276e58843e1be15d1eab49df1c4632e713f3a2fe4b0254c3b0da7370a81b')
+  "http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz")
+sha256sums=('ddd861747bb7c580acce7cfa3ce38c3f52a9516e66a6477988fd100c8fb9eabc')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 build() {
   cd "${srcdir}/gdk-pixbuf-${pkgver}"
-  patch -Np1 < "../${source[1]}"
-  patch -Np1 < "../${source[2]}"
-  autoreconf -i
   for _arch in ${_architectures}; do
     unset LDFLAGS
     mkdir -p "build-${_arch}"
diff --git a/bug-739441-build-Do-not-include-removed-file-gdk-pixbuf-i18n.h.patch b/bug-739441-build-Do-not-include-removed-file-gdk-pixbuf-i18n.h.patch
deleted file mode 100644
index 53dcad5d6b79..000000000000
--- a/bug-739441-build-Do-not-include-removed-file-gdk-pixbuf-i18n.h.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 852234fb53ecef5aa0d86b581e1d505eb82c5ceb Mon Sep 17 00:00:00 2001
-From: Marcus Karlsson <mk@acc.umu.se>
-Date: Fri, 31 Oct 2014 10:33:52 +0100
-Subject: [PATCH 03/29] build: Do not include removed file gdk-pixbuf-i18n.h
-
-The file gdk-pixbuf-i18n.h was removed in f37f850a but it is still
-included in io-gdip-utils.h. Remove all remaining references to it.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=739441
----
- docs/reference/gdk-pixbuf/Makefile.am | 1 -
- gdk-pixbuf/io-gdip-utils.h            | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am
-index 71ac69b..652da27 100644
---- a/docs/reference/gdk-pixbuf/Makefile.am
-+++ b/docs/reference/gdk-pixbuf/Makefile.am
-@@ -23,7 +23,6 @@ IGNORE_HFILES=				\
- 	pixops				\
- 	gdk-pixbuf-alias.h		\
- 	gdk-pixbuf-marshal.h		\
--	gdk-pixbuf-i18n.h 		\
- 	gdk-pixbuf-private.h		\
- 	gdk-pixbuf-xlib-private.h	\
- 	io-gif-animation.h		\
-diff --git a/gdk-pixbuf/io-gdip-utils.h b/gdk-pixbuf/io-gdip-utils.h
-index 84ecd8e..0270873 100644
---- a/gdk-pixbuf/io-gdip-utils.h
-+++ b/gdk-pixbuf/io-gdip-utils.h
-@@ -23,7 +23,6 @@
- #define _HAVE_IO_GDIP_UTILS_H
- 
- #include "gdk-pixbuf.h"
--#include "gdk-pixbuf-i18n.h"
- 
- #include "io-gdip-native.h"
- 
--- 
-2.1.0
-
diff --git a/bug-745402-win32-include-gi18n-lib.h-appropriately.patch b/bug-745402-win32-include-gi18n-lib.h-appropriately.patch
deleted file mode 100644
index 64a38c8e7b04..000000000000
--- a/bug-745402-win32-include-gi18n-lib.h-appropriately.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From c3a009b4fb2f0630ac891727810058b48c8e2670 Mon Sep 17 00:00:00 2001
-From: Ryan Lortie <desrt@desrt.ca>
-Date: Mon, 2 Mar 2015 12:21:31 -0500
-Subject: [PATCH 25/29] win32: #include gi18n-lib.h appropriately
-
-...but first make sure we pull in "config.h" to get GETTEXT_PACKAGE
-properly defined.
-
-This problem popped up while trying to do cross-builds of gtk+ to
-Windows under jhbuild.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=745402
----
- gdk-pixbuf/io-gdip-bmp.c   | 3 +++
- gdk-pixbuf/io-gdip-emf.c   | 3 +++
- gdk-pixbuf/io-gdip-gif.c   | 3 +++
- gdk-pixbuf/io-gdip-ico.c   | 3 +++
- gdk-pixbuf/io-gdip-jpeg.c  | 3 +++
- gdk-pixbuf/io-gdip-tiff.c  | 3 +++
- gdk-pixbuf/io-gdip-utils.c | 3 +++
- gdk-pixbuf/io-gdip-wmf.c   | 3 +++
- 8 files changed, 24 insertions(+)
-
-diff --git a/gdk-pixbuf/io-gdip-bmp.c b/gdk-pixbuf/io-gdip-bmp.c
-index 0eee035..420af7c 100644
---- a/gdk-pixbuf/io-gdip-bmp.c
-+++ b/gdk-pixbuf/io-gdip-bmp.c
-@@ -19,6 +19,9 @@
-  * License along with this library; if not, see <http://www.gnu.org/licenses/>.

-  */

- 

-+#include "config.h"

-+#include <glib/gi18n-lib.h>

-+

- #include "io-gdip-utils.h"

- 

- static gboolean

-diff --git a/gdk-pixbuf/io-gdip-emf.c b/gdk-pixbuf/io-gdip-emf.c
-index edba045..77e417d 100644
---- a/gdk-pixbuf/io-gdip-emf.c
-+++ b/gdk-pixbuf/io-gdip-emf.c
-@@ -19,6 +19,9 @@
-  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
-  */
- 
-+#include "config.h"
-+#include <glib/gi18n-lib.h>
-+
- #include "io-gdip-utils.h"
- 
- #ifndef INCLUDE_gdiplus
-diff --git a/gdk-pixbuf/io-gdip-gif.c b/gdk-pixbuf/io-gdip-gif.c
-index 4d4686f..68d49bf 100644
---- a/gdk-pixbuf/io-gdip-gif.c
-+++ b/gdk-pixbuf/io-gdip-gif.c
-@@ -19,6 +19,9 @@
-  * License along with this library; if not, see <http://www.gnu.org/licenses/>.

-  */

- 

-+#include "config.h"

-+#include <glib/gi18n-lib.h>

-+

- #include "io-gdip-utils.h"

- 

- static gboolean

-diff --git a/gdk-pixbuf/io-gdip-ico.c b/gdk-pixbuf/io-gdip-ico.c
-index 1403780..f17fbf9 100644
---- a/gdk-pixbuf/io-gdip-ico.c
-+++ b/gdk-pixbuf/io-gdip-ico.c
-@@ -19,6 +19,9 @@
-  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
-  */
- 
-+#include "config.h"
-+#include <glib/gi18n-lib.h>
-+
- #include "io-gdip-utils.h"
- 
- #ifndef INCLUDE_gdiplus
-diff --git a/gdk-pixbuf/io-gdip-jpeg.c b/gdk-pixbuf/io-gdip-jpeg.c
-index bc320e2..0f2db1d 100644
---- a/gdk-pixbuf/io-gdip-jpeg.c
-+++ b/gdk-pixbuf/io-gdip-jpeg.c
-@@ -19,6 +19,9 @@
-  * License along with this library; if not, see <http://www.gnu.org/licenses/>.

-  */

- 

-+#include "config.h"

-+#include <glib/gi18n-lib.h>

-+

- #define INITGUID

- #include "io-gdip-utils.h"

- 

-diff --git a/gdk-pixbuf/io-gdip-tiff.c b/gdk-pixbuf/io-gdip-tiff.c
-index 6c81e65..100f654 100644
---- a/gdk-pixbuf/io-gdip-tiff.c
-+++ b/gdk-pixbuf/io-gdip-tiff.c
-@@ -19,6 +19,9 @@
-  * License along with this library; if not, see <http://www.gnu.org/licenses/>.

-  */

- 

-+#include "config.h"

-+#include <glib/gi18n-lib.h>

-+

- #include "io-gdip-utils.h"

- 

- static gboolean

-diff --git a/gdk-pixbuf/io-gdip-utils.c b/gdk-pixbuf/io-gdip-utils.c
-index 5a31c75..e5f3e14 100644
---- a/gdk-pixbuf/io-gdip-utils.c
-+++ b/gdk-pixbuf/io-gdip-utils.c
-@@ -20,6 +20,9 @@
-  */
- 
- #define INITGUID
-+#include "config.h"
-+#include <glib/gi18n-lib.h>
-+
- #include <ole2.h>
- 
- #include "io-gdip-utils.h"
-diff --git a/gdk-pixbuf/io-gdip-wmf.c b/gdk-pixbuf/io-gdip-wmf.c
-index cfe580c..c438c89 100644
---- a/gdk-pixbuf/io-gdip-wmf.c
-+++ b/gdk-pixbuf/io-gdip-wmf.c
-@@ -19,6 +19,9 @@
-  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
-  */
- 
-+#include "config.h"
-+#include <glib/gi18n-lib.h>
-+
- #include "io-gdip-utils.h"
- 
- #ifndef INCLUDE_gdiplus
--- 
-2.1.0
-