| Message ID | 20260119064555.9286-1-f_l_k@t-online.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [meta-gnome,PATCHv2] gnome-settings-daemon: update 48.0 -> 49.1 | expand |
On Sun, Jan 18, 2026 at 10:46 PM Markus Volk <f_l_k@t-online.de> wrote: > PACKAGECONFIG for wayland,nm have been removed upstream > PACKAGECONFIG for x11,xwayland have been added upstream > > Add a patch to fix reproducibility in gnome-settings-daemon-src > > ============ > Version 49.1 > ============ > - Translation updates > > Power: > - Avoid xext dependency > > Xsettings: > - Build only if X11 or Xwayland are enabled > > ============ > Version 49.0 > ============ > - Translation updates > > Power: > - Avoid polling light sensor if ambient light setting is disabled > > ============= > Version 49.rc > ============= > - Translation updates > - Update to GNOME Session changes > > Power: > - Fix check for shell-managed brightness > - Refactor light sensor enablement > > A11y-settings: > - Manage Orca lifetime > > =============== > Version 49.beta > =============== > - Translation updates > - Drop dependency on GTK4 > - Add xwayland/x11 build options > > Power: > - Do not treat all notifications as critical > - Let backlight auto-dimming in control of GNOME Shell > > Housekeeping: > - Add new donation reminder notification > > ================== > Version 49.alpha.1 > ================== > > Keyboard: > - Drop keyboard bell GSettings schema leftovers > > ================ > Version 49.alpha > ================ > - Translation updates > - Update to GTK4 > > Power: > - Use new Mutter backlight D-Bus interface > > Wacom: > - Drop support to update per-button OLED screens in Wacom > Intuos 4 model with descriptive actions. This tablet model > will still be functional, but the tiny screens besides the > pad buttons will remain blank. > > ============ > Version 48.1 > ============ > - Translation updates > - Cleanups and fixes > > Power: > - Ensure the backlight interface signal gets emitted on startup > - Avoid using uninitialized value when restoring brightness > > Sharing: > - Fixes to shutdown of sharing services > > Signed-off-by: Markus Volk <f_l_k@t-online.de> > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > ...um-types.c.in-fix-reproducibility-is.patch | 41 ++++++++++++++++++ > ...um-types.c.in-fix-reproducibility-is.patch | 42 +++++++++++++++++++ > ..._48.0.bb => gnome-settings-daemon_49.1.bb} | 19 +++++---- > 3 files changed, 93 insertions(+), 9 deletions(-) > create mode 100644 > meta-gnome/recipes-gnome/gnome-settings-daemon/0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch > create 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_48.0.bb => gnome-settings-daemon_49.1.bb} (67%) > > diff --git > a/meta-gnome/recipes-gnome/gnome-settings-daemon/0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch > b/meta-gnome/recipes-gnome/gnome-settings-daemon/0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch > new file mode 100644 > index 0000000000..d8d9232c98 > --- /dev/null > +++ > b/meta-gnome/recipes-gnome/gnome-settings-daemon/0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch > @@ -0,0 +1,41 @@ > +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 > + > It needs Upstream-Status see https://autobuilder.yoctoproject.org/valkyrie/api/v2/logs/5017895/raw_inline > +--- > + 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/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 > new file mode 100644 > index 0000000000..e5429366e4 > --- /dev/null > +++ > b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch > @@ -0,0 +1,42 @@ > +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: Pending > +--- > + 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_48.0.bb > b/meta-gnome/recipes-gnome/gnome-settings-daemon/ > gnome-settings-daemon_49.1.bb > similarity index 67% > rename from meta-gnome/recipes-gnome/gnome-settings-daemon/ > gnome-settings-daemon_48.0.bb > rename to meta-gnome/recipes-gnome/gnome-settings-daemon/ > gnome-settings-daemon_49.1.bb > index 9a2948d432..2125bd91fe 100644 > --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/ > gnome-settings-daemon_48.0.bb > +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/ > gnome-settings-daemon_49.1.bb > @@ -17,33 +17,34 @@ DEPENDS = " \ > libnotify \ > upower \ > libwacom \ > - virtual/libx11 \ > + networkmanager \ > " > > # all these are mandatory > REQUIRED_DISTRO_FEATURES = "x11 polkit pulseaudio systemd > gobject-introspection-data" > GIR_MESON_OPTION = "" > > -SRC_URI[archive.sha256sum] = > "f3da20ab4a2ba56fd3e97b991f2bc267973d5619bd58bfa516410aa036305e45" > +SRC_URI += > "file://0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch" > +SRC_URI[archive.sha256sum] = > "2a9957fc4f91c3b9127b49484179bef485120d9c1c208e44d44e6a746e6cc1c1" > > PACKAGECONFIG ??= " \ > - cups nm \ > - alsa gudev \ > + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11 alsa', d)} \ > + gudev \ > smartcard \ > - ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ > + xwayland \ > + cups \ > " > PACKAGECONFIG[alsa] = "-Dalsa=true,-Dalsa=false,alsa-lib" > PACKAGECONFIG[cups] = "-Dcups=true,-Dcups=false,cups" > PACKAGECONFIG[gudev] = "-Dgudev=true,-Dgudev=false,libgudev" > -PACKAGECONFIG[nm] = > "-Dnetwork_manager=true,-Dnetwork_manager=false,networkmanager" > PACKAGECONFIG[smartcard] = "-Dsmartcard=true,-Dsmartcard=false,nss" > -PACKAGECONFIG[wayland] = "-Dwayland=true,-Dwayland=false,wayland" > +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" > +PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=true" > +PACKAGECONFIG[x11] = "-Dx11=true,-Dx11=false,libx11 libxfixes" > > def gnome_verdir(v): > return oe.utils.trim_version(v, 1) > > -PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" > - > FILES:${PN} += " \ > ${systemd_user_unitdir} \ > ${libdir}/gnome-settings-daemon-${@gnome_verdir("${PV}")}/libgsd.so \ > -- > 2.52.0 > >
On Mon, Jan 19 2026 at 17:14:30 -08:00:00, Khem Raj
<raj.khem@gmail.com> wrote:
> It needs Upstream-Status
I had upstream status in the original patch, but it must have been lost
somehow during rebasing.
I want to submit this and another similar patch to gnome anyway, and
I'll send an updated patch
as soon as that's done so I can add the appropriate upstream status.
I had set it to āPending,ā which I know is not considered good
practice.
diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch b/meta-gnome/recipes-gnome/gnome-settings-daemon/0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch new file mode 100644 index 0000000000..d8d9232c98 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch @@ -0,0 +1,41 @@ +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 + +--- + 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/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 new file mode 100644 index 0000000000..e5429366e4 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch @@ -0,0 +1,42 @@ +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: Pending +--- + 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_48.0.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_49.1.bb similarity index 67% rename from meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_48.0.bb rename to meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_49.1.bb index 9a2948d432..2125bd91fe 100644 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_48.0.bb +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_49.1.bb @@ -17,33 +17,34 @@ DEPENDS = " \ libnotify \ upower \ libwacom \ - virtual/libx11 \ + networkmanager \ " # all these are mandatory REQUIRED_DISTRO_FEATURES = "x11 polkit pulseaudio systemd gobject-introspection-data" GIR_MESON_OPTION = "" -SRC_URI[archive.sha256sum] = "f3da20ab4a2ba56fd3e97b991f2bc267973d5619bd58bfa516410aa036305e45" +SRC_URI += "file://0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch" +SRC_URI[archive.sha256sum] = "2a9957fc4f91c3b9127b49484179bef485120d9c1c208e44d44e6a746e6cc1c1" PACKAGECONFIG ??= " \ - cups nm \ - alsa gudev \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11 alsa', d)} \ + gudev \ smartcard \ - ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ + xwayland \ + cups \ " PACKAGECONFIG[alsa] = "-Dalsa=true,-Dalsa=false,alsa-lib" PACKAGECONFIG[cups] = "-Dcups=true,-Dcups=false,cups" PACKAGECONFIG[gudev] = "-Dgudev=true,-Dgudev=false,libgudev" -PACKAGECONFIG[nm] = "-Dnetwork_manager=true,-Dnetwork_manager=false,networkmanager" PACKAGECONFIG[smartcard] = "-Dsmartcard=true,-Dsmartcard=false,nss" -PACKAGECONFIG[wayland] = "-Dwayland=true,-Dwayland=false,wayland" +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" +PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=true" +PACKAGECONFIG[x11] = "-Dx11=true,-Dx11=false,libx11 libxfixes" def gnome_verdir(v): return oe.utils.trim_version(v, 1) -PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" - FILES:${PN} += " \ ${systemd_user_unitdir} \ ${libdir}/gnome-settings-daemon-${@gnome_verdir("${PV}")}/libgsd.so \
PACKAGECONFIG for wayland,nm have been removed upstream PACKAGECONFIG for x11,xwayland have been added upstream Add a patch to fix reproducibility in gnome-settings-daemon-src ============ Version 49.1 ============ - Translation updates Power: - Avoid xext dependency Xsettings: - Build only if X11 or Xwayland are enabled ============ Version 49.0 ============ - Translation updates Power: - Avoid polling light sensor if ambient light setting is disabled ============= Version 49.rc ============= - Translation updates - Update to GNOME Session changes Power: - Fix check for shell-managed brightness - Refactor light sensor enablement A11y-settings: - Manage Orca lifetime =============== Version 49.beta =============== - Translation updates - Drop dependency on GTK4 - Add xwayland/x11 build options Power: - Do not treat all notifications as critical - Let backlight auto-dimming in control of GNOME Shell Housekeeping: - Add new donation reminder notification ================== Version 49.alpha.1 ================== Keyboard: - Drop keyboard bell GSettings schema leftovers ================ Version 49.alpha ================ - Translation updates - Update to GTK4 Power: - Use new Mutter backlight D-Bus interface Wacom: - Drop support to update per-button OLED screens in Wacom Intuos 4 model with descriptive actions. This tablet model will still be functional, but the tiny screens besides the pad buttons will remain blank. ============ Version 48.1 ============ - Translation updates - Cleanups and fixes Power: - Ensure the backlight interface signal gets emitted on startup - Avoid using uninitialized value when restoring brightness Sharing: - Fixes to shutdown of sharing services Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Khem Raj <raj.khem@gmail.com> --- ...um-types.c.in-fix-reproducibility-is.patch | 41 ++++++++++++++++++ ...um-types.c.in-fix-reproducibility-is.patch | 42 +++++++++++++++++++ ..._48.0.bb => gnome-settings-daemon_49.1.bb} | 19 +++++---- 3 files changed, 93 insertions(+), 9 deletions(-) create mode 100644 meta-gnome/recipes-gnome/gnome-settings-daemon/0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch create 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_48.0.bb => gnome-settings-daemon_49.1.bb} (67%)