[PATCH v2] gsettings-desktop-schemas: upgrade 3.32.0 -> 3.34.0

[PATCH v2] gsettings-desktop-schemas: upgrade 3.32.0 -> 3.34.0

[Andreas Müller]

Need it for gnome-settings-daemon 3.34:

| meson.build:91:0: ERROR: Invalid version of dependency, need 'gsettings-desktop-schemas' ['>= 3.33.0'] found '3.32.0'.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
v2: make x11 a required distro feature
 ..._3.32.0.bb => gsettings-desktop-schemas_3.34.0.bb} | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
 rename meta/recipes-gnome/gsettings-desktop-schemas/{gsettings-desktop-schemas_3.32.0.bb => gsettings-desktop-schemas_3.34.0.bb} (58%)

diff --git a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.32.0.bb b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.34.0.bb
similarity index 58%
rename from meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.32.0.bb
rename to meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.34.0.bb
index 859f70466b..bf260fdb4b 100644
--- a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.32.0.bb
+++ b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.34.0.bb
@@ -5,12 +5,15 @@ BUGTRACKER = "https://bugzilla.gnome.org/"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
-DEPENDS = "glib-2.0"
+DEPENDS = "glib-2.0 gcr"
 
 GNOMEBASEBUILDCLASS = "meson"
 
-inherit gnomebase gsettings gobject-introspection gettext upstream-version-is-even
+inherit gnomebase gsettings gobject-introspection gettext upstream-version-is-even distro_features_check
 
-SRC_URI[archive.md5sum] = "0c2d468a482c12594757442c983aa8ea"
-SRC_URI[archive.sha256sum] = "2d59b4b3a548859dfae46314ee4666787a00d5c82db382e97df7aa9d0e310a35"
+# depends on gcr which requires x11 for gtk+3
+REQUIRED_DISTRO_FEATURES = "x11"
+
+SRC_URI[archive.md5sum] = "9759ef53fb2e53fc8d19190e58f2c332"
+SRC_URI[archive.sha256sum] = "288b04260f7040b0e004a8d59c773cfb4e32df4f1b4a0f9d705c51afccc95ead"
 SRC_URI += "file://0001-Do-not-skip-gir-installation-for-cross-compiling.patch"
-- 
2.21.0

Re: [PATCH v2] gsettings-desktop-schemas: upgrade 3.32.0 -> 3.34.0

[Ross Burton]

> -DEPENDS = "glib-2.0"
> +DEPENDS = "glib-2.0 gcr"

I can't see a gcr dependency in the source, and it builds fine with gcr 
removed.  Why was this added?

Ross

Re: [PATCH v2] gsettings-desktop-schemas: upgrade 3.32.0 -> 3.34.0

[Andreas Müller]

On Wed, Oct 23, 2019 at 2:11 PM Ross Burton <ross.burton@intel.com> wrote:
>
> > -DEPENDS = "glib-2.0"
> > +DEPENDS = "glib-2.0 gcr"
>
> I can't see a gcr dependency in the source, and it builds fine with gcr
> removed.  Why was this added?
>
> Ross
Checked sources and I agree. I must have mixed up the warning with
another recipe's warning.

Will test again and send V3 tonight

Andreas