diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-10-28 22:05:40 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-10-30 13:22:48 +0000 |
| commit | 560e32b74f385d931cfc30a35c1851bfd53e02f4 (patch) | |
| tree | a42249ec96e5c382351ae753c6230e77420b2cce /meta | |
| parent | b443fc820753428ca3247c9d17fe364c32306d83 (diff) | |
| download | poky-560e32b74f385d931cfc30a35c1851bfd53e02f4.tar.gz | |
gsettings-desktop-schemas: update 3.36.1 -> 3.38.0
Drop 0001-Do-not-skip-gir-installation-for-cross-compiling.patch as
upstream has done the same change.
(From OE-Core rev: 50ecc0ae003895e416d5835b5a75ed4b246deea1)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas/0001-Do-not-skip-gir-installation-for-cross-compiling.patch | 33 | ||||
| -rw-r--r-- | meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.38.0.bb (renamed from meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.36.1.bb) | 4 |
2 files changed, 1 insertions, 36 deletions
diff --git a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas/0001-Do-not-skip-gir-installation-for-cross-compiling.patch b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas/0001-Do-not-skip-gir-installation-for-cross-compiling.patch deleted file mode 100644 index c481b18f1c..0000000000 --- a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas/0001-Do-not-skip-gir-installation-for-cross-compiling.patch +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | From 42e58c4c3e95a4a78ee8294f9b3901726bbbabe4 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | ||
| 3 | Date: Sat, 11 May 2019 00:21:11 +0200 | ||
| 4 | Subject: [PATCH] Do not skip gir installation for cross compiling | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | We are cool and can handle cross gobject-introspection. | ||
| 10 | |||
| 11 | Upstream-Status: Inappropriate [OE specific] | ||
| 12 | |||
| 13 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
| 14 | --- | ||
| 15 | headers/meson.build | 2 +- | ||
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 17 | |||
| 18 | diff --git a/headers/meson.build b/headers/meson.build | ||
| 19 | index 3ce8b61..1132695 100644 | ||
| 20 | --- a/headers/meson.build | ||
| 21 | +++ b/headers/meson.build | ||
| 22 | @@ -19,7 +19,7 @@ enums_xml = custom_target( | ||
| 23 | install: true, | ||
| 24 | install_dir: schemasdir) | ||
| 25 | |||
| 26 | -if not meson.is_cross_build() and get_option('introspection') | ||
| 27 | +if get_option('introspection') | ||
| 28 | noinst_lib = shared_library('noinst', | ||
| 29 | headers, | ||
| 30 | install: false) | ||
| 31 | -- | ||
| 32 | 2.20.1 | ||
| 33 | |||
diff --git a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.36.1.bb b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.38.0.bb index f54b242e73..34681197d8 100644 --- a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.36.1.bb +++ b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.38.0.bb | |||
| @@ -13,6 +13,4 @@ GNOMEBASEBUILDCLASS = "meson" | |||
| 13 | 13 | ||
| 14 | inherit gnomebase gsettings gobject-introspection gettext upstream-version-is-even | 14 | inherit gnomebase gsettings gobject-introspection gettext upstream-version-is-even |
| 15 | 15 | ||
| 16 | SRC_URI[archive.md5sum] = "708ddd8dec388ebda5539667604197c3" | 16 | SRC_URI[archive.sha256sum] = "5704c8266004b296036671f223c705dc046aa694a1b1abb87c67e7d2747a8c67" |
| 17 | SRC_URI[archive.sha256sum] = "004bdbe43cf8290f2de7d8537e14d8957610ca479a4fa368e34dbd03f03ec9d9" | ||
| 18 | SRC_URI += "file://0001-Do-not-skip-gir-installation-for-cross-compiling.patch" | ||
