aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2018-11-22 16:41:21 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-22 16:15:00 +0000
commit44e5bbbbed500553d1ddf451eba02e826a91e4cc (patch)
tree4355e1563a3739b5fa4feb91c681aac4c20e8dc6 /meta/recipes-gnome
parent4b6c566c0540fe8e560d0feeb9c765c0eb6e5182 (diff)
downloadopenembedded-core-contrib-44e5bbbbed500553d1ddf451eba02e826a91e4cc.tar.gz
openembedded-core-contrib-44e5bbbbed500553d1ddf451eba02e826a91e4cc.tar.bz2
openembedded-core-contrib-44e5bbbbed500553d1ddf451eba02e826a91e4cc.zip
gobject-introspection: update to 1.58.1
Also, change default meson option to building introspection files (previously they were not built by default). Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch11
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch2
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.1.bb (renamed from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.0.bb)4
3 files changed, 9 insertions, 8 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch
index b0eee1ebe5..63b02fe0f3 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch
@@ -1,10 +1,11 @@
-From e8ce42c5cb54847517fe8fbe50bbaea452618218 Mon Sep 17 00:00:00 2001
+From fabf8c505181636182a357e0c6e764b752ccf468 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 15 Nov 2018 15:10:05 +0100
Subject: [PATCH] Port cross-compilation support to meson
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
---
gir/meson.build | 59 ++++++++++++++++++++++++++++++++++-------------
meson.build | 4 +++-
@@ -12,7 +13,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
3 files changed, 66 insertions(+), 17 deletions(-)
diff --git a/gir/meson.build b/gir/meson.build
-index 607bbc4..c0e221b 100644
+index 607bbc45..c0e221b3 100644
--- a/gir/meson.build
+++ b/gir/meson.build
@@ -37,15 +37,27 @@ typelibdir = join_paths(get_option('libdir'), 'girepository-1.0')
@@ -115,7 +116,7 @@ index 607bbc4..c0e221b 100644
install_dir: typelibdir,
)
diff --git a/meson.build b/meson.build
-index 7ec9532..9e20da5 100644
+index 7ec95328..9e20da57 100644
--- a/meson.build
+++ b/meson.build
@@ -76,7 +76,9 @@ libffi_dep = dependency('libffi',
@@ -130,7 +131,7 @@ index 7ec9532..9e20da5 100644
subdir('docs')
subdir('tests')
diff --git a/meson_options.txt b/meson_options.txt
-index 49726be..3e17c78 100644
+index 49726be6..d557a3b6 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -21,3 +21,23 @@ option('cairo-libname', type: 'string',
@@ -150,7 +151,7 @@ index 49726be..3e17c78 100644
+ description: 'Use a ldd wrapper instead of system ldd command in giscanner (useful when cross-compiling)'
+)
+
-+option('enable-introspection-data', type: 'boolean', value : false,
++option('enable-introspection-data', type: 'boolean', value : true,
+ description: 'Build introspection data (.gir and .typelib files) in addition to library and tools'
+)
+
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
index b9754a96c2..17b9eac057 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
@@ -1,4 +1,4 @@
-From 2e2bf063ab79ddff1c284834aef8e22710db9350 Mon Sep 17 00:00:00 2001
+From a20b4d70f44449875b7c54750ab0f02eefb0870d Mon Sep 17 00:00:00 2001
From: Sascha Silbe <x-yo17@se-silbe.de>
Date: Fri, 8 Jun 2018 13:55:10 +0200
Subject: [PATCH] Relocate the repository directory for native builds
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.1.bb
index c9a0d816f5..66f9918538 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.0.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.1.bb
@@ -22,8 +22,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-$
file://0001-Port-cross-compilation-support-to-meson.patch \
"
-SRC_URI[md5sum] = "94fec875276262037bfcd51226db12fe"
-SRC_URI[sha256sum] = "27c1590a32749de0a5481ce897772547043e94bccba4bc0a7edb3d8513e401ec"
+SRC_URI[md5sum] = "101b04fb0184f9a0c718d450c056d68c"
+SRC_URI[sha256sum] = "4954681fa5c5ed95451d914de89de1263a5b35158b1ded1a8b870042c0d0df89"
SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch"