[RFC,meta-gnome,06/16] gnome-settings-daemon: add recipe for gnome-settings-daemon

Submitted by brendank310 on Oct. 29, 2018, 4:41 p.m. | Patch ID: 155951

Details

Message ID 16012ad2ea09d37fb7a9b8ad4b0c0f01e641d821.1540830650.git.brendank310@gmail.com
State Changes Requested
Headers show

Commit Message

brendank310 Oct. 29, 2018, 4:41 p.m.
From: Brendan Kerrigan <kerriganb@ainfosec.com>

Signed-off-by: Brendan Kerrigan <kerriganb@ainfosec.com>
---
 .../0001-remove-extraneous-plugins.patch      | 52 +++++++++++++++++++
 .../gnome3/gnome-settings-daemon_git.bb       | 43 +++++++++++++++
 2 files changed, 95 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/gnome3/gnome-settings-daemon/0001-remove-extraneous-plugins.patch
 create mode 100644 meta-gnome/recipes-gnome/gnome3/gnome-settings-daemon_git.bb

Patch hide | download patch | download mbox

diff --git a/meta-gnome/recipes-gnome/gnome3/gnome-settings-daemon/0001-remove-extraneous-plugins.patch b/meta-gnome/recipes-gnome/gnome3/gnome-settings-daemon/0001-remove-extraneous-plugins.patch
new file mode 100644
index 000000000..6f5599058
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome3/gnome-settings-daemon/0001-remove-extraneous-plugins.patch
@@ -0,0 +1,52 @@ 
+gnome-settings-daemon: Disable plugins, dependencies, and compiler errors
+
+  * Disable 'no-deprecated-declaration' to allow build to complete
+  * Remove colord as a dependency
+  * Remove unused plugins
+
+  Upstream-status: Inappropriate [configuration]
+
+  Signed-off-by: Brendan Kerrigan <kerriganb@ainfosec.com>
+
+diff --git a/meson.build b/meson.build
+index d2121623..15fcc88d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -54,7 +54,7 @@ endforeach
+ 
+ # compiler flags
+ common_flags = ['-DHAVE_CONFIG_H']
+-compiler_flags = []
++compiler_flags = ['-Wno-deprecated-declarations']
+ 
+ if gsd_buildtype.contains('debug')
+   common_flags += ['-DG_ENABLE_DEBUG']
+@@ -82,7 +82,6 @@ endif
+ 
+ add_project_arguments(common_flags + compiler_flags, language: 'c')
+ 
+-colord_dep = dependency('colord', version: '>= 1.0.2')
+ geocode_glib_dep = dependency('geocode-glib-1.0', version: '>= 3.10.0')
+ gio_dep = dependency('gio-2.0', version: '>= 2.53.0')
+ gio_unix_dep = dependency('gio-unix-2.0')
+diff --git a/plugins/meson.build b/plugins/meson.build
+index 3db69da7..accb7b90 100644
+--- a/plugins/meson.build
++++ b/plugins/meson.build
+@@ -1,16 +1,11 @@
+ enabled_plugins = [
+   ['a11y-settings', 'A11ySettings'],
+   ['clipboard', 'Clipboard'],
+-  ['color', 'Color'],
+   ['datetime', 'Datetime'],
+   ['dummy', ''],
+-  ['power', 'Power'],
+   ['housekeeping', 'Housekeeping'],
+   ['keyboard', 'Keyboard'],
+-  ['media-keys', 'MediaKeys'],
+   ['mouse', 'Mouse'],
+-  ['screensaver-proxy', 'ScreensaverProxy'],
+-  ['sharing', 'Sharing'],
+   ['sound', 'Sound'],
+   ['xsettings', 'XSettings']
+ ]
diff --git a/meta-gnome/recipes-gnome/gnome3/gnome-settings-daemon_git.bb b/meta-gnome/recipes-gnome/gnome3/gnome-settings-daemon_git.bb
new file mode 100644
index 000000000..167db3bd2
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome3/gnome-settings-daemon_git.bb
@@ -0,0 +1,43 @@ 
+DESCRIPTION = "GNOME Settings Daemon"
+LICENSE = "GPLv2"
+DEPENDS = " \
+           libcanberra \
+           prelink \
+           glib-2.0 \
+           gsettings-desktop-schemas \
+           gnome-desktop3 \
+           wayland \
+           wayland-protocols \
+           gettext-native \
+           polkit \
+           upower \
+           libnotify \
+           geocode-glib \
+           libgweather \
+           lcms2 \
+           libwacom \
+           networkmanager \
+           geoclue \
+          "
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-settings-daemon.git;protocol=http;branch=gnome-3-30 \
+           file://0001-remove-extraneous-plugins.patch \
+           "
+
+SRCREV="${AUTOREV}"
+S = "${WORKDIR}/git"
+
+inherit pkgconfig meson gobject-introspection
+
+EXTRA_OEMESON += " -Denable-gtk-doc=false -Dcups=false "
+
+FILES_${PN} += "${datadir}"
+FILES_${PN} += "${libdir}"
+
+do_configure_prepend() {
+	# Fixup the gsettings version
+	sed -i 's^3.27.90^3.24.1^g' ${S}/meson.build
+}
+

Comments

Khem Raj Oct. 30, 2018, 2:53 a.m.
On Mon, Oct 29, 2018 at 9:42 AM brendank310 <brendank310@gmail.com> wrote:

