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/0003-giscanner-add-use-binary-wrapper-option.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/0003-giscanner-add-use-binary-wrapper-option.patch')
-rw-r--r-- | meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch index 45fe27ad61..b954dcebd8 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 46dbe963aa6435591c87e788cdb54bc0daeac42e Mon Sep 17 00:00:00 2001 | 1 | From 5f985fd8a24764ccb38af6335d4584d7e33fc3a1 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: Mon, 19 Oct 2015 18:26:40 +0300 | 3 | Date: Mon, 19 Oct 2015 18:26:40 +0300 |
4 | Subject: [PATCH] giscanner: add --use-binary-wrapper option | 4 | Subject: [PATCH] giscanner: add --use-binary-wrapper option |
@@ -16,10 +16,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
16 | 1 file changed, 14 insertions(+) | 16 | 1 file changed, 14 insertions(+) |
17 | 17 | ||
18 | diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py | 18 | diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py |
19 | index ccb14e9..061def0 100644 | 19 | index c004fb1..0b6a2d2 100644 |
20 | --- a/giscanner/scannermain.py | 20 | --- a/giscanner/scannermain.py |
21 | +++ b/giscanner/scannermain.py | 21 | +++ b/giscanner/scannermain.py |
22 | @@ -126,6 +126,9 @@ def _get_option_parser(): | 22 | @@ -120,6 +120,9 @@ def _get_option_parser(): |
23 | parser.add_option("", "--program", | 23 | parser.add_option("", "--program", |
24 | action="store", dest="program", default=None, | 24 | action="store", dest="program", default=None, |
25 | help="program to execute") | 25 | help="program to execute") |
@@ -29,7 +29,7 @@ index ccb14e9..061def0 100644 | |||
29 | parser.add_option("", "--program-arg", | 29 | parser.add_option("", "--program-arg", |
30 | action="append", dest="program_args", default=[], | 30 | action="append", dest="program_args", default=[], |
31 | help="extra arguments to program") | 31 | help="extra arguments to program") |
32 | @@ -418,6 +421,17 @@ def create_binary(transformer, options, args): | 32 | @@ -417,6 +420,17 @@ def create_binary(transformer, options, args): |
33 | gdump_parser.get_error_quark_functions()) | 33 | gdump_parser.get_error_quark_functions()) |
34 | 34 | ||
35 | shlibs = resolve_shlibs(options, binary, options.libraries) | 35 | shlibs = resolve_shlibs(options, binary, options.libraries) |