diff mbox series

gtk4: Upgrade to 4.22.1

Message ID 20260324104610.2860460-1-zboszor@gmail.com
State Superseded
Headers show
Series gtk4: Upgrade to 4.22.1 | expand

Commit Message

Böszörményi Zoltán March 24, 2026, 10:46 a.m. UTC 
Remove the previously added patch, it's already part of 4.22.1.

Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
---
 ...-t-use-space-in-meson-generated-file.patch | 34 -------------------
 .../gtk+/{gtk4_4.20.3.bb => gtk4_4.22.1.bb}   |  4 +--
 2 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 meta/recipes-gnome/gtk+/gtk4/0001-application8-Don-t-use-space-in-meson-generated-file.patch
 rename meta/recipes-gnome/gtk+/{gtk4_4.20.3.bb => gtk4_4.22.1.bb} (96%)
diff mbox series

Patch

diff --git a/meta/recipes-gnome/gtk+/gtk4/0001-application8-Don-t-use-space-in-meson-generated-file.patch b/meta/recipes-gnome/gtk+/gtk4/0001-application8-Don-t-use-space-in-meson-generated-file.patch
deleted file mode 100644
index 2a79fc637d..0000000000
--- a/meta/recipes-gnome/gtk+/gtk4/0001-application8-Don-t-use-space-in-meson-generated-file.patch
+++ /dev/null
@@ -1,34 +0,0 @@ 
-From d26453923a21de0d908af3bf83c69263aaee5705 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?=
- <zboszor@gmail.com>
-Date: Wed, 11 Mar 2026 07:02:10 +0100
-Subject: [PATCH] application8: Don't use space in meson generated filename
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-All other example apps use underscore, examples/application8
-has a build error:
-
-| /usr/bin/ld: cannot find examples/application8/exampleapp8.p/meson-generated_.._exampleapp8: No such file or directory
-| /usr/bin/ld: cannot find resources.c.o: No such file or directory
-
-Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/9627]
----
- examples/application8/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/examples/application8/meson.build b/examples/application8/meson.build
-index f2e1d7cea9..77987d554a 100644
---- a/examples/application8/meson.build
-+++ b/examples/application8/meson.build
-@@ -1,4 +1,4 @@
--app8_resources = gnome.compile_resources('exampleapp8 resources',
-+app8_resources = gnome.compile_resources('exampleapp8_resources',
-   'exampleapp.gresource.xml',
-   source_dir: meson.current_source_dir())
- 
--- 
-2.53.0
-
diff --git a/meta/recipes-gnome/gtk+/gtk4_4.20.3.bb b/meta/recipes-gnome/gtk+/gtk4_4.22.1.bb
similarity index 96%
rename from meta/recipes-gnome/gtk+/gtk4_4.20.3.bb
rename to meta/recipes-gnome/gtk+/gtk4_4.22.1.bb
index 0cca44fb5c..391c6f2508 100644
--- a/meta/recipes-gnome/gtk+/gtk4_4.20.3.bb
+++ b/meta/recipes-gnome/gtk+/gtk4_4.22.1.bb
@@ -33,9 +33,7 @@  LIC_FILES_CHKSUM = " \
     file://tests/testgtk.c;endline=25;md5=49d06770681b8322466b52ed19d29fb2 \
 "
 
-SRC_URI[archive.sha256sum] = "2873f2903088a66c71173ea2ed85ffae266a66b972c3a4842bbb2f6f187ec153"
-
-SRC_URI += "file://0001-application8-Don-t-use-space-in-meson-generated-file.patch"
+SRC_URI[archive.sha256sum] = "cd7b5a9c41127da6fb321c5a842ad73c62e6996f9ce3f1960ca509f6559d55fc"
 
 S = "${UNPACKDIR}/${GNOMEBN}-${PV}"