mingw-w64-gtk4: 4.4.1 -> 4.6.1

5 files changed, 61 insertions, 107 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2d8661f0767c..5608bb6dfc60 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mingw-w64-gtk4
 	pkgdesc = GObject-based multi-platform GUI toolkit (mingw-w64)
-	pkgver = 4.4.1
-	pkgrel = 2
+	pkgver = 4.6.1
+	pkgrel = 1
 	url = https://www.gtk.org
 	install = mingw-w64-gtk4.install
 	arch = any
@@ -21,16 +21,17 @@ pkgbase = mingw-w64-gtk4
 	depends = mingw-w64-gst-plugins-bad>=1.12.3
 	depends = mingw-w64-harfbuzz>=2.1.0
 	depends = mingw-w64-libepoxy>=1.4
-	depends = mingw-w64-librsvg>=2.46.0
-	depends = mingw-w64-pango>=1.47.0
+	depends = mingw-w64-libjpeg-turbo
+	depends = mingw-w64-libpng
+	depends = mingw-w64-librsvg>=2.52.0
+	depends = mingw-w64-libtiff
+	depends = mingw-w64-pango>=1.50.0
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://download.gnome.org/sources/gtk/4.4/gtk-4.4.1.tar.xz
-	source = gtk4-merge-3999-fix-find_library.patch
-	source = gtk4-merge-4000-fix-includes.patch
-	sha256sums = 0faada983dc6b0bc409cb34c1713c1f3267e67c093f86b1e3b17db6100a3ddf4
-	sha256sums = fca9be9278d60eeb28c9a41b2571e880e0ac4a6bf7baa90e87007d18b581052e
-	sha256sums = 6d043e449774f3c3bef58478dbea6359cf43301bdf573ca0cced14520cb87742
+	source = https://download.gnome.org/sources/gtk/4.6/gtk-4.6.1.tar.xz
+	source = gtk4-merge-4565-fix-cross-compilation.patch
+	sha256sums = d85508d21cbbcd63d568a7862af5ecd63b978d7d5799cbe404c91d2389d0ec5f
+	sha256sums = 63d2cb66e347d640511c32925f15f7caa6845730be36d466faf04997315c2aa5
 
 pkgname = mingw-w64-gtk4
diff --git a/PKGBUILD b/PKGBUILD
index e032e56312ca..024c940ac2ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: lantw44 (at) gmail (dot) com
 
 pkgname=mingw-w64-gtk4
-pkgver=4.4.1
-pkgrel=2
+pkgver=4.6.1
+pkgrel=1
 pkgdesc='GObject-based multi-platform GUI toolkit (mingw-w64)'
 arch=('any')
 url='https://www.gtk.org'
@@ -25,17 +25,18 @@ depends=(
   'mingw-w64-gst-plugins-bad>=1.12.3'
   'mingw-w64-harfbuzz>=2.1.0'
   'mingw-w64-libepoxy>=1.4'
-  'mingw-w64-librsvg>=2.46.0'
-  'mingw-w64-pango>=1.47.0')
+  'mingw-w64-libjpeg-turbo'
+  'mingw-w64-libpng'
+  'mingw-w64-librsvg>=2.52.0'
+  'mingw-w64-libtiff'
+  'mingw-w64-pango>=1.50.0')
 options=('!strip' '!buildflags' 'staticlibs')
 source=(
   "https://download.gnome.org/sources/gtk/${pkgver%.*}/gtk-${pkgver}.tar.xz"
-  'gtk4-merge-3999-fix-find_library.patch'
-  'gtk4-merge-4000-fix-includes.patch')
+  'gtk4-merge-4565-fix-cross-compilation.patch')
 sha256sums=(
-  '0faada983dc6b0bc409cb34c1713c1f3267e67c093f86b1e3b17db6100a3ddf4'
-  'fca9be9278d60eeb28c9a41b2571e880e0ac4a6bf7baa90e87007d18b581052e'
-  '6d043e449774f3c3bef58478dbea6359cf43301bdf573ca0cced14520cb87742')
+  'd85508d21cbbcd63d568a7862af5ecd63b978d7d5799cbe404c91d2389d0ec5f'
+  '63d2cb66e347d640511c32925f15f7caa6845730be36d466faf04997315c2aa5')
 
 _architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32')
 
