diff options
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 @@ | |||
1 | From ba8aebe1259ae3f7f5a4827e5a47bb95c568b218 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | ||
3 | Date: Tue, 21 May 2019 16:07:46 +0200 | ||
4 | Subject: [PATCH] Add meson option to pass sysroot | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | We need to pass this to meson to help it finding gdesktop-enums.h: | ||
10 | |||
11 | | panels/background/meson.build:38:0: ERROR: File /usr/include/gsettings-desktop-schemas/gdesktop-enums.h does not exist. | ||
12 | |||
13 | Upstream-Status: Inappropriate [OE specific] | ||
14 | |||
15 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
16 | --- | ||
17 | meson_options.txt | 1 + | ||
18 | panels/background/meson.build | 2 +- | ||
19 | 2 files changed, 2 insertions(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/meson_options.txt b/meson_options.txt | ||
22 | index a347168..2cd8121 100644 | ||
23 | --- a/meson_options.txt | ||
24 | +++ b/meson_options.txt | ||
25 | @@ -1,3 +1,4 @@ | ||
26 | +option('oe_sysroot', type: 'string', value: '', description: 'Directory for OE-sysroot') | ||
27 | option('cheese', type: 'boolean', value: true, description: 'build with cheese webcam support') | ||
28 | option('documentation', type: 'boolean', value: false, description: 'build documentation') | ||
29 | option('gnome_session_libexecdir', type: 'string', value: '', description: 'Directory for gnome-session\'s libexecdir') | ||
30 | diff --git a/panels/background/meson.build b/panels/background/meson.build | ||
31 | index bb34b69..f22722e 100644 | ||
32 | --- a/panels/background/meson.build | ||
33 | +++ b/panels/background/meson.build | ||
34 | @@ -36,7 +36,7 @@ common_sources = [] | ||
35 | |||
36 | enums = 'gdesktop-enums-types' | ||
37 | enums_header = files( | ||
38 | - gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', | ||
39 | + get_option('oe_sysroot') + gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', | ||
40 | 'cc-background-item.h' | ||
41 | ) | ||
42 | |||
43 | -- | ||
44 | 2.20.1 | ||
45 | |||
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 @@ | |||
1 | SUMMARY = "GNOME Settings" | ||
2 | DESCRIPTION = "GNOME Settings is GNOME's main interface for configuration of various aspects of your desktop" | ||
3 | LICENSE = "GPLv2" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" | ||
5 | |||
6 | GNOMEBASEBUILDCLASS = "meson" | ||
7 | |||
8 | inherit gnomebase gsettings gettext vala upstream-version-is-even bash-completion features_check | ||
9 | |||
10 | DEPENDS = " \ | ||
11 | gdk-pixbuf-native \ | ||
12 | colord-gtk \ | ||
13 | udisks2 \ | ||
14 | upower \ | ||
15 | polkit \ | ||
16 | pulseaudio \ | ||
17 | accountsservice \ | ||
18 | samba \ | ||
19 | gsettings-desktop-schemas \ | ||
20 | gnome-settings-daemon \ | ||
21 | gnome-desktop3 \ | ||
22 | gnome-online-accounts \ | ||
23 | network-manager-applet \ | ||
24 | gnome-bluetooth \ | ||
25 | grilo \ | ||
26 | libgtop \ | ||
27 | gsound \ | ||
28 | libpwquality \ | ||
29 | " | ||
30 | |||
31 | REQUIRED_DISTRO_FEATURES += "polkit pulseaudio systemd x11" | ||
32 | |||
33 | SRC_URI[archive.md5sum] = "8b0f0baea34fbe937efd0ad1be4b451b" | ||
34 | SRC_URI[archive.sha256sum] = "5f82ecd5554136c462248ec5363b82d95358b39dfd6787006d8307b4504e515e" | ||
35 | SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" | ||
36 | |||
37 | PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" | ||
38 | PACKAGECONFIG[ibus] = "-Dibus=true, -Dibus=false, ibus" | ||
39 | PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false, wayland" | ||
40 | |||
41 | # Once we have (lib)cheese we can make cheese a PACKAGECONFIG | ||
42 | EXTRA_OEMESON = " \ | ||
43 | -Doe_sysroot=${STAGING_DIR_HOST} \ | ||
44 | -Dcheese=false \ | ||
45 | " | ||
46 | |||
47 | FILES_${PN} += " \ | ||
48 | ${datadir}/dbus-1 \ | ||
49 | ${datadir}/gnome-shell \ | ||
50 | ${datadir}/metainfo \ | ||
51 | " | ||
52 | |||
53 | FILES_${PN}-dev += "${datadir}/gettext" | ||
54 | |||
55 | RDEPENDS_${PN} += "gsettings-desktop-schemas" | ||