[meta-gnome,1/2] gnome-control-center: update 45.3 -> 46.0

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 ...001-Add-meson-option-to-pass-sysroot.patch | 51 ++++++++-----------
 ...r_45.3.bb => gnome-control-center_46.0.bb} |  2 +-
 2 files changed, 23 insertions(+), 30 deletions(-)
 rename meta-gnome/recipes-gnome/gnome-control-center/{gnome-control-center_45.3.bb => gnome-control-center_46.0.bb} (95%)

Please restore
Upstream-Status: Inappropriate [OE specific]

in the meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch

On Mon, Mar 18, 2024 at 6:11 PM Markus Volk <f_l_k@t-online.de> wrote:
>
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
>  ...001-Add-meson-option-to-pass-sysroot.patch | 51 ++++++++-----------
>  ...r_45.3.bb => gnome-control-center_46.0.bb} |  2 +-
>  2 files changed, 23 insertions(+), 30 deletions(-)
>  rename meta-gnome/recipes-gnome/gnome-control-center/{gnome-control-center_45.3.bb => gnome-control-center_46.0.bb} (95%)
>
> 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 7cd7c0469..a2c237c18 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,57 +1,50 @@
> -From ba8aebe1259ae3f7f5a4827e5a47bb95c568b218 Mon Sep 17 00:00:00 2001
> -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> -Date: Tue, 21 May 2019 16:07:46 +0200
> +From 1a48df2a8da44410bbd767c2420d363f6180c79a 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
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
>
> -We need to pass this to meson to help it finding gdesktop-enums.h:
> -
> -| panels/background/meson.build:38:0: ERROR: File /usr/include/gsettings-desktop-schemas/gdesktop-enums.h does not exist.
> -
> -Upstream-Status: Inappropriate [OE specific]
> -
> -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +Signed-off-by: Markus Volk <f_l_k@t-online.de>
>  ---
>   meson_options.txt             | 1 +
>   panels/background/meson.build | 2 +-
> - 2 files changed, 2 insertions(+), 1 deletion(-)
> + panels/system/meson.build     | 2 +-
> + 3 files changed, 3 insertions(+), 2 deletions(-)
>
>  diff --git a/meson_options.txt b/meson_options.txt
> -index 8ee7b6e0e..7e6adc668 100644
> +index e53d6e3f3..8fae4c824 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('privileged_group', type: 'string', value: 'wheel', description: 'name of group that has elevated permissions')
>  diff --git a/panels/background/meson.build b/panels/background/meson.build
> -index 9bf543538..97f1e0117 100644
> +index 6ced050f9..df1f80896 100644
>  --- a/panels/background/meson.build
>  +++ b/panels/background/meson.build
> -@@ -19,7 +19,7 @@ common_sources = []
> +@@ -24,7 +24,7 @@ common_sources += gnome.mkenums_simple(
>
>   enums = 'gdesktop-enums-types'
>   enums_header = files(
> --  gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h',
> -+  get_option('oe_sysroot') + gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h',
> -   'cc-background-item.h'
> +-  gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h'
> ++  get_option('oe_sysroot') + gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h'
>   )
>
> -diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build
> -index 8cb3b63f0..8c5a45e7c 100644
> ---- a/panels/datetime/meson.build
> -+++ b/panels/datetime/meson.build
> -@@ -37,7 +37,7 @@ sources = files(
> + common_sources += gnome.mkenums(
> +diff --git a/panels/system/meson.build b/panels/system/meson.build
> +index 4fee82210..979332a0e 100644
> +--- a/panels/system/meson.build
> ++++ b/panels/system/meson.build
> +@@ -73,7 +73,7 @@ sources += gnome.compile_resources(
> + )
>
> - enums = 'gdesktop-enums-types'
>   enums_header = files(
>  -  gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h',
>  +  get_option('oe_sysroot') + gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h',
> -   'cc-datetime-panel.h'
> +   'datetime/cc-datetime-page.h'
>   )
>
>  --
> -2.34.1
> +2.44.0
> +
> diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_45.3.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.bb
> similarity index 95%
> rename from meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_45.3.bb
> rename to meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.bb
> index 96fe9c9ff..53643c680 100644
> --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_45.3.bb
> +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.bb
> @@ -38,7 +38,7 @@ inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is
>  REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11"
>
>  SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch"
> -SRC_URI[archive.sha256sum] = "b1e949c4e86c0624ec6a6ed0df09c9fae2b22983c1dca60ed86aec8ef0b24004"
> +SRC_URI[archive.sha256sum] = "25f67de05897868b2e97eaa0ecc986a408af08d4985c8a9da44f0d7bd8fea7a4"
>
>  PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}"
>  PACKAGECONFIG[cups] = ",,cups,cups"
> --
> 2.44.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#109407): https://lists.openembedded.org/g/openembedded-devel/message/109407
> Mute This Topic: https://lists.openembedded.org/mt/105007539/3617156
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [martin.jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>