diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-04-15 12:54:39 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-16 11:10:02 +0100 |
commit | 37a210e084092317375413c58bdb8d6e106512e0 (patch) | |
tree | 45a02b8747813abacf10acd7abafa0a1760cfd50 /meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch | |
parent | 87f32804db4dc6bbde95bec3064dd7cde342dbb1 (diff) | |
download | poky-37a210e084092317375413c58bdb8d6e106512e0.tar.gz |
gobject-introspection: update to 1.60.1
Drop upstreamed patches:
0010-meson-add-option-gir-dir-prefix.patch
0002-g-ir-tools-respect-gir_dir_prefix.patch
0001-configure.ac-make-GIR_DIR-configurable.patch
Rebase the rest.
Upstream has renamed the gir_dir_prefix option, adjust the recipe.
Add a patch to disable tests in cross builds, as previously meson
build system didn't actually build them.
(From OE-Core rev: 98f4c3a64f8a2b03f57df4387d2ce1e3b3af4035)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch')
-rw-r--r-- | meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch index 86cd4ead2a..d1fdc068c0 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ca0fb17e268c176ac89df081b1efa4a42989f014 Mon Sep 17 00:00:00 2001 | 1 | From 8a57aa0ac6c2f00b9b7a7fc177431f7643399e70 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 23 Mar 2016 17:07:28 +0200 | 3 | Date: Wed, 23 Mar 2016 17:07:28 +0200 |
4 | Subject: [PATCH] Revert an incomplete upstream attempt at cross-compile | 4 | Subject: [PATCH] Revert an incomplete upstream attempt at cross-compile |
@@ -13,7 +13,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
13 | 2 files changed, 10 deletions(-) | 13 | 2 files changed, 10 deletions(-) |
14 | 14 | ||
15 | diff --git a/common.mk b/common.mk | 15 | diff --git a/common.mk b/common.mk |
16 | index b778f7a..e26c637 100644 | 16 | index 64fb02f..77e819d 100644 |
17 | --- a/common.mk | 17 | --- a/common.mk |
18 | +++ b/common.mk | 18 | +++ b/common.mk |
19 | @@ -24,12 +24,8 @@ INTROSPECTION_SCANNER_ARGS = \ | 19 | @@ -24,12 +24,8 @@ INTROSPECTION_SCANNER_ARGS = \ |
@@ -30,10 +30,10 @@ index b778f7a..e26c637 100644 | |||
30 | 30 | ||
31 | INTROSPECTION_COMPILER_ARGS = \ | 31 | INTROSPECTION_COMPILER_ARGS = \ |
32 | diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py | 32 | diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py |
33 | index cd9d94d..b41772c 100644 | 33 | index 1730fee..26bab84 100644 |
34 | --- a/giscanner/gdumpparser.py | 34 | --- a/giscanner/gdumpparser.py |
35 | +++ b/giscanner/gdumpparser.py | 35 | +++ b/giscanner/gdumpparser.py |
36 | @@ -161,12 +161,6 @@ blob containing data gleaned from GObject's primitive introspection.""" | 36 | @@ -156,12 +156,6 @@ blob containing data gleaned from GObject's primitive introspection.""" |
37 | out_path = os.path.join(self._binary.tmpdir, 'dump.xml') | 37 | out_path = os.path.join(self._binary.tmpdir, 'dump.xml') |
38 | 38 | ||
39 | args = [] | 39 | args = [] |