> From: Brendan Kerrigan <kerriganb@ainfosec.com>
>
> Signed-off-by: Brendan Kerrigan <kerriganb@ainfosec.com>
> ---
>  .../0001-remove-extraneous-plugins.patch      | 52 +++++++++++++++++++
>  .../gnome3/gnome-settings-daemon_git.bb       | 43 +++++++++++++++
>  2 files changed, 95 insertions(+)
>  create mode 100644
> meta-gnome/recipes-gnome/gnome3/gnome-settings-daemon/0001-remove-extraneous-plugins.patch
>  create mode 100644 meta-gnome/recipes-gnome/gnome3/
> gnome-settings-daemon_git.bb
>
> diff --git
> a/meta-gnome/recipes-gnome/gnome3/gnome-settings-daemon/0001-remove-extraneous-plugins.patch
> b/meta-gnome/recipes-gnome/gnome3/gnome-settings-daemon/0001-remove-extraneous-plugins.patch
> new file mode 100644
> index 000000000..6f5599058
> --- /dev/null
> +++
> b/meta-gnome/recipes-gnome/gnome3/gnome-settings-daemon/0001-remove-extraneous-plugins.patch
> @@ -0,0 +1,52 @@
> +gnome-settings-daemon: Disable plugins, dependencies, and compiler errors
> +
> +  * Disable 'no-deprecated-declaration' to allow build to complete
> +  * Remove colord as a dependency
> +  * Remove unused plugins
> +
> +  Upstream-status: Inappropriate [configuration]
> +
> +  Signed-off-by: Brendan Kerrigan <kerriganb@ainfosec.com>
> +
> +diff --git a/meson.build b/meson.build
> +index d2121623..15fcc88d 100644
> +--- a/meson.build
> ++++ b/meson.build
> +@@ -54,7 +54,7 @@ endforeach
> +
> + # compiler flags
> + common_flags = ['-DHAVE_CONFIG_H']
> +-compiler_flags = []
> ++compiler_flags = ['-Wno-deprecated-declarations']
> +
> + if gsd_buildtype.contains('debug')
> +   common_flags += ['-DG_ENABLE_DEBUG']
> +@@ -82,7 +82,6 @@ endif
> +
> + add_project_arguments(common_flags + compiler_flags, language: 'c')
> +
> +-colord_dep = dependency('colord', version: '>= 1.0.2')
> + geocode_glib_dep = dependency('geocode-glib-1.0', version: '>= 3.10.0')
> + gio_dep = dependency('gio-2.0', version: '>= 2.53.0')
> + gio_unix_dep = dependency('gio-unix-2.0')
> +diff --git a/plugins/meson.build b/plugins/meson.build
> +index 3db69da7..accb7b90 100644
> +--- a/plugins/meson.build
> ++++ b/plugins/meson.build
> +@@ -1,16 +1,11 @@
> + enabled_plugins = [
> +   ['a11y-settings', 'A11ySettings'],
> +   ['clipboard', 'Clipboard'],
> +-  ['color', 'Color'],
> +   ['datetime', 'Datetime'],
> +   ['dummy', ''],
> +-  ['power', 'Power'],
> +   ['housekeeping', 'Housekeeping'],
> +   ['keyboard', 'Keyboard'],
> +-  ['media-keys', 'MediaKeys'],
> +   ['mouse', 'Mouse'],
> +-  ['screensaver-proxy', 'ScreensaverProxy'],
> +-  ['sharing', 'Sharing'],
> +   ['sound', 'Sound'],
> +   ['xsettings', 'XSettings']
> + ]
> diff --git a/meta-gnome/recipes-gnome/gnome3/gnome-settings-daemon_git.bb
> b/meta-gnome/recipes-gnome/gnome3/gnome-settings-daemon_git.bb
> new file mode 100644
> index 000000000..167db3bd2
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/gnome3/gnome-settings-daemon_git.bb
> @@ -0,0 +1,43 @@
> +DESCRIPTION = "GNOME Settings Daemon"
> +LICENSE = "GPLv2"
> +DEPENDS = " \
> +           libcanberra \
> +           prelink \
> +           glib-2.0 \
> +           gsettings-desktop-schemas \
> +           gnome-desktop3 \
> +           wayland \
> +           wayland-protocols \
> +           gettext-native \
> +           polkit \
> +           upower \
> +           libnotify \
> +           geocode-glib \
> +           libgweather \
> +           lcms2 \
> +           libwacom \
> +           networkmanager \
> +           geoclue \
> +          "
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
> +
> +SRC_URI = "git://
> gitlab.gnome.org/GNOME/gnome-settings-daemon.git;protocol=http;branch=gnome-3-30
> \
> +           file://0001-remove-extraneous-plugins.patch \
> +           "
> +
> +SRCREV="${AUTOREV}"
>

No AUTOREV as we discussed earlier

+S = "${WORKDIR}/git"
> +
> +inherit pkgconfig meson gobject-introspection
> +
> +EXTRA_OEMESON += " -Denable-gtk-doc=false -Dcups=false "
> +
> +FILES_${PN} += "${datadir}"
> +FILES_${PN} += "${libdir}"
> +
> +do_configure_prepend() {
> +       # Fixup the gsettings version
> +       sed -i 's^3.27.90^3.24.1^g' ${S}/meson.build
> +}
> +
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>