diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2019-12-09 09:36:00 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-12-10 16:21:07 -0800 |
commit | eba5a2344c30abd8ce4cdc75b0816c6ba10399fc (patch) | |
tree | 18ea1f304d064c91a92f7eeac7c43d70aaba21dd /meta-gnome | |
parent | b04c66677b52557202e4a18751f0c9827cff6e06 (diff) | |
download | meta-openembedded-eba5a2344c30abd8ce4cdc75b0816c6ba10399fc.tar.gz |
gnome-control-center: re-add 3.34.1
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-gnome')
2 files changed, 100 insertions, 0 deletions
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 new file mode 100644 index 0000000000..7f82a152c7 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch @@ -0,0 +1,45 @@ +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 +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> +--- + meson_options.txt | 1 + + panels/background/meson.build | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/meson_options.txt b/meson_options.txt +index a347168..2cd8121 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('cheese', type: 'boolean', value: true, description: 'build with cheese webcam support') + option('documentation', type: 'boolean', value: false, description: 'build documentation') + option('gnome_session_libexecdir', type: 'string', value: '', description: 'Directory for gnome-session\'s libexecdir') +diff --git a/panels/background/meson.build b/panels/background/meson.build +index bb34b69..f22722e 100644 +--- a/panels/background/meson.build ++++ b/panels/background/meson.build +@@ -36,7 +36,7 @@ common_sources = [] + + enums = 'gdesktop-enums-types' + enums_header = files( +- gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', ++ get_option('oe_sysroot') + gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', + 'cc-background-item.h' + ) + +-- +2.20.1 + diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.34.1.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.34.1.bb new file mode 100644 index 0000000000..5d58879c52 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.34.1.bb @@ -0,0 +1,55 @@ +SUMMARY = "GNOME Settings" +DESCRIPTION = "GNOME Settings is GNOME's main interface for configuration of various aspects of your desktop" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gettext vala upstream-version-is-even bash-completion features_check + +DEPENDS = " \ + gdk-pixbuf-native \ + colord-gtk \ + udisks2 \ + upower \ + polkit \ + pulseaudio \ + accountsservice \ + samba \ + gsettings-desktop-schemas \ + gnome-settings-daemon \ + gnome-desktop3 \ + gnome-online-accounts \ + network-manager-applet \ + gnome-bluetooth \ + grilo \ + libgtop \ + gsound \ + libpwquality \ +" + +REQUIRED_DISTRO_FEATURES += "polkit pulseaudio systemd x11" + +SRC_URI[archive.md5sum] = "8b0f0baea34fbe937efd0ad1be4b451b" +SRC_URI[archive.sha256sum] = "5f82ecd5554136c462248ec5363b82d95358b39dfd6787006d8307b4504e515e" +SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" + +PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" +PACKAGECONFIG[ibus] = "-Dibus=true, -Dibus=false, ibus" +PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false, wayland" + +# Once we have (lib)cheese we can make cheese a PACKAGECONFIG +EXTRA_OEMESON = " \ + -Doe_sysroot=${STAGING_DIR_HOST} \ + -Dcheese=false \ +" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/gnome-shell \ + ${datadir}/metainfo \ +" + +FILES_${PN}-dev += "${datadir}/gettext" + +RDEPENDS_${PN} += "gsettings-desktop-schemas" |