From 12673edd972deb4d0be760eb4da7d9220e79a5bc Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Wed, 7 Oct 2015 12:30:59 +0300
Subject: [PATCH] gtk3: Update to 3.18.1

---
 mingw-w64-gtk3/060-fix-tests.patch | 14 --------------
 mingw-w64-gtk3/PKGBUILD            | 11 ++++-------
 2 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 mingw-w64-gtk3/060-fix-tests.patch

diff --git a/mingw-w64-gtk3/060-fix-tests.patch b/mingw-w64-gtk3/060-fix-tests.patch
deleted file mode 100644
index 5ad8dd8035..0000000000
--- a/mingw-w64-gtk3/060-fix-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gtk+-3.18.0/testsuite/gtk/notify.c.orig	2015-09-22 11:18:22.102607400 +0300
-+++ gtk+-3.18.0/testsuite/gtk/notify.c	2015-09-22 11:18:32.959024200 +0300
-@@ -418,10 +418,10 @@
- #ifdef GDK_WINDOWING_X11
-   if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) ;
-   else
--#endif
-   if (g_type_is_a (type, GTK_TYPE_PLUG) ||
-       g_type_is_a (type, GTK_TYPE_SOCKET))
-     return;
-+#endif
- 
- #ifdef GDK_WINDOWING_WAYLAND
-   if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ()))
diff --git a/mingw-w64-gtk3/PKGBUILD b/mingw-w64-gtk3/PKGBUILD
index 801cddad12..96cdb4a76a 100644
--- a/mingw-w64-gtk3/PKGBUILD
+++ b/mingw-w64-gtk3/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=gtk3
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=3.18.0
+pkgver=3.18.1
 pkgrel=1
 pkgdesc="GObject-based multi-platform GUI toolkit (v3) (mingw-w64)"
 arch=('any')
@@ -30,17 +30,14 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
 options=('strip' '!debug' 'staticlibs')
 source=("http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz"
         0013-fix-mingw-w64-fstat-call.mingw.patch
-        0056-missing-file-toarray-pl.patch
-        060-fix-tests.patch)
-md5sums=('7bb716b637ab413bdefd773e520c474c'
+        0056-missing-file-toarray-pl.patch)
+md5sums=('b4d4d30d90f4831855b410fb6a1fae63'
          '21789d52c1debcab59f8b6a99232de68'
-         'f25cb2486d761b60e04036947552bf82'
-         '792f715a5b342e63da24e13d5c01db1e')
+         'f25cb2486d761b60e04036947552bf82')
 
 prepare() {
   cd "${srcdir}/gtk+-${pkgver}"
   patch -Np1 -i "${srcdir}"/0013-fix-mingw-w64-fstat-call.mingw.patch
-  patch -Np1 -i "${srcdir}"/060-fix-tests.patch
 
   rm -f gdk/broadway/toarray.pl
   patch -p1 -i ${srcdir}/0056-missing-file-toarray-pl.patch