From 50ecc0ae003895e416d5835b5a75ed4b246deea1 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 28 Oct 2020 22:05:40 +0100 Subject: [PATCH] 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. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...gir-installation-for-cross-compiling.patch | 33 ------------------- ...bb => gsettings-desktop-schemas_3.38.0.bb} | 4 +-- 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas/0001-Do-not-skip-gir-installation-for-cross-compiling.patch rename meta/recipes-gnome/gsettings-desktop-schemas/{gsettings-desktop-schemas_3.36.1.bb => gsettings-desktop-schemas_3.38.0.bb} (70%) 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 @@ -From 42e58c4c3e95a4a78ee8294f9b3901726bbbabe4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -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 ---- - 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 - 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 similarity index 70% rename from meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.36.1.bb rename to 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" inherit gnomebase gsettings gobject-introspection gettext upstream-version-is-even -SRC_URI[archive.md5sum] = "708ddd8dec388ebda5539667604197c3" -SRC_URI[archive.sha256sum] = "004bdbe43cf8290f2de7d8537e14d8957610ca479a4fa368e34dbd03f03ec9d9" -SRC_URI += "file://0001-Do-not-skip-gir-installation-for-cross-compiling.patch" +SRC_URI[archive.sha256sum] = "5704c8266004b296036671f223c705dc046aa694a1b1abb87c67e7d2747a8c67" -- 2.40.1