mingw-w64-gtk3: 3.14.6 -> 3.14.7

3 files changed, 7 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cebc3c159a8a..41d3103d7835 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-gtk3
 	pkgdesc = GObject-based multi-platform GUI toolkit (v3) (mingw-w64)
-	pkgver = 3.14.6
+	pkgver = 3.14.7
 	pkgrel = 1
 	url = http://www.gtk.org
 	arch = any
@@ -19,14 +19,12 @@ pkgbase = mingw-w64-gtk3
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = http://ftp.gnome.org/pub/gnome/sources/gtk+/3.14/gtk+-3.14.6.tar.xz
+	source = http://ftp.gnome.org/pub/gnome/sources/gtk+/3.14/gtk+-3.14.7.tar.xz
 	source = gtk3-aur-remove-gobject-introspection.patch
 	source = gtk3-bug-731013-fix-cross-compilation.patch
-	source = gtk3-bug-741827-reftests-fix-typo.patch
-	sha256sums = cfc424e6e10ffeb34a33762aeb77905c3ed938f0b4006ddb7e880aad234ef119
+	sha256sums = fb9914b04f218c1afb4820ea492f3c6ab6d6993cc6634ecade8303678d05a46e
 	sha256sums = ae632ad20c87032c326dbb1cda086e33a5078909f89174b2ba232be1b48c32a3
 	sha256sums = 2dd763d32f7b7de08a325d32b811e87266277edb6055a043632d10c146ffc6d3
-	sha256sums = 839ac6fa6613d0daf6e8eac6ef8d07b8f825a6556640fa480c597bd7c88e3e82
 
 pkgname = mingw-w64-gtk3
 
diff --git a/PKGBUILD b/PKGBUILD
index 495b4dde8310..b644dd64ab30 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: lantw44 at gmail dot com
 
 pkgname=mingw-w64-gtk3
-pkgver=3.14.6
+pkgver=3.14.7
 pkgrel=1
 pkgdesc='GObject-based multi-platform GUI toolkit (v3) (mingw-w64)'
 arch=(any)
@@ -25,13 +25,11 @@ options=(!strip !buildflags staticlibs)
 source=(
   "http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz"
   "gtk3-aur-remove-gobject-introspection.patch"
-  "gtk3-bug-731013-fix-cross-compilation.patch"
-  "gtk3-bug-741827-reftests-fix-typo.patch")
+  "gtk3-bug-731013-fix-cross-compilation.patch")
 
-sha256sums=('cfc424e6e10ffeb34a33762aeb77905c3ed938f0b4006ddb7e880aad234ef119'
+sha256sums=('fb9914b04f218c1afb4820ea492f3c6ab6d6993cc6634ecade8303678d05a46e'
             'ae632ad20c87032c326dbb1cda086e33a5078909f89174b2ba232be1b48c32a3'
-            '2dd763d32f7b7de08a325d32b811e87266277edb6055a043632d10c146ffc6d3'
-            '839ac6fa6613d0daf6e8eac6ef8d07b8f825a6556640fa480c597bd7c88e3e82')
+            '2dd763d32f7b7de08a325d32b811e87266277edb6055a043632d10c146ffc6d3')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
@@ -39,7 +37,6 @@ build() {
   cd "${srcdir}/gtk+-${pkgver}"
   patch -Np1 < "../${source[1]}"
   patch -Np1 < "../${source[2]}"
-  patch -Np1 < "../${source[3]}"
   autoreconf -i
   for _arch in ${_architectures}; do
     unset LDFLAGS
diff --git a/gtk3-bug-741827-reftests-fix-typo.patch b/gtk3-bug-741827-reftests-fix-typo.patch
deleted file mode 100644
index 107fa72c1005..000000000000
--- a/gtk3-bug-741827-reftests-fix-typo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4d9fde3105eba615785238b6766e0220333cccd3 Mon Sep 17 00:00:00 2001
-From: Ting-Wei Lan <lantw@src.gnome.org>
-Date: Sun, 21 Dec 2014 14:51:00 +0800
-Subject: [PATCH] reftests: Fix typo
-
-It causes build failure on MinGW.
----
- testsuite/reftests/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testsuite/reftests/Makefile.am b/testsuite/reftests/Makefile.am
-index 7479dae..b4b2bc8 100644
---- a/testsuite/reftests/Makefile.am
-+++ b/testsuite/reftests/Makefile.am
-@@ -42,7 +42,7 @@ noinst_LTLIBRARIES =		\
- endif
- 
- libgtkreftestprivate_la_CFLAGS = $(gtk_reftest_CFLAGS)
--libgtkreftestprivate_la_LDLAGS = $(no_undefined)
-+libgtkreftestprivate_la_LDFLAGS = $(no_undefined)
- libgtkreftestprivate_la_LIBADD =	\
- 	$(top_builddir)/gdk/libgdk-3.la \
- 	$(top_builddir)/gtk/libgtk-3.la \
--- 
-2.1.0
-