Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging
/ Packages / lib32-gtk3
Commits:
696355b2 by Jan Alexander Steffens (heftig) at 2024-10-12T18:57:09+02:00
1:3.24.43-4
- - - - -
4 changed files:
- .SRCINFO
- 0001-Allow-disabling-legacy-Tracker-search.patch
- − 0002-Stop-looking-for-modules-in-cwd.patch
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = lib32-gtk3
pkgdesc = GObject-based multi-platform GUI toolkit (32-bit)
pkgver = 3.24.43
- pkgrel = 2
+ pkgrel = 4
epoch = 1
url = https://www.gtk.org/
arch = x86_64
@@ -40,11 +40,9 @@ pkgbase = lib32-gtk3
source = git+https://gitlab.gnome.org/GNOME/gtk.git#tag=3.24.43
source = gtk-query-immodules-3.0-32.hook
source = 0001-Allow-disabling-legacy-Tracker-search.patch
- source = 0002-Stop-looking-for-modules-in-cwd.patch
b2sums =
fdda77eebdc0b8e378f0258cb241eda4412b868d59ea1fd90815f459e925e6433f94c22a088d695b72fab99ecca827b370942bea47043debef4fab78e0e03dca
b2sums =
c7136723735c4cbfe654851d0ccc1698142fa8f90b724ed9a970ebd6a74b4f59ea558e134e600736a1041417fc7fd9b3baa8bc561ed9598f2fbf45392dcc9159
- b2sums =
7da1746e7702e4bf397f59dd1019e2c8fa8951b2bcc6bf64ec05f322de6dcec6fe5552848d6b389818f625988a3fb2211501d7f72ae97d2c49fbad1e5fe9cd6a
- b2sums =
f3a2f88b16eec5fca08d190fb8103bcf5ded43ba8292857076663f01e01352db76252701d2597c4f12c6f56bb7417041ffe0bd4aa1f4251613e3f1326059e6ac
+ b2sums =
ae371c52f24d00153037622de12a7e0026223c50fcb4b83e88138e2fd8b69a27422dfc91dae3a83c24705c57370bc9d75de4228210041c10c55482443478e240
pkgname = lib32-gtk3
install = lib32-gtk3.install
=====================================
0001-Allow-disabling-legacy-Tracker-search.patch
=====================================
@@ -74,7 +74,7 @@ index ea866d8231c2..03677b120f60 100644
gtk_unix_sources += 'gtksearchenginetracker3.c'
endif
diff --git a/meson.build b/meson.build
-index 24785bfe4dd8..1999f526d987 100644
+index 67b24e5e7d5f..103405038bcb 100644
--- a/meson.build
+++ b/meson.build
@@ -466,6 +466,11 @@ if require_harfbuzz and not harfbuzz_dep.found()
=====================================
0002-Stop-looking-for-modules-in-cwd.patch deleted
=====================================
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mcla...@redhat.com>
-Date: Sat, 15 Jun 2024 14:18:01 -0400
-Subject: [PATCH] Stop looking for modules in cwd
-
-This is just not a good idea. It is surprising, and can be misused.
-
-Fixes: #6786
----
- gtk/gtkmodules.c | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
-index 704e412aeb52..f93101c272e8 100644
---- a/gtk/gtkmodules.c
-+++ b/gtk/gtkmodules.c
-@@ -214,13 +214,8 @@ find_module (const gchar *name)
- gchar *module_name;
-
- module_name = _gtk_find_module (name, "modules");
-- if (!module_name)
-- {
-- /* As last resort, try loading without an absolute path (using system
-- * library path)
-- */
-- module_name = g_module_build_path (NULL, name);
-- }
-+ if (module_name == NULL)
-+ return NULL;
-
- module = g_module_open (module_name, G_MODULE_BIND_LOCAL |
G_MODULE_BIND_LAZY);
-
=====================================
PKGBUILD
=====================================
@@ -4,7 +4,7 @@
pkgname=lib32-gtk3
pkgver=3.24.43
-pkgrel=2
+pkgrel=4
epoch=1
pkgdesc="GObject-based multi-platform GUI toolkit (32-bit)"
url="https://www.gtk.org/";
@@ -49,20 +49,21 @@ source=(
"git+https://gitlab.gnome.org/GNOME/gtk.git#tag=$pkgver";
gtk-query-immodules-3.0-32.hook
0001-Allow-disabling-legacy-Tracker-search.patch
- 0002-Stop-looking-for-modules-in-cwd.patch
)
b2sums=('fdda77eebdc0b8e378f0258cb241eda4412b868d59ea1fd90815f459e925e6433f94c22a088d695b72fab99ecca827b370942bea47043debef4fab78e0e03dca'
'c7136723735c4cbfe654851d0ccc1698142fa8f90b724ed9a970ebd6a74b4f59ea558e134e600736a1041417fc7fd9b3baa8bc561ed9598f2fbf45392dcc9159'
-
'7da1746e7702e4bf397f59dd1019e2c8fa8951b2bcc6bf64ec05f322de6dcec6fe5552848d6b389818f625988a3fb2211501d7f72ae97d2c49fbad1e5fe9cd6a'
-
'f3a2f88b16eec5fca08d190fb8103bcf5ded43ba8292857076663f01e01352db76252701d2597c4f12c6f56bb7417041ffe0bd4aa1f4251613e3f1326059e6ac')
+
'ae371c52f24d00153037622de12a7e0026223c50fcb4b83e88138e2fd8b69a27422dfc91dae3a83c24705c57370bc9d75de4228210041c10c55482443478e240')
prepare() {
cd gtk
- git apply -3 ../0001-Allow-disabling-legacy-Tracker-search.patch
- # CVE-2024-6655: https://www.openwall.com/lists/oss-security/2024/09/09/1
- # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/7361
- git apply -3 ../0002-Stop-looking-for-modules-in-cwd.patch
+ # Try to fix monitor geometry on sway
+ # https://gitlab.archlinux.org/archlinux/packaging/packages/gtk3/-/issues/8
+ # https://gitlab.gnome.org/GNOME/gtk/-/issues/6939
+ git cherry-pick -n 1cf0520454f8f55256b7f6cdfeefa8360a5842c7
+
+ # Don't try to use the old Tracker
+ git apply -3 ../0001-Allow-disabling-legacy-Tracker-search.patch
}
build() {
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/lib32-gtk3/-/commit/696355b2d71d4880a8c8a54128b2d6d9f4877f28
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/lib32-gtk3/-/commit/696355b2d71d4880a8c8a54128b2d6d9f4877f28
You're receiving this email because of your account on gitlab.archlinux.org.
