summaryrefslogtreecommitdiffstats
path: root/meta
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-23 23:35:18 +0000
commitfd665d1b0e550809427867e362fe966f3087deb4 (patch)
treeaf70fbb4cf6e520ac892510080c42fb713fad312 /meta
parentcd52b7670f20c996bfcaaa7f920029b1108fad6f (diff)
downloadpoky-fd665d1b0e550809427867e362fe966f3087deb4.tar.gz
gobject-introspection: update to 1.58.1
Also, change default meson option to building introspection files (previously they were not built by default). (From OE-Core rev: 44e5bbbbed500553d1ddf451eba02e826a91e4cc) 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/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 @@
1From e8ce42c5cb54847517fe8fbe50bbaea452618218 Mon Sep 17 00:00:00 2001 1From fabf8c505181636182a357e0c6e764b752ccf468 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 15 Nov 2018 15:10:05 +0100 3Date: Thu, 15 Nov 2018 15:10:05 +0100
4Subject: [PATCH] Port cross-compilation support to meson 4Subject: [PATCH] Port cross-compilation support to meson
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8
8--- 9---
9 gir/meson.build | 59 ++++++++++++++++++++++++++++++++++------------- 10 gir/meson.build | 59 ++++++++++++++++++++++++++++++++++-------------
10 meson.build | 4 +++- 11 meson.build | 4 +++-
@@ -12,7 +13,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12 3 files changed, 66 insertions(+), 17 deletions(-) 13 3 files changed, 66 insertions(+), 17 deletions(-)
13 14
14diff --git a/gir/meson.build b/gir/meson.build 15diff --git a/gir/meson.build b/gir/meson.build
15index 607bbc4..c0e221b 100644 16index 607bbc45..c0e221b3 100644
16--- a/gir/meson.build 17--- a/gir/meson.build
17+++ b/gir/meson.build 18+++ b/gir/meson.build
18@@ -37,15 +37,27 @@ typelibdir = join_paths(get_option('libdir'), 'girepository-1.0') 19@@ -37,15 +37,27 @@ typelibdir = join_paths(get_option('libdir'), 'girepository-1.0')
@@ -115,7 +116,7 @@ index 607bbc4..c0e221b 100644
115 install_dir: typelibdir, 116 install_dir: typelibdir,
116 ) 117 )
117diff --git a/meson.build b/meson.build 118diff --git a/meson.build b/meson.build
118index 7ec9532..9e20da5 100644 119index 7ec95328..9e20da57 100644
119--- a/meson.build 120--- a/meson.build
120+++ b/meson.build 121+++ b/meson.build
121@@ -76,7 +76,9 @@ libffi_dep = dependency('libffi', 122@@ -76,7 +76,9 @@ libffi_dep = dependency('libffi',
@@ -130,7 +131,7 @@ index 7ec9532..9e20da5 100644
130 subdir('docs') 131 subdir('docs')
131 subdir('tests') 132 subdir('tests')
132diff --git a/meson_options.txt b/meson_options.txt 133diff --git a/meson_options.txt b/meson_options.txt
133index 49726be..3e17c78 100644 134index 49726be6..d557a3b6 100644
134--- a/meson_options.txt 135--- a/meson_options.txt
135+++ b/meson_options.txt 136+++ b/meson_options.txt
136@@ -21,3 +21,23 @@ option('cairo-libname', type: 'string', 137@@ -21,3 +21,23 @@ option('cairo-libname', type: 'string',
@@ -150,7 +151,7 @@ index 49726be..3e17c78 100644
150+ description: 'Use a ldd wrapper instead of system ldd command in giscanner (useful when cross-compiling)' 151+ description: 'Use a ldd wrapper instead of system ldd command in giscanner (useful when cross-compiling)'
151+) 152+)
152+ 153+
153+option('enable-introspection-data', type: 'boolean', value : false, 154+option('enable-introspection-data', type: 'boolean', value : true,
154+ description: 'Build introspection data (.gir and .typelib files) in addition to library and tools' 155+ description: 'Build introspection data (.gir and .typelib files) in addition to library and tools'
155+) 156+)
156+ 157+
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 @@
1From 2e2bf063ab79ddff1c284834aef8e22710db9350 Mon Sep 17 00:00:00 2001 1From a20b4d70f44449875b7c54750ab0f02eefb0870d Mon Sep 17 00:00:00 2001
2From: Sascha Silbe <x-yo17@se-silbe.de> 2From: Sascha Silbe <x-yo17@se-silbe.de>
3Date: Fri, 8 Jun 2018 13:55:10 +0200 3Date: Fri, 8 Jun 2018 13:55:10 +0200
4Subject: [PATCH] Relocate the repository directory for native builds 4Subject: [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}-$
22 file://0001-Port-cross-compilation-support-to-meson.patch \ 22 file://0001-Port-cross-compilation-support-to-meson.patch \
23 " 23 "
24 24
25SRC_URI[md5sum] = "94fec875276262037bfcd51226db12fe" 25SRC_URI[md5sum] = "101b04fb0184f9a0c718d450c056d68c"
26SRC_URI[sha256sum] = "27c1590a32749de0a5481ce897772547043e94bccba4bc0a7edb3d8513e401ec" 26SRC_URI[sha256sum] = "4954681fa5c5ed95451d914de89de1263a5b35158b1ded1a8b870042c0d0df89"
27 27
28SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" 28SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch"
29 29