summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-11-02 17:48:10 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-11-03 08:21:11 +0000
commit2baa2105b476fc25bd3b49c67551298b975238c2 (patch)
treef3e3ba14ba2d542ea4864d45a429ef4a71a2f742 /meta
parent2e522b777b12ccc70e03d3fa7b6017f7c2f5f74b (diff)
downloadpoky-2baa2105b476fc25bd3b49c67551298b975238c2.tar.gz
gcr: upgrade 3.36.0 -> 3.38.0
(From OE-Core rev: d0d33f2aa7028593768e0ad2d09c729d170c858e) 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/gcr/gcr/0001-meson-Make-sure-gcr-oids.h-is-built.patch36
-rw-r--r--meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-set-internal-vapi-dependencies.patch45
-rw-r--r--meta/recipes-gnome/gcr/gcr_3.38.0.bb (renamed from meta/recipes-gnome/gcr/gcr_3.36.0.bb)6
3 files changed, 1 insertions, 86 deletions
diff --git a/meta/recipes-gnome/gcr/gcr/0001-meson-Make-sure-gcr-oids.h-is-built.patch b/meta/recipes-gnome/gcr/gcr/0001-meson-Make-sure-gcr-oids.h-is-built.patch
deleted file mode 100644
index 4bf5bfba94..0000000000
--- a/meta/recipes-gnome/gcr/gcr/0001-meson-Make-sure-gcr-oids.h-is-built.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 9fca6ae0aa7355c27d0922c561b9fbe18dde5b3d Mon Sep 17 00:00:00 2001
2From: Niels De Graef <nielsdegraef@gmail.com>
3Date: Fri, 19 Jun 2020 22:37:31 +0200
4Subject: [PATCH 1/1] meson: Make sure gcr-oids.h is built
5
6Fixes https://gitlab.gnome.org/GNOME/gcr/-/issues/48
7---
8 gcr/meson.build | 5 ++++-
9 1 file changed, 4 insertions(+), 1 deletion(-)
10
11--- end of original header ---
12
13Upstream-Status: Backport [https://github.com/GNOME/gcr.git]
14
15Signed-off-by: Joe Slater <joe.slater@windriver.com>
16
17---
18diff --git a/gcr/meson.build b/gcr/meson.build
19index 199452f..06c3a63 100644
20--- a/gcr/meson.build
21+++ b/gcr/meson.build
22@@ -178,7 +178,10 @@ endif
23 gcr_base_dep = declare_dependency(
24 link_with: gcr_base_lib,
25 include_directories: include_directories('..'),
26- sources: gcr_enums_gen[1], # Make sure gcr-enum-types-base.h can be included
27+ sources: [
28+ gcr_enums_gen[1],
29+ gcr_oids[1],
30+ ],
31 )
32
33 if get_option('introspection')
34--
352.7.4
36
diff --git a/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-set-internal-vapi-dependencies.patch b/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-set-internal-vapi-dependencies.patch
deleted file mode 100644
index b484a1b222..0000000000
--- a/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-set-internal-vapi-dependencies.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From ebb77dad4563b882b449cbc5e882f36ac8c2de71 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 11 May 2020 22:19:16 +0000
4Subject: [PATCH] meson.build: correctly set internal vapi dependencies
5
6If they are set as strings, meson will supply the right
7arguments to vapigen, but will not set the ninja dependencies
8to ensure they get built first, and so races will occur:
9https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1881/steps/8/logs/step1b
10
11Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/55]
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13---
14 gcr/meson.build | 2 +-
15 ui/meson.build | 4 ++--
16 2 files changed, 3 insertions(+), 3 deletions(-)
17
18diff --git a/gcr/meson.build b/gcr/meson.build
19index 254a933..199452f 100644
20--- a/gcr/meson.build
21+++ b/gcr/meson.build
22@@ -203,7 +203,7 @@ if get_option('introspection')
23
24 gcr_vapi = gnome.generate_vapi('gcr-@0@'.format(gcr_major_version),
25 sources: gcr_gir[0],
26- packages: [ 'glib-2.0', 'gio-2.0', 'gck-@0@'.format(gck_major_version) ],
27+ packages: [ 'glib-2.0', 'gio-2.0', gck_vapi ],
28 metadata_dirs: meson.current_source_dir(),
29 vapi_dirs: [
30 build_root / 'gck',
31diff --git a/ui/meson.build b/ui/meson.build
32index 5ca3753..477412d 100644
33--- a/ui/meson.build
34+++ b/ui/meson.build
35@@ -174,8 +174,8 @@ if get_option('introspection')
36 packages: [
37 'glib-2.0',
38 'gio-2.0',
39- 'gck-@0@'.format(gck_major_version),
40- 'gcr-@0@'.format(gcr_major_version),
41+ gck_vapi,
42+ gcr_vapi,
43 'gtk+-3.0'
44 ],
45 metadata_dirs: meson.current_source_dir(),
diff --git a/meta/recipes-gnome/gcr/gcr_3.36.0.bb b/meta/recipes-gnome/gcr/gcr_3.38.0.bb
index ff455a68ec..49e8f1848b 100644
--- a/meta/recipes-gnome/gcr/gcr_3.36.0.bb
+++ b/meta/recipes-gnome/gcr/gcr_3.38.0.bb
@@ -17,11 +17,7 @@ inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even
17# depends on gtk+3, but also x11 through gtk+-x11 17# depends on gtk+3, but also x11 through gtk+-x11
18REQUIRED_DISTRO_FEATURES = "x11" 18REQUIRED_DISTRO_FEATURES = "x11"
19 19
20SRC_URI += " file://0001-meson.build-correctly-set-internal-vapi-dependencies.patch" 20SRC_URI[archive.sha256sum] = "a64cc7b65757fc2cd16de1708d132a16d05cd1f62c6eba436d56fe45d4ba27e1"
21SRC_URI += " file://0001-meson-Make-sure-gcr-oids.h-is-built.patch"
22
23SRC_URI[archive.md5sum] = "adc65563b6b458507b9a578a8b68fb61"
24SRC_URI[archive.sha256sum] = "aaf9bed017a2263c6145c89a1a84178f9f40f238426463e4ae486694ef5f6601"
25 21
26FILES_${PN} += " \ 22FILES_${PN} += " \
27 ${datadir}/dbus-1 \ 23 ${datadir}/dbus-1 \