From aa4ac48702f67f023a122d1dd882b769dfda7c76 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 23 Nov 2016 20:12:05 +0100
Subject: [PATCH] Update mingw-w64-gtk3 to 3.22.3

---
 gtk3/mingw-w64/PKGBUILD                       | 16 ++++++---
 .../gtk3-gdkdisplay-win32-winnt.patch         | 33 +++++++++++++++++++
 .../gtk3-gdkscreen-win32-winnt.patch          | 31 +++++++++++++++++
 3 files changed, 75 insertions(+), 5 deletions(-)
 create mode 100644 gtk3/mingw-w64/gtk3-gdkdisplay-win32-winnt.patch
 create mode 100644 gtk3/mingw-w64/gtk3-gdkscreen-win32-winnt.patch

diff --git a/gtk3/mingw-w64/PKGBUILD b/gtk3/mingw-w64/PKGBUILD
index e149fb5e..264599dd 100644
--- a/gtk3/mingw-w64/PKGBUILD
+++ b/gtk3/mingw-w64/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor Martchus <martchus@gmx.net>
 
 pkgname=mingw-w64-gtk3
-pkgver=3.22.2
+pkgver=3.22.3
 pkgrel=1
 pkgdesc='GObject-based multi-platform GUI toolkit (mingw-w64)'
 arch=(any)
@@ -26,15 +26,21 @@ depends=(
   'mingw-w64-pango>=1.37.3')
 options=(!strip !buildflags staticlibs)
 source=("https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz"
-        '0001-Link-explicitely-against-msvcr90-to-prevent-linker-e.patch')
-sha256sums=('2343dcaed2fc237ef718136ff4110fef7eb1ebfe178a9b064aa21cd74ecb6946'
-            '2527a537b0917844b18b72377dbe3f276c7844473fb61b58d2815c65a5cded75')
+        '0001-Link-explicitely-against-msvcr90-to-prevent-linker-e.patch'
+        'gtk3-gdkdisplay-win32-winnt.patch'
+        'gtk3-gdkscreen-win32-winnt.patch')
+sha256sums=('e190ab1a9a893861b8e8be341aa57bce8b7146d6445ebfe5a8ab64236fe82ed3'
+            '2527a537b0917844b18b72377dbe3f276c7844473fb61b58d2815c65a5cded75'
+            'c3aadfa67e29adea61cec87bd65229d4fb8dc25301cb448bb59f0ead63829ae2'
+            '6af598b8e9bdace52485013c7b4393903ae829a1f3f637611cedbdee506861c3')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
     cd "${srcdir}/gtk+-${pkgver}"
-    patch -p1 -i ${srcdir}/0001-Link-explicitely-against-msvcr90-to-prevent-linker-e.patch
+    for patch in "${srcdir}/"*.patch; do
+        patch -Np1 -i $patch
+    done
     autoreconf -fi
 }
 
diff --git a/gtk3/mingw-w64/gtk3-gdkdisplay-win32-winnt.patch b/gtk3/mingw-w64/gtk3-gdkdisplay-win32-winnt.patch
new file mode 100644
index 00000000..104ebc0d
--- /dev/null
+++ b/gtk3/mingw-w64/gtk3-gdkdisplay-win32-winnt.patch
@@ -0,0 +1,33 @@
+From 27b68ff1931a2750a1a3effd6a06414142630867 Mon Sep 17 00:00:00 2001
+From: Chun-wei Fan <fanchunwei@src.gnome.org>
+Date: Fri, 11 Nov 2016 20:53:41 +0800
+Subject: gdkdisplay-win32.c: Define _WIN32_WINNT
+
+... to be for Vista (0x0600) or later.  This is so that the necessary
+items in the Windows headers be activated so that the code will build
+properly on mingw-w64, and we already require Vista or later for GTK+.
+
+Thanks Ting-Wei Lan for pointing this out.
+
+See: https://bugzilla.gnome.org/show_bug.cgi?id=768081#c62
+---
+ gdk/win32/gdkdisplay-win32.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
+index 9267640..ceec5b3 100644
+--- a/gdk/win32/gdkdisplay-win32.c
++++ b/gdk/win32/gdkdisplay-win32.c
+@@ -17,6 +17,9 @@
+  */
+ 
+ #include "config.h"
++
++#define _WIN32_WINNT 0x0600
++
+ #include "gdk.h"
+ #include "gdkprivate-win32.h"
+ #include "gdkdisplay-win32.h"
+-- 
+cgit v0.12
+
diff --git a/gtk3/mingw-w64/gtk3-gdkscreen-win32-winnt.patch b/gtk3/mingw-w64/gtk3-gdkscreen-win32-winnt.patch
new file mode 100644
index 00000000..7b91b911
--- /dev/null
+++ b/gtk3/mingw-w64/gtk3-gdkscreen-win32-winnt.patch
@@ -0,0 +1,31 @@
+From d3bdd384a18edaf90eab0d387a08beb8e7044f62 Mon Sep 17 00:00:00 2001
+From: Chun-wei Fan <fanchunwei@src.gnome.org>
+Date: Fri, 11 Nov 2016 21:03:46 +0800
+Subject: gdkscreen-win32.c: Also define _WIN32_WINNT
+
+As in the last commit on gdkdisplay-win32.c, we need to define that to be
+0x0600 (Vista) or later so that the items needed in the Windows headers be
+activated.
+
+See: https://bugzilla.gnome.org/show_bug.cgi?id=768081#c62
+---
+ gdk/win32/gdkscreen-win32.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/gdk/win32/gdkscreen-win32.c b/gdk/win32/gdkscreen-win32.c
+index 3c14227..281b680 100644
+--- a/gdk/win32/gdkscreen-win32.c
++++ b/gdk/win32/gdkscreen-win32.c
+@@ -16,6 +16,9 @@
+  */
+ 
+ #include "config.h"
++
++#define _WIN32_WINNT 0x0600
++
+ #include "gdk.h"
+ #include "gdkprivate-win32.h"
+ #include "gdkscreenprivate.h"
+-- 
+cgit v0.12
+