mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

gcr: upgrade 3.36.0 -> 3.38.0

Browse Source 
(From OE-Core rev: d0d33f2aa7028593768e0ad2d09c729d170c858e)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2020-11-02 17:48:10 +01:00
committed by Richard Purdie
parent 2e522b777b
commit 2baa2105b4
3 changed files with 1 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
meta/recipes-gnome/gcr/gcr/0001-meson-Make-sure-gcr-oids.h-is-built.patch
View File

@@ -1,36 +0,0 @@
From 9fca6ae0aa7355c27d0922c561b9fbe18dde5b3d Mon Sep 17 00:00:00 2001
From: Niels De Graef <nielsdegraef@gmail.com>
Date: Fri, 19 Jun 2020 22:37:31 +0200
Subject: [PATCH 1/1] meson: Make sure gcr-oids.h is built
Fixes https://gitlab.gnome.org/GNOME/gcr/-/issues/48
---
gcr/meson.build | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- end of original header ---
Upstream-Status: Backport [https://github.com/GNOME/gcr.git]
Signed-off-by: Joe Slater <joe.slater@windriver.com>
---
diff --git a/gcr/meson.build b/gcr/meson.build
index 199452f..06c3a63 100644
--- a/gcr/meson.build
+++ b/gcr/meson.build
@@ -178,7 +178,10 @@ endif
gcr_base_dep = declare_dependency(
link_with: gcr_base_lib,
include_directories: include_directories('..'),
- sources: gcr_enums_gen[1], # Make sure gcr-enum-types-base.h can be included
+ sources: [
+ gcr_enums_gen[1],
+ gcr_oids[1],
+ ],
)
if get_option('introspection')
--
2.7.4

45
meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-set-internal-vapi-dependencies.patch
View File

@@ -1,45 +0,0 @@
From ebb77dad4563b882b449cbc5e882f36ac8c2de71 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 11 May 2020 22:19:16 +0000
Subject: [PATCH] meson.build: correctly set internal vapi dependencies
If they are set as strings, meson will supply the right
arguments to vapigen, but will not set the ninja dependencies
to ensure they get built first, and so races will occur:
https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1881/steps/8/logs/step1b
Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/55]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
gcr/meson.build | 2 +-
ui/meson.build | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gcr/meson.build b/gcr/meson.build
index 254a933..199452f 100644
--- a/gcr/meson.build
+++ b/gcr/meson.build
@@ -203,7 +203,7 @@ if get_option('introspection')
gcr_vapi = gnome.generate_vapi('gcr-@0@'.format(gcr_major_version),
sources: gcr_gir[0],
- packages: [ 'glib-2.0', 'gio-2.0', 'gck-@0@'.format(gck_major_version) ],
+ packages: [ 'glib-2.0', 'gio-2.0', gck_vapi ],
metadata_dirs: meson.current_source_dir(),
vapi_dirs: [
build_root / 'gck',
diff --git a/ui/meson.build b/ui/meson.build
index 5ca3753..477412d 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -174,8 +174,8 @@ if get_option('introspection')
packages: [
'glib-2.0',
'gio-2.0',
- 'gck-@0@'.format(gck_major_version),
- 'gcr-@0@'.format(gcr_major_version),
+ gck_vapi,
+ gcr_vapi,
'gtk+-3.0'
],
metadata_dirs: meson.current_source_dir(),

6
meta/recipes-gnome/gcr/gcr_3.36.0.bb → meta/recipes-gnome/gcr/gcr_3.38.0.bb
View File

@@ -17,11 +17,7 @@ inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even
# depends on gtk+3, but also x11 through gtk+-x11
REQUIRED_DISTRO_FEATURES = "x11"
SRC_URI += " file://0001-meson.build-correctly-set-internal-vapi-dependencies.patch"
SRC_URI += " file://0001-meson-Make-sure-gcr-oids.h-is-built.patch"
SRC_URI[archive.md5sum] = "adc65563b6b458507b9a578a8b68fb61"
SRC_URI[archive.sha256sum] = "aaf9bed017a2263c6145c89a1a84178f9f40f238426463e4ae486694ef5f6601"
SRC_URI[archive.sha256sum] = "a64cc7b65757fc2cd16de1708d132a16d05cd1f62c6eba436d56fe45d4ba27e1"
FILES_${PN} += " \
${datadir}/dbus-1 \