mingw-w64-gtk3: 3.24.31 -> 3.24.34

3 files changed, 6 insertions, 70 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e98f3a2b917d..424659bd6aad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-gtk3
 	pkgdesc = GObject-based multi-platform GUI toolkit (mingw-w64)
-	pkgver = 3.24.31
+	pkgver = 3.24.34
 	pkgrel = 1
 	url = https://www.gtk.org
 	install = mingw-w64-gtk3.install
@@ -24,11 +24,7 @@ pkgbase = mingw-w64-gtk3
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.31.tar.xz
-	source = mingw-w64-gtk3-3.24.31-gdkkeys-win32.h::https://gitlab.gnome.org/GNOME/gtk/-/raw/3.24.31/gdk/win32/gdkkeys-win32.h
-	source = gtk3-merge-4292-fix-windows-build.patch
-	sha256sums = 423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9
-	sha256sums = 540c9fbca675a787377b9ba832df1acb0e870088e0c0bb2484312dc9754797a0
-	sha256sums = cbcda384fb206388d69729cb8e81cbbf87db362d83292f36a42cde9f0c2e7cb5
+	source = https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.34.tar.xz
+	sha256sums = dbc69f90ddc821b8d1441f00374dc1da4323a2eafa9078e61edbe5eeefa852ec
 
 pkgname = mingw-w64-gtk3
diff --git a/PKGBUILD b/PKGBUILD
index 8be234fb45af..efd0fb442d3e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: lantw44 at gmail dot com
 
 pkgname=mingw-w64-gtk3
-pkgver=3.24.31
+pkgver=3.24.34
 pkgrel=1
 pkgdesc='GObject-based multi-platform GUI toolkit (mingw-w64)'
 arch=('any')
@@ -27,22 +27,15 @@ depends=(
   'mingw-w64-pango>=1.41.0')
 options=('!strip' '!buildflags' 'staticlibs')
 source=(
-  "https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz"
-  "${pkgname}-${pkgver}-gdkkeys-win32.h::https://gitlab.gnome.org/GNOME/gtk/-/raw/${pkgver}/gdk/win32/gdkkeys-win32.h"
-  'gtk3-merge-4292-fix-windows-build.patch')
+  "https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz")
 sha256sums=(
-  '423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9'
-  '540c9fbca675a787377b9ba832df1acb0e870088e0c0bb2484312dc9754797a0'
-  'cbcda384fb206388d69729cb8e81cbbf87db362d83292f36a42cde9f0c2e7cb5')
+  'dbc69f90ddc821b8d1441f00374dc1da4323a2eafa9078e61edbe5eeefa852ec')
 
 _architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32')
 
 prepare() {
   cd "${srcdir}/gtk+-${pkgver}"
   local source_file
-  for source_file in "${source[@]:1:1}"; do
-    cp "${srcdir}/${source_file%%::*}" "gdk/win32/${source_file##*/}"
-  done
   for source_file in "${source[@]}"; do
     case "${source_file}" in
       *.patch)
diff --git a/gtk3-merge-4292-fix-windows-build.patch b/gtk3-merge-4292-fix-windows-build.patch
deleted file mode 100644
index cd2e4b238ef2..000000000000
--- a/gtk3-merge-4292-fix-windows-build.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 4090306fd7216cb102590262b444de7127242725 Mon Sep 17 00:00:00 2001
-From: Melroy van den Berg <melroy@melroy.org>
-Date: Tue, 28 Dec 2021 00:47:28 +0100
-Subject: [PATCH 1/3] Lowercaps Windows.h -> windows.h
-
----
- gdk/win32/gdkkeys-win32.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gdk/win32/gdkkeys-win32.h b/gdk/win32/gdkkeys-win32.h
-index 14a69d8081..17b7d7125c 100644
---- a/gdk/win32/gdkkeys-win32.h
-+++ b/gdk/win32/gdkkeys-win32.h
-@@ -22,7 +22,7 @@
-  */
- 
- #include <glib.h>
--#include <Windows.h>
-+#include <windows.h>
- 
- /* For lookup table VK -> chars */
- typedef struct 
--- 
-GitLab
-
-
-From 37f9af58059252c27197444f13fd9fe5b65ef4b4 Mon Sep 17 00:00:00 2001
-From: Melroy van den Berg <melroy@melroy.org>
-Date: Tue, 28 Dec 2021 00:50:17 +0100
-Subject: [PATCH 2/3] Add define for GC_ALLGESTURES, in-case WINVER is not set.
-
----
- gdk/win32/winpointer.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/gdk/win32/winpointer.h b/gdk/win32/winpointer.h
-index ee3e42e063..786f6016c7 100644
---- a/gdk/win32/winpointer.h
-+++ b/gdk/win32/winpointer.h
-@@ -138,6 +138,10 @@
- #define PA_ACTIVATE MA_ACTIVATE
- #define PA_NOACTIVATE MA_NOACTIVATE
- 
-+#ifndef GC_ALLGESTURES
-+#define GC_ALLGESTURES 0x1
-+#endif
-+
- typedef DWORD POINTER_INPUT_TYPE;
- typedef UINT32 POINTER_FLAGS;
- typedef UINT32 TOUCH_FLAGS;
--- 
-GitLab
-