diff mbox series

[meta-gnome,21/26] gnome-tweaks: upgrade 40.10 -> 49.0

Message ID 20261021100717.11068-21-f_l_k@t-online.de
State Under Review
Headers show
Series [meta-gnome,01/26] eog: upgrade 50.3 -> 50.4 | expand

Commit Message

Markus Volk Oct. 21, 2026, 10:07 a.m. UTC 
gnome-tweaks is ported to GTK 4 and libadwaita. Update DEPENDS and
RDEPENDS and package the new D-Bus service file. The python path patch is
dropped: meson installs the python module into the configured
site-packages directory itself.

AI-Generated: Uses Claude Code (Claude Opus 5.5)
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../0001-Make-python-path-configurable.patch  | 41 -------------------
 ...e-tweaks_40.10.bb => gnome-tweaks_49.0.bb} | 13 ++----
 2 files changed, 4 insertions(+), 50 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0001-Make-python-path-configurable.patch
 rename meta-gnome/recipes-gnome/gnome-tweaks/{gnome-tweaks_40.10.bb => gnome-tweaks_49.0.bb} (70%)
diff mbox series

Patch

diff --git a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0001-Make-python-path-configurable.patch b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0001-Make-python-path-configurable.patch
deleted file mode 100644
index 733249c7e6..0000000000
--- a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0001-Make-python-path-configurable.patch
+++ /dev/null
@@ -1,41 +0,0 @@ 
-From db94983c93f38bd8494b47d9fa1b3e5368dc9abe Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Wed, 11 Dec 2019 01:34:01 +0100
-Subject: [PATCH] Make python path configurable
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [Configuration]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- meson.build       | 2 +-
- meson_options.txt | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
- create mode 100644 meson_options.txt
-
-diff --git a/meson.build b/meson.build
-index 5b824e9..a673d9c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -18,7 +18,7 @@ bindir = join_paths(prefix, get_option('bindir'))
- datadir = join_paths(prefix, get_option('datadir'))
- libexecdir = join_paths(prefix, get_option('libexecdir'))
- localedir = join_paths(prefix, get_option('localedir'))
--pythondir = join_paths(prefix, python3.get_path('purelib'))
-+pythondir = get_option('python_site_dir')
- 
- pkgdatadir = join_paths(datadir, meson.project_name())
- 
-diff --git a/meson_options.txt b/meson_options.txt
-new file mode 100644
-index 0000000..03455ca
---- /dev/null
-+++ b/meson_options.txt
-@@ -0,0 +1,2 @@
-+option('python_site_dir', type: 'string', value: '')
-+
--- 
-2.21.0
-
diff --git a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.10.bb b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_49.0.bb
similarity index 70%
rename from meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.10.bb
rename to meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_49.0.bb
index 6395a34f85..ebfe8231d6 100644
--- a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.10.bb
+++ b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_49.0.bb
@@ -5,8 +5,7 @@  LIC_FILES_CHKSUM = " \
     file://LICENSES/GPL-3.0;md5=9eef91148a9b14ec7f9df333daebc746 \
 "
 
-DEPENDS = "libhandy"
-
+DEPENDS = "glib-2.0 gtk4 libadwaita libgudev python3-pygobject gsettings-desktop-schemas"
 
 inherit gnomebase gtk-icon-cache gobject-introspection features_check
 
@@ -17,12 +16,7 @@  REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam"
 REQUIRED_DISTRO_FEATURES += "gobject-introspection-data"
 GIR_MESON_OPTION = ""
 
-SRC_URI[archive.sha256sum] = "cffd3b33a399577fbb4491ce8fbd02f54c5924f1056f30114e8d420290ef23fc"
-SRC_URI += " \
-    file://0001-Make-python-path-configurable.patch \
-"
-
-EXTRA_OEMESON = "-Dpython_site_dir=${PYTHON_SITEPACKAGES_DIR}"
+SRC_URI[archive.sha256sum] = "b3909bdcb4905b68427d6ab581e01f436dff8e5c0a389b1e0b14500f18806ebb"
 
 # The optimised .pyc files contain buildpaths, delete them and leave the
 # normal ones to be packaged.
@@ -31,8 +25,9 @@  do_install:append() {
 }
 
 FILES:${PN} += " \
+    ${datadir}/dbus-1 \
     ${datadir}/metainfo \
     ${PYTHON_SITEPACKAGES_DIR} \
 "
 
-RDEPENDS:${PN} += "gnome-shell python3-core python3-logging libhandy"
+RDEPENDS:${PN} += "gnome-shell python3-core python3-logging python3-pygobject gtk4 libadwaita gnome-desktop libgudev libnotify"