| Message ID | 20240424133310.3660-1-f_l_k@t-online.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [meta-gnome,PATCHv2] gnome-control-center: update 46.0.1 -> 46.1 | expand |
I can apply either v1 or v2, Can you rebase on top of master-next and resend please. On Wed, Apr 24, 2024 at 3:32 PM Markus Volk via lists.openembedded.org <f_l_k=t-online.de@lists.openembedded.org> wrote: > > - add PACKAGECONFIGS for file-share and media-share > > 46.1 > > * Accessibility > - Improve accessibility of "Typing" settings sliders > > * Display > - Fix crash when pressing Escape in the display settings > > * Network > - Add stable-ssid support for cloned-mac > > * Privacy > - Add build option to enable Location services > - Fix opening of Help pages while viewing Privacy settings > > * Sharing > - Auto hide Sharing panel when Rygel AND gnome-user-share are not available > > * System > - Don't show auto-timezone setting when Location services unavailable > - Avoid unnecessary time-change requests > - Fix issue with sensitivity of "Add" and "Enroll" Enterprise Login buttons > - Improve generated passwords capacity in Remote Desktop settings > > * Wacom > - Check for the right output connector name > > Signed-off-by: Markus Volk <f_l_k@t-online.de> > --- > .../0001-Add-meson-option-to-pass-sysroot.patch | 13 +++++-------- > ...enter_46.0.1.bb => gnome-control-center_46.1.bb} | 9 ++++----- > 2 files changed, 9 insertions(+), 13 deletions(-) > rename meta-gnome/recipes-gnome/gnome-control-center/{gnome-control-center_46.0.1.bb => gnome-control-center_46.1.bb} (87%) > > diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch > index 4ae923f87..7d17817bc 100644 > --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch > +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch > @@ -1,4 +1,4 @@ > -From 1a48df2a8da44410bbd767c2420d363f6180c79a Mon Sep 17 00:00:00 2001 > +From 8e542784b8ca49c655df0f251a1a1dec724a522e Mon Sep 17 00:00:00 2001 > From: Markus Volk <f_l_k@t-online.de> > Date: Mon, 18 Mar 2024 05:50:21 +0100 > Subject: [PATCH] Add meson option to pass sysroot > @@ -13,16 +13,16 @@ Upstream-Status: Inappropriate [OE specific] > 3 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/meson_options.txt b/meson_options.txt > -index e53d6e3f3..8fae4c824 100644 > +index f415a7e..8966632 100644 > --- a/meson_options.txt > +++ b/meson_options.txt > @@ -1,3 +1,4 @@ > +option('oe_sysroot', type: 'string', value: '', description: 'Directory for OE-sysroot') > option('deprecated-declarations', type: 'feature', value: 'disabled', description: 'build with deprecated declaration warnings') > option('documentation', type: 'boolean', value: false, description: 'build documentation') > - option('ibus', type: 'boolean', value: true, description: 'build with IBus support') > + option('location-services', type: 'feature', value: 'disabled', description: 'build with location services') > diff --git a/panels/background/meson.build b/panels/background/meson.build > -index 6ced050f9..df1f80896 100644 > +index 6ced050..df1f808 100644 > --- a/panels/background/meson.build > +++ b/panels/background/meson.build > @@ -24,7 +24,7 @@ common_sources += gnome.mkenums_simple( > @@ -35,7 +35,7 @@ index 6ced050f9..df1f80896 100644 > > common_sources += gnome.mkenums( > diff --git a/panels/system/meson.build b/panels/system/meson.build > -index 4fee82210..979332a0e 100644 > +index 4fee822..979332a 100644 > --- a/panels/system/meson.build > +++ b/panels/system/meson.build > @@ -73,7 +73,7 @@ sources += gnome.compile_resources( > @@ -47,6 +47,3 @@ index 4fee82210..979332a0e 100644 > 'datetime/cc-datetime-page.h' > ) > > --- > -2.44.0 > - > diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.1.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.1.bb > similarity index 87% > rename from meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.1.bb > rename to meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.1.bb > index de11239ed..87daec0c2 100644 > --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.1.bb > +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.1.bb > @@ -37,16 +37,15 @@ inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is > > REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11" > > -SRC_URI = "gitsm://gitlab.gnome.org/GNOME/gnome-control-center.git;protocol=https;nobranch=1" > SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" > - > -S = "${WORKDIR}/git" > -SRCREV = "005f40dcfa464f113a1c95f97673bc5505fc15ad" > +SRC_URI[archive.sha256sum] = "81792423019deda1d2a074c1ecf6a7e6ef3172c09cbe6f4d7995a4b5dea28312" > > PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" > PACKAGECONFIG[cups] = ",,cups,cups" > PACKAGECONFIG[ibus] = "-Dibus=true, -Dibus=false, ibus" > PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false, wayland" > +PACKAGECONFIG[file-share] = ",,,gnome-user-share" > +PACKAGECONFIG[media-share] = ",,,rygel-meta tumbler" > > EXTRA_OEMESON += "-Doe_sysroot=${STAGING_DIR_HOST}" > > @@ -72,4 +71,4 @@ FILES:${PN} += " \ > > FILES:${PN}-dev += "${datadir}/gettext" > > -RDEPENDS:${PN} += "gsettings-desktop-schemas tecla system-config-printer cups-pk-helper ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'gnome-user-share', '' , d)}" > +RDEPENDS:${PN} += "gsettings-desktop-schemas tecla system-config-printer cups-pk-helper" > -- > 2.44.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#110129): https://lists.openembedded.org/g/openembedded-devel/message/110129 > Mute This Topic: https://lists.openembedded.org/mt/105709901/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch index 4ae923f87..7d17817bc 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch @@ -1,4 +1,4 @@ -From 1a48df2a8da44410bbd767c2420d363f6180c79a Mon Sep 17 00:00:00 2001 +From 8e542784b8ca49c655df0f251a1a1dec724a522e Mon Sep 17 00:00:00 2001 From: Markus Volk <f_l_k@t-online.de> Date: Mon, 18 Mar 2024 05:50:21 +0100 Subject: [PATCH] Add meson option to pass sysroot @@ -13,16 +13,16 @@ Upstream-Status: Inappropriate [OE specific] 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meson_options.txt b/meson_options.txt -index e53d6e3f3..8fae4c824 100644 +index f415a7e..8966632 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ +option('oe_sysroot', type: 'string', value: '', description: 'Directory for OE-sysroot') option('deprecated-declarations', type: 'feature', value: 'disabled', description: 'build with deprecated declaration warnings') option('documentation', type: 'boolean', value: false, description: 'build documentation') - option('ibus', type: 'boolean', value: true, description: 'build with IBus support') + option('location-services', type: 'feature', value: 'disabled', description: 'build with location services') diff --git a/panels/background/meson.build b/panels/background/meson.build -index 6ced050f9..df1f80896 100644 +index 6ced050..df1f808 100644 --- a/panels/background/meson.build +++ b/panels/background/meson.build @@ -24,7 +24,7 @@ common_sources += gnome.mkenums_simple( @@ -35,7 +35,7 @@ index 6ced050f9..df1f80896 100644 common_sources += gnome.mkenums( diff --git a/panels/system/meson.build b/panels/system/meson.build -index 4fee82210..979332a0e 100644 +index 4fee822..979332a 100644 --- a/panels/system/meson.build +++ b/panels/system/meson.build @@ -73,7 +73,7 @@ sources += gnome.compile_resources( @@ -47,6 +47,3 @@ index 4fee82210..979332a0e 100644 'datetime/cc-datetime-page.h' ) --- -2.44.0 - diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.1.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.1.bb similarity index 87% rename from meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.1.bb rename to meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.1.bb index de11239ed..87daec0c2 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.1.bb +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.1.bb @@ -37,16 +37,15 @@ inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11" -SRC_URI = "gitsm://gitlab.gnome.org/GNOME/gnome-control-center.git;protocol=https;nobranch=1" SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" - -S = "${WORKDIR}/git" -SRCREV = "005f40dcfa464f113a1c95f97673bc5505fc15ad" +SRC_URI[archive.sha256sum] = "81792423019deda1d2a074c1ecf6a7e6ef3172c09cbe6f4d7995a4b5dea28312" PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" PACKAGECONFIG[cups] = ",,cups,cups" PACKAGECONFIG[ibus] = "-Dibus=true, -Dibus=false, ibus" PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false, wayland" +PACKAGECONFIG[file-share] = ",,,gnome-user-share" +PACKAGECONFIG[media-share] = ",,,rygel-meta tumbler" EXTRA_OEMESON += "-Doe_sysroot=${STAGING_DIR_HOST}" @@ -72,4 +71,4 @@ FILES:${PN} += " \ FILES:${PN}-dev += "${datadir}/gettext" -RDEPENDS:${PN} += "gsettings-desktop-schemas tecla system-config-printer cups-pk-helper ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'gnome-user-share', '' , d)}" +RDEPENDS:${PN} += "gsettings-desktop-schemas tecla system-config-printer cups-pk-helper"
- add PACKAGECONFIGS for file-share and media-share 46.1 * Accessibility - Improve accessibility of "Typing" settings sliders * Display - Fix crash when pressing Escape in the display settings * Network - Add stable-ssid support for cloned-mac * Privacy - Add build option to enable Location services - Fix opening of Help pages while viewing Privacy settings * Sharing - Auto hide Sharing panel when Rygel AND gnome-user-share are not available * System - Don't show auto-timezone setting when Location services unavailable - Avoid unnecessary time-change requests - Fix issue with sensitivity of "Add" and "Enroll" Enterprise Login buttons - Improve generated passwords capacity in Remote Desktop settings * Wacom - Check for the right output connector name Signed-off-by: Markus Volk <f_l_k@t-online.de> --- .../0001-Add-meson-option-to-pass-sysroot.patch | 13 +++++-------- ...enter_46.0.1.bb => gnome-control-center_46.1.bb} | 9 ++++----- 2 files changed, 9 insertions(+), 13 deletions(-) rename meta-gnome/recipes-gnome/gnome-control-center/{gnome-control-center_46.0.1.bb => gnome-control-center_46.1.bb} (87%)