1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00

gsettings-desktop-schemas: upgrade 3.28.1 -> 3.32.0

* build with meson
* dependency intltool-native can go - they moved gettext only translation
* put gnome inherits together

(From OE-Core rev: e965b72c08fc94c7c6dbfea36505400f3dbb2c53)

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andreas Müller
2019-05-21 11:00:31 +02:00
committed by Richard Purdie
parent 710a265831
commit b25a61d8c7
3 changed files with 49 additions and 13 deletions
@@ -0,0 +1,33 @@
From 42e58c4c3e95a4a78ee8294f9b3901726bbbabe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 11 May 2019 00:21:11 +0200
Subject: [PATCH] Do not skip gir installation for cross compiling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
We are cool and can handle cross gobject-introspection.
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
headers/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/headers/meson.build b/headers/meson.build
index 3ce8b61..1132695 100644
--- a/headers/meson.build
+++ b/headers/meson.build
@@ -19,7 +19,7 @@ enums_xml = custom_target(
install: true,
install_dir: schemasdir)
-if not meson.is_cross_build() and get_option('introspection')
+if get_option('introspection')
noinst_lib = shared_library('noinst',
headers,
install: false)
--
2.20.1
@@ -1,13 +0,0 @@
SUMMARY = "GNOME desktop-wide GSettings schemas"
HOMEPAGE = "http://live.gnome.org/gsettings-desktop-schemas"
BUGTRACKER = "https://bugzilla.gnome.org/"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
DEPENDS = "glib-2.0 intltool-native"
inherit gnomebase gsettings gettext gobject-introspection upstream-version-is-even
SRC_URI[archive.md5sum] = "83bb19d025f126fae495ab43a2f26f40"
SRC_URI[archive.sha256sum] = "f88ea6849ffe897c51cfeca5e45c3890010c82c58be2aee18b01349648e5502f"
@@ -0,0 +1,16 @@
SUMMARY = "GNOME desktop-wide GSettings schemas"
HOMEPAGE = "http://live.gnome.org/gsettings-desktop-schemas"
BUGTRACKER = "https://bugzilla.gnome.org/"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
DEPENDS = "glib-2.0"
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gsettings gobject-introspection gettext upstream-version-is-even
SRC_URI[archive.md5sum] = "0c2d468a482c12594757442c983aa8ea"
SRC_URI[archive.sha256sum] = "2d59b4b3a548859dfae46314ee4666787a00d5c82db382e97df7aa9d0e310a35"
SRC_URI += "file://0001-Do-not-skip-gir-installation-for-cross-compiling.patch"