diff mbox series

[meta-gnome,01/15] gnome-settings-daemon: upgrade 49.1 -> 50.1

Message ID 20260906093713.797648-1-f_l_k@t-online.de
State New
Headers show
Series [meta-gnome,01/15] gnome-settings-daemon: upgrade 49.1 -> 50.1 | expand

Commit Message

Markus Volk Sept. 6, 2026, 9:36 a.m. UTC 
The x11 meson option is gone together with the X11 session support, so
drop the x11 PACKAGECONFIG. The new systemd-units option is tied to the
systemd PACKAGECONFIG. The reproducibility patch for the smartcard enum
types is included upstream.

Build tested on corei7-64.

AI-Generated: Uses Claude Code (Claude Fable 5.1)
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 ...um-types.c.in-fix-reproducibility-is.patch | 42 -------------------
 ..._49.1.bb => gnome-settings-daemon_50.1.bb} |  8 ++--
 2 files changed, 3 insertions(+), 47 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch
 rename meta-gnome/recipes-gnome/gnome-settings-daemon/{gnome-settings-daemon_49.1.bb => gnome-settings-daemon_50.1.bb} (77%)
diff mbox series

Patch

diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch
deleted file mode 100644
index 1aeb566609..0000000000
--- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch
+++ /dev/null
@@ -1,42 +0,0 @@ 
-From 49df2d7021a68d9fe13ff094e9f564323c7c8556 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Thu, 15 Jan 2026 14:33:58 +0100
-Subject: [PATCH] gsd-smartcard-enum-types.c.in:fix reproducibility issue
-
-Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/467] 
----
- plugins/smartcard/gsd-smartcard-enum-types.c.in | 4 ++--
- plugins/smartcard/gsd-smartcard-enum-types.h.in | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/plugins/smartcard/gsd-smartcard-enum-types.c.in b/plugins/smartcard/gsd-smartcard-enum-types.c.in
-index f281cf4e..0a970105 100644
---- a/plugins/smartcard/gsd-smartcard-enum-types.c.in
-+++ b/plugins/smartcard/gsd-smartcard-enum-types.c.in
-@@ -5,8 +5,8 @@
- /*** END file-header ***/
- 
- /*** BEGIN file-production ***/
--#include "@filename@"
--/* enumerations from "@filename@" */
-+#include "@basename@"
-+/* enumerations from "@basename@" */
- /*** END file-production ***/
- 
- /*** BEGIN value-header ***/
-diff --git a/plugins/smartcard/gsd-smartcard-enum-types.h.in b/plugins/smartcard/gsd-smartcard-enum-types.h.in
-index 79dcc3d8..3906ba4c 100644
---- a/plugins/smartcard/gsd-smartcard-enum-types.h.in
-+++ b/plugins/smartcard/gsd-smartcard-enum-types.h.in
-@@ -9,7 +9,7 @@ G_BEGIN_DECLS
- 
- /*** BEGIN file-production ***/
- 
--/* enumerations from "@filename@" */
-+/* enumerations from "@basename@" */
- /*** END file-production ***/
- 
- /*** BEGIN value-header ***/
--- 
-2.52.0
-
diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_49.1.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_50.1.bb
similarity index 77%
rename from meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_49.1.bb
rename to meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_50.1.bb
index 4a8b7a33cc..a0f8b81824 100644
--- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_49.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_50.1.bb
@@ -25,14 +25,13 @@  DEPENDS = " \
 REQUIRED_DISTRO_FEATURES = "alsa polkit pulseaudio systemd gobject-introspection-data"
 GIR_MESON_OPTION = ""
 
-SRC_URI += "file://0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch"
-SRC_URI[archive.sha256sum] = "2a9957fc4f91c3b9127b49484179bef485120d9c1c208e44d44e6a746e6cc1c1"
+SRC_URI[archive.sha256sum] = "dd2c9730914f0ececa0229dd8a8c2940a57ddeb0802434558d4b164d79cfe05c"
 
 UPSTREAM_CHECK_URI = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/tags"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
 PACKAGECONFIG ??= " \
-    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xwayland', '', d)} \
     gudev \
     smartcard \
@@ -41,9 +40,8 @@  PACKAGECONFIG ??= " \
 PACKAGECONFIG[cups] = "-Dcups=true,-Dcups=false,cups"
 PACKAGECONFIG[gudev] = "-Dgudev=true,-Dgudev=false,libgudev"
 PACKAGECONFIG[smartcard] = "-Dsmartcard=true,-Dsmartcard=false,nss"
-PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
+PACKAGECONFIG[systemd] = "-Dsystemd=true -Dsystemd-units=true,-Dsystemd=false -Dsystemd-units=false,systemd"
 PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false"
-PACKAGECONFIG[x11] = "-Dx11=true,-Dx11=false,libx11 libxfixes"
 
 def gnome_verdir(v):
    return oe.utils.trim_version(v, 1)