mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 02:31:27 +00:00
Code Issues Projects Releases Wiki Activity

gnome-control-center: update 45.3 -> 46.0

Browse Source 
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Markus Volk
2024-03-18 18:11:58 +01:00
committed by Khem Raj
parent 816f4cbbda
commit 03ee9d668f
2 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch
+22 -29
View File
@@ -1,57 +1,50 @@
From ba8aebe1259ae3f7f5a4827e5a47bb95c568b218 Mon Sep 17 00:00:00 2001 From 1a48df2a8da44410bbd767c2420d363f6180c79a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> From: Markus Volk <f_l_k@t-online.de>
Date: Tue, 21 May 2019 16:07:46 +0200 Date: Mon, 18 Mar 2024 05:50:21 +0100
Subject: [PATCH] Add meson option to pass sysroot 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: Signed-off-by: Markus Volk <f_l_k@t-online.de>
| 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>
--- ---
meson_options.txt | 1 + meson_options.txt | 1 +
panels/background/meson.build | 2 +- 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 diff --git a/meson_options.txt b/meson_options.txt
index 8ee7b6e0e..7e6adc668 100644 index e53d6e3f3..8fae4c824 100644
--- a/meson_options.txt --- a/meson_options.txt
+++ b/meson_options.txt +++ b/meson_options.txt
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
+option('oe_sysroot', type: 'string', value: '', description: 'Directory for OE-sysroot') +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('documentation', type: 'boolean', value: false, description: 'build documentation')
option('ibus', type: 'boolean', value: true, description: 'build with IBus support') 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 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 --- a/panels/background/meson.build
+++ b/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 = 'gdesktop-enums-types'
enums_header = files( enums_header = files(
- gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.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', + get_option('oe_sysroot') + gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h'
'cc-background-item.h'
) )
diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build common_sources += gnome.mkenums(
index 8cb3b63f0..8c5a45e7c 100644 diff --git a/panels/system/meson.build b/panels/system/meson.build
--- a/panels/datetime/meson.build index 4fee82210..979332a0e 100644
+++ b/panels/datetime/meson.build --- a/panels/system/meson.build
@@ -37,7 +37,7 @@ sources = files( +++ b/panels/system/meson.build
@@ -73,7 +73,7 @@ sources += gnome.compile_resources(
)
enums = 'gdesktop-enums-types'
enums_header = files( enums_header = files(
- gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.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', + 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
meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_45.3.bb → meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.bb
+1 -1
View File
@@ -38,7 +38,7 @@ inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is
REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11" REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11"
SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" 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 ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}"
PACKAGECONFIG[cups] = ",,cups,cups" PACKAGECONFIG[cups] = ",,cups,cups"