diff --git a/gtk4-merge-3999-fix-find_library.patch b/gtk4-merge-3999-fix-find_library.patch
deleted file mode 100644
index dcc67b73499e..000000000000
--- a/gtk4-merge-3999-fix-find_library.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From f96c4eb5bb44d3676cc2b58845a254038e7866bb Mon Sep 17 00:00:00 2001
-From: Ting-Wei Lan <lantw@src.gnome.org>
-Date: Sun, 26 Sep 2021 17:47:33 +0800
-Subject: [PATCH] broadway: Use the correct way to call find_library
-
-While broadway currently doesn't build on Windows, it is still better to
-avoid using the old and unsupported way to call find_library.
-
-https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/3999
----
- gdk/broadway/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gdk/broadway/meson.build b/gdk/broadway/meson.build
-index 530dcd99ef..ef7fa0ef58 100644
---- a/gdk/broadway/meson.build
-+++ b/gdk/broadway/meson.build
-@@ -64,7 +64,7 @@ libgdk_broadway = static_library('gdk-broadway',
- 
- # gtk4-broadwayd
- 
--broadwayd_syslib = os_win32 ? find_library('ws2_32') : shmlib
-+broadwayd_syslib = os_win32 ? cc.find_library('ws2_32') : shmlib
- 
- executable('gtk4-broadwayd',
-   sources: [
--- 
-GitLab
-
diff --git a/gtk4-merge-4000-fix-includes.patch b/gtk4-merge-4000-fix-includes.patch
deleted file mode 100644
index 6d021a22ed4c..000000000000
--- a/gtk4-merge-4000-fix-includes.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 5175b1676bad982c9e526f7a0c8fd1893eef4ac5 Mon Sep 17 00:00:00 2001
-From: Ting-Wei Lan <lantw@src.gnome.org>
-Date: Sun, 26 Sep 2021 18:47:18 +0800
-Subject: [PATCH] GDK/Win32: Use lowercase windows.h
-
-Fix build on case-sensitive file systems, so it can be cross-compiled
-from Linux with MinGW.
-
-https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4000
----
- gdk/win32/gdkcairocontext-win32.c      | 2 +-
- gdk/win32/gdkhdataoutputstream-win32.c | 2 +-
- gdk/win32/gdkwin32cursor.h             | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gdk/win32/gdkcairocontext-win32.c b/gdk/win32/gdkcairocontext-win32.c
-index 9eb115ffcd..0f9dbbca1a 100644
---- a/gdk/win32/gdkcairocontext-win32.c
-+++ b/gdk/win32/gdkcairocontext-win32.c
-@@ -27,7 +27,7 @@
- 
- #include <cairo-win32.h>
- 
--#include <Windows.h>
-+#include <windows.h>
- 
- G_DEFINE_TYPE (GdkWin32CairoContext, gdk_win32_cairo_context, GDK_TYPE_CAIRO_CONTEXT)
- 
-diff --git a/gdk/win32/gdkhdataoutputstream-win32.c b/gdk/win32/gdkhdataoutputstream-win32.c
-index 0075d0b66c..7fead7243d 100644
---- a/gdk/win32/gdkhdataoutputstream-win32.c
-+++ b/gdk/win32/gdkhdataoutputstream-win32.c
-@@ -20,7 +20,7 @@
- 
- #include "config.h"
- 
--#include <Windows.h>
-+#include <windows.h>
- 
- #include "gdkprivate-win32.h"
- #include "gdkhdataoutputstream-win32.h"
-diff --git a/gdk/win32/gdkwin32cursor.h b/gdk/win32/gdkwin32cursor.h
-index ec03f77212..a9f4676623 100644
---- a/gdk/win32/gdkwin32cursor.h
-+++ b/gdk/win32/gdkwin32cursor.h
-@@ -29,9 +29,9 @@
- #error "Only <gdk/gdkwin32.h> can be included directly."
- #endif
- 
--#include <Windows.h>
- #include <gdk/gdk.h>
- #include <gdk/win32/gdkwin32display.h>
-+#include <windows.h>
- 
- G_BEGIN_DECLS
- 
--- 
-GitLab
-
diff --git a/gtk4-merge-4565-fix-cross-compilation.patch b/gtk4-merge-4565-fix-cross-compilation.patch
new file mode 100644
index 000000000000..b1b853e4b975
--- /dev/null
+++ b/gtk4-merge-4565-fix-cross-compilation.patch
@@ -0,0 +1,40 @@
+From e1e88ce66589e1d2e235a7205d4611218310927d Mon Sep 17 00:00:00 2001
+From: Ting-Wei Lan <lantw@src.gnome.org>
+Date: Sun, 13 Mar 2022 15:14:12 +0800
+Subject: [PATCH] build: Don't use ld and objcopy when cross-compiling
+
+These commands don't work when compiling Windows binaries on Linux.
+---
+ demos/gtk-demo/meson.build       | 2 +-
+ demos/widget-factory/meson.build | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
+index f594cd59b2..fa63dbbb9b 100644
+--- a/demos/gtk-demo/meson.build
++++ b/demos/gtk-demo/meson.build
+@@ -160,7 +160,7 @@ endif
+ 
+ ld = find_program('ld', required : false)
+ 
+-if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
++if not meson.is_cross_build() and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
+   glib_compile_resources = find_program('glib-compile-resources')
+ 
+   # Create the resource blob
+diff --git a/demos/widget-factory/meson.build b/demos/widget-factory/meson.build
+index 9a083eb1ac..2cfc9732dc 100644
+--- a/demos/widget-factory/meson.build
++++ b/demos/widget-factory/meson.build
+@@ -8,7 +8,7 @@ endif
+ 
+ ld = find_program('ld', required : false)
+ 
+-if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
++if not meson.is_cross_build() and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
+   glib_compile_resources = find_program('glib-compile-resources')
+ 
+   # Create the resource blob
+-- 
+GitLab
+