mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-10-21 08:08:29 +00:00
gnome-settings-daemon: upgrade 49.1 -> 50.1
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> Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
1 parent
e39fd90bde
commit
f14e22498e
2 files changed
+3
-47
No files matched your search
-42
@@ -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
|
|
||||||
|
|
||||||
+3
-5
@@ -25,14 +25,13 @@ DEPENDS = " \
|
|||||||
REQUIRED_DISTRO_FEATURES = "alsa polkit pulseaudio systemd gobject-introspection-data"
|
REQUIRED_DISTRO_FEATURES = "alsa polkit pulseaudio systemd gobject-introspection-data"
|
||||||
GIR_MESON_OPTION = ""
|
GIR_MESON_OPTION = ""
|
||||||
|
|
||||||
SRC_URI += "file://0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch"
|
SRC_URI[archive.sha256sum] = "dd2c9730914f0ececa0229dd8a8c2940a57ddeb0802434558d4b164d79cfe05c"
|
||||||
SRC_URI[archive.sha256sum] = "2a9957fc4f91c3b9127b49484179bef485120d9c1c208e44d44e6a746e6cc1c1"
|
|
||||||
|
|
||||||
UPSTREAM_CHECK_URI = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/tags"
|
UPSTREAM_CHECK_URI = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/tags"
|
||||||
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
|
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
|
||||||
|
|
||||||
PACKAGECONFIG ??= " \
|
PACKAGECONFIG ??= " \
|
||||||
${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \
|
${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
|
||||||
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xwayland', '', d)} \
|
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xwayland', '', d)} \
|
||||||
gudev \
|
gudev \
|
||||||
smartcard \
|
smartcard \
|
||||||
@@ -41,9 +40,8 @@ PACKAGECONFIG ??= " \
|
|||||||
PACKAGECONFIG[cups] = "-Dcups=true,-Dcups=false,cups"
|
PACKAGECONFIG[cups] = "-Dcups=true,-Dcups=false,cups"
|
||||||
PACKAGECONFIG[gudev] = "-Dgudev=true,-Dgudev=false,libgudev"
|
PACKAGECONFIG[gudev] = "-Dgudev=true,-Dgudev=false,libgudev"
|
||||||
PACKAGECONFIG[smartcard] = "-Dsmartcard=true,-Dsmartcard=false,nss"
|
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[xwayland] = "-Dxwayland=true,-Dxwayland=false"
|
||||||
PACKAGECONFIG[x11] = "-Dx11=true,-Dx11=false,libx11 libxfixes"
|
|
||||||
|
|
||||||
def gnome_verdir(v):
|
def gnome_verdir(v):
|
||||||
return oe.utils.trim_version(v, 1)
|
return oe.utils.trim_version(v, 1)
|
||||||
Reference in new issue
Block a user