diff options
Diffstat (limited to 'meta')
14 files changed, 91 insertions, 273 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 80c9e71ad5..5747d61c19 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,4 +1,4 @@ | |||
1 | From ea25a5a755bc839d5b504aac207f860ae68109bc Mon Sep 17 00:00:00 2001 | 1 | From 2b3bce1526b538dc2c7fa223eaf9808858aa1b06 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: Thu, 15 Nov 2018 15:10:05 +0100 | 3 | Date: Thu, 15 Nov 2018 15:10:05 +0100 |
4 | Subject: [PATCH] Port cross-compilation support to meson | 4 | Subject: [PATCH] Port cross-compilation support to meson |
@@ -7,16 +7,16 @@ Upstream-Status: Pending | |||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
8 | 8 | ||
9 | --- | 9 | --- |
10 | gir/meson.build | 59 ++++++++++++++++++++++++++++++++++------------- | 10 | gir/meson.build | 62 ++++++++++++++++++++++++++++++++++------------- |
11 | meson.build | 4 +++- | 11 | meson.build | 4 ++- |
12 | meson_options.txt | 20 ++++++++++++++++ | 12 | meson_options.txt | 20 +++++++++++++++ |
13 | 3 files changed, 66 insertions(+), 17 deletions(-) | 13 | 3 files changed, 68 insertions(+), 18 deletions(-) |
14 | 14 | ||
15 | diff --git a/gir/meson.build b/gir/meson.build | 15 | diff --git a/gir/meson.build b/gir/meson.build |
16 | index 1cb514a..f873068 100644 | 16 | index 85ae575..327c134 100644 |
17 | --- a/gir/meson.build | 17 | --- a/gir/meson.build |
18 | +++ b/gir/meson.build | 18 | +++ b/gir/meson.build |
19 | @@ -36,15 +36,27 @@ gir_files = [ | 19 | @@ -36,16 +36,29 @@ gir_files = [ |
20 | typelibdir = join_paths(get_option('libdir'), 'girepository-1.0') | 20 | typelibdir = join_paths(get_option('libdir'), 'girepository-1.0') |
21 | install_data(gir_files, install_dir: girdir) | 21 | install_data(gir_files, install_dir: girdir) |
22 | 22 | ||
@@ -25,6 +25,7 @@ index 1cb514a..f873068 100644 | |||
25 | - girscanner, | 25 | - girscanner, |
26 | - '--output=@OUTPUT@', | 26 | - '--output=@OUTPUT@', |
27 | - '--no-libtool', | 27 | - '--no-libtool', |
28 | - '--quiet', | ||
28 | - '--reparse-validate', | 29 | - '--reparse-validate', |
29 | - '--add-include-path', join_paths(meson.current_build_dir()), | 30 | - '--add-include-path', join_paths(meson.current_build_dir()), |
30 | - '--add-include-path', join_paths(meson.current_source_dir()), | 31 | - '--add-include-path', join_paths(meson.current_source_dir()), |
@@ -34,6 +35,7 @@ index 1cb514a..f873068 100644 | |||
34 | + 'g-ir-scanner', | 35 | + 'g-ir-scanner', |
35 | + '--output=@OUTPUT@', | 36 | + '--output=@OUTPUT@', |
36 | + '--no-libtool', | 37 | + '--no-libtool', |
38 | + '--quiet', | ||
37 | + '--reparse-validate', | 39 | + '--reparse-validate', |
38 | + '--add-include-path', join_paths(meson.current_build_dir()), | 40 | + '--add-include-path', join_paths(meson.current_build_dir()), |
39 | + '--add-include-path', join_paths(meson.current_source_dir()), | 41 | + '--add-include-path', join_paths(meson.current_source_dir()), |
@@ -44,6 +46,7 @@ index 1cb514a..f873068 100644 | |||
44 | + girscanner, | 46 | + girscanner, |
45 | + '--output=@OUTPUT@', | 47 | + '--output=@OUTPUT@', |
46 | + '--no-libtool', | 48 | + '--no-libtool', |
49 | + '--quiet', | ||
47 | + '--reparse-validate', | 50 | + '--reparse-validate', |
48 | + '--add-include-path', join_paths(meson.current_build_dir()), | 51 | + '--add-include-path', join_paths(meson.current_build_dir()), |
49 | + '--add-include-path', join_paths(meson.current_source_dir()), | 52 | + '--add-include-path', join_paths(meson.current_source_dir()), |
@@ -53,7 +56,7 @@ index 1cb514a..f873068 100644 | |||
53 | 56 | ||
54 | dep_type = glib_dep.type_name() | 57 | dep_type = glib_dep.type_name() |
55 | if dep_type == 'internal' | 58 | if dep_type == 'internal' |
56 | @@ -57,6 +69,12 @@ if dep_type == 'internal' | 59 | @@ -58,6 +71,12 @@ if dep_type == 'internal' |
57 | '--extra-library=glib-2.0', '--extra-library=gobject-2.0'] | 60 | '--extra-library=glib-2.0', '--extra-library=gobject-2.0'] |
58 | endif | 61 | endif |
59 | 62 | ||
@@ -66,7 +69,7 @@ index 1cb514a..f873068 100644 | |||
66 | # Take a glob and print to newlines | 69 | # Take a glob and print to newlines |
67 | globber = ''' | 70 | globber = ''' |
68 | from glob import glob | 71 | from glob import glob |
69 | @@ -83,8 +101,8 @@ glib_command = scanner_command + [ | 72 | @@ -84,8 +103,8 @@ glib_command = scanner_command + [ |
70 | 73 | ||
71 | if dep_type == 'pkgconfig' | 74 | if dep_type == 'pkgconfig' |
72 | glib_command += ['--external-library', '--pkg=glib-2.0'] | 75 | glib_command += ['--external-library', '--pkg=glib-2.0'] |
@@ -77,7 +80,7 @@ index 1cb514a..f873068 100644 | |||
77 | glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include') | 80 | glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include') |
78 | glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h') | 81 | glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h') |
79 | glib_files += join_paths(glib_libincdir, 'glibconfig.h') | 82 | glib_files += join_paths(glib_libincdir, 'glibconfig.h') |
80 | @@ -338,7 +356,7 @@ endforeach | 83 | @@ -339,7 +358,7 @@ endforeach |
81 | if giounix_dep.found() | 84 | if giounix_dep.found() |
82 | if dep_type == 'pkgconfig' | 85 | if dep_type == 'pkgconfig' |
83 | gio_command += ['--pkg=gio-unix-2.0'] | 86 | gio_command += ['--pkg=gio-unix-2.0'] |
@@ -86,10 +89,10 @@ index 1cb514a..f873068 100644 | |||
86 | # Get the installed gio-unix header list | 89 | # Get the installed gio-unix header list |
87 | ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h'))) | 90 | ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h'))) |
88 | if ret.returncode() != 0 | 91 | if ret.returncode() != 0 |
89 | @@ -416,15 +434,24 @@ gir_files += custom_target('gir-girepository', | 92 | @@ -422,15 +441,24 @@ gir_files += custom_target('gir-girepository', |
90 | ] | ||
91 | ) | 93 | ) |
92 | 94 | ||
95 | typelibs = [] | ||
93 | +if get_option('enable-gi-cross-wrapper') != '' | 96 | +if get_option('enable-gi-cross-wrapper') != '' |
94 | + gircompiler_command = [get_option('enable-gi-cross-wrapper'), gircompiler.full_path(), '-o', '@OUTPUT@', '@INPUT@', | 97 | + gircompiler_command = [get_option('enable-gi-cross-wrapper'), gircompiler.full_path(), '-o', '@OUTPUT@', '@INPUT@', |
95 | + '--includedir', meson.current_build_dir(), | 98 | + '--includedir', meson.current_build_dir(), |
@@ -103,7 +106,7 @@ index 1cb514a..f873068 100644 | |||
103 | +endif | 106 | +endif |
104 | + | 107 | + |
105 | foreach gir : gir_files | 108 | foreach gir : gir_files |
106 | custom_target('generate-typelib-@0@'.format(gir).underscorify(), | 109 | typelibs += custom_target('generate-typelib-@0@'.format(gir).underscorify(), |
107 | input: gir, | 110 | input: gir, |
108 | output: '@BASENAME@.typelib', | 111 | output: '@BASENAME@.typelib', |
109 | depends: [gobject_gir, ], | 112 | depends: [gobject_gir, ], |
@@ -116,10 +119,10 @@ index 1cb514a..f873068 100644 | |||
116 | install_dir: typelibdir, | 119 | install_dir: typelibdir, |
117 | ) | 120 | ) |
118 | diff --git a/meson.build b/meson.build | 121 | diff --git a/meson.build b/meson.build |
119 | index 17acd82..e0bb495 100644 | 122 | index 95bbd2b..f7baefd 100644 |
120 | --- a/meson.build | 123 | --- a/meson.build |
121 | +++ b/meson.build | 124 | +++ b/meson.build |
122 | @@ -81,7 +81,9 @@ libffi_dep = dependency('libffi', | 125 | @@ -163,7 +163,9 @@ endif |
123 | subdir('girepository') | 126 | subdir('girepository') |
124 | subdir('tools') | 127 | subdir('tools') |
125 | subdir('giscanner') | 128 | subdir('giscanner') |
@@ -131,11 +134,11 @@ index 17acd82..e0bb495 100644 | |||
131 | subdir('docs') | 134 | subdir('docs') |
132 | subdir('tests') | 135 | subdir('tests') |
133 | diff --git a/meson_options.txt b/meson_options.txt | 136 | diff --git a/meson_options.txt b/meson_options.txt |
134 | index ee6958d..b168142 100644 | 137 | index 445a68a..a325511 100644 |
135 | --- a/meson_options.txt | 138 | --- a/meson_options.txt |
136 | +++ b/meson_options.txt | 139 | +++ b/meson_options.txt |
137 | @@ -25,3 +25,23 @@ option('python', type: 'string', value: 'python3', | 140 | @@ -25,3 +25,23 @@ option('python', type: 'string', value: 'python3', |
138 | option('gir-dir-prefix', type: 'string', | 141 | option('gir_dir_prefix', type: 'string', |
139 | description: 'Intermediate prefix for gir installation under ${prefix}' | 142 | description: 'Intermediate prefix for gir installation under ${prefix}' |
140 | ) | 143 | ) |
141 | + | 144 | + |
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 a91d22afa7..a4f45a142d 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 @@ | |||
1 | From 7ea8c83d84a05f686128e652a5447fb5f6fb68be Mon Sep 17 00:00:00 2001 | 1 | From 8f01066e935a7323ff6e53f27ed1b5fb74fa11eb Mon Sep 17 00:00:00 2001 |
2 | From: Sascha Silbe <x-yo17@se-silbe.de> | 2 | From: Sascha Silbe <x-yo17@se-silbe.de> |
3 | Date: Fri, 8 Jun 2018 13:55:10 +0200 | 3 | Date: Fri, 8 Jun 2018 13:55:10 +0200 |
4 | Subject: [PATCH] Relocate the repository directory for native builds | 4 | Subject: [PATCH] Relocate the repository directory for native builds |
@@ -21,7 +21,7 @@ Signed-off-by: Sascha Silbe <x-yo17@se-silbe.de> | |||
21 | 2 files changed, 14 insertions(+), 3 deletions(-) | 21 | 2 files changed, 14 insertions(+), 3 deletions(-) |
22 | 22 | ||
23 | diff --git a/girepository/girepository.c b/girepository/girepository.c | 23 | diff --git a/girepository/girepository.c b/girepository/girepository.c |
24 | index c1fa3d3..efa557e 100644 | 24 | index ca5dc2b..7a4d17f 100644 |
25 | --- a/girepository/girepository.c | 25 | --- a/girepository/girepository.c |
26 | +++ b/girepository/girepository.c | 26 | +++ b/girepository/girepository.c |
27 | @@ -21,6 +21,8 @@ | 27 | @@ -21,6 +21,8 @@ |
@@ -42,7 +42,7 @@ index c1fa3d3..efa557e 100644 | |||
42 | /** | 42 | /** |
43 | * SECTION:girepository | 43 | * SECTION:girepository |
44 | * @short_description: GObject Introspection repository manager | 44 | * @short_description: GObject Introspection repository manager |
45 | @@ -188,9 +192,16 @@ init_globals (void) | 45 | @@ -212,9 +216,16 @@ init_globals (void) |
46 | g_free (custom_dirs); | 46 | g_free (custom_dirs); |
47 | } | 47 | } |
48 | 48 | ||
@@ -62,12 +62,12 @@ index c1fa3d3..efa557e 100644 | |||
62 | typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir); | 62 | typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir); |
63 | 63 | ||
64 | diff --git a/girepository/meson.build b/girepository/meson.build | 64 | diff --git a/girepository/meson.build b/girepository/meson.build |
65 | index 6a8c5b5..8892f2a 100644 | 65 | index 0261e1a..4cb646f 100644 |
66 | --- a/girepository/meson.build | 66 | --- a/girepository/meson.build |
67 | +++ b/girepository/meson.build | 67 | +++ b/girepository/meson.build |
68 | @@ -27,7 +27,7 @@ girepo_internals_lib = static_library('girepository-internals', | 68 | @@ -36,7 +36,7 @@ girepo_internals_lib = static_library('girepository-internals', |
69 | ], | 69 | ], |
70 | c_args: gi_hidden_visibility_cflags, | 70 | c_args: gi_hidden_visibility_cflags + custom_c_args, |
71 | include_directories : configinc, | 71 | include_directories : configinc, |
72 | - dependencies: [girepo_gthash_dep, libffi_dep], | 72 | - dependencies: [girepo_gthash_dep, libffi_dep], |
73 | + dependencies: [girepo_gthash_dep, libffi_dep, cc.find_library('dl')], | 73 | + dependencies: [girepo_gthash_dep, libffi_dep, cc.find_library('dl')], |
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 = [] |
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-configure.ac-make-GIR_DIR-configurable.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-configure.ac-make-GIR_DIR-configurable.patch deleted file mode 100644 index e0402f8f49..0000000000 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-configure.ac-make-GIR_DIR-configurable.patch +++ /dev/null | |||
@@ -1,68 +0,0 @@ | |||
1 | configure.ac: make GIR_DIR configurable | ||
2 | |||
3 | Some .gir files such as GLib-2.0.gir are arch related which contain such | ||
4 | as lengths of pointers that they are different for 64 and 32 bit target. | ||
5 | It causes install file conflicts for multilib when intall | ||
6 | gobject-introspection and lib32-gobject-introspection both. | ||
7 | |||
8 | Add configure option 'with-gir-dir-prefix' for autotools to make .gir | ||
9 | could be installed to a configured path such as ${libdir}. And update | ||
10 | girdir in .pc files as well. | ||
11 | |||
12 | Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/gobject-introspection/commit/3301c7e] | ||
13 | |||
14 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
15 | --- | ||
16 | configure.ac | 7 +++++-- | ||
17 | gobject-introspection-1.0.pc.in | 2 +- | ||
18 | gobject-introspection-no-export-1.0.pc.in | 2 +- | ||
19 | 3 files changed, 7 insertions(+), 4 deletions(-) | ||
20 | |||
21 | diff --git a/configure.ac b/configure.ac | ||
22 | index b4294c57..60506947 100644 | ||
23 | --- a/configure.ac | ||
24 | +++ b/configure.ac | ||
25 | @@ -114,9 +114,12 @@ GIR_SUFFIX="gir-1.0" | ||
26 | AC_SUBST(GIR_SUFFIX) | ||
27 | AC_DEFINE_UNQUOTED(GIR_SUFFIX, "$GIR_SUFFIX", [Name of the gir directory]) | ||
28 | |||
29 | -GIR_DIR="$EXPANDED_DATADIR/$GIR_SUFFIX" | ||
30 | +AC_ARG_WITH([gir-dir-prefix], | ||
31 | + [AS_HELP_STRING([--with-gir-dir-prefix], [Directory prefix for gir installation])], | ||
32 | + [GIR_DIR_PREFIX="$withval"], [GIR_DIR_PREFIX="$EXPANDED_DATADIR"]) | ||
33 | +GIR_DIR="$GIR_DIR_PREFIX/$GIR_SUFFIX" | ||
34 | AC_SUBST(GIR_DIR) | ||
35 | -AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Director prefix for gir installation]) | ||
36 | +AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Directory prefix for gir installation]) | ||
37 | |||
38 | PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.58.0]) | ||
39 | |||
40 | diff --git a/gobject-introspection-1.0.pc.in b/gobject-introspection-1.0.pc.in | ||
41 | index a08b5d27..3409856c 100644 | ||
42 | --- a/gobject-introspection-1.0.pc.in | ||
43 | +++ b/gobject-introspection-1.0.pc.in | ||
44 | @@ -10,7 +10,7 @@ g_ir_scanner=${bindir}/g-ir-scanner | ||
45 | g_ir_compiler=${bindir}/g-ir-compiler@EXEEXT@ | ||
46 | g_ir_generate=${bindir}/g-ir-generate@EXEEXT@ | ||
47 | gidatadir=${datadir}/gobject-introspection-1.0 | ||
48 | -girdir=${datadir}/gir-1.0 | ||
49 | +girdir=@GIR_DIR@ | ||
50 | typelibdir=${libdir}/girepository-1.0 | ||
51 | |||
52 | Cflags: -I${includedir}/gobject-introspection-1.0 @FFI_PC_CFLAGS@ | ||
53 | diff --git a/gobject-introspection-no-export-1.0.pc.in b/gobject-introspection-no-export-1.0.pc.in | ||
54 | index d214d22d..745aaade 100644 | ||
55 | --- a/gobject-introspection-no-export-1.0.pc.in | ||
56 | +++ b/gobject-introspection-no-export-1.0.pc.in | ||
57 | @@ -9,7 +9,7 @@ includedir=@includedir@ | ||
58 | g_ir_scanner=${bindir}/g-ir-scanner | ||
59 | g_ir_compiler=${bindir}/g-ir-compiler@EXEEXT@ | ||
60 | g_ir_generate=${bindir}/g-ir-generate@EXEEXT@ | ||
61 | -girdir=${datadir}/gir-1.0 | ||
62 | +girdir=@GIR_DIR@ | ||
63 | typelibdir=${libdir}/girepository-1.0 | ||
64 | |||
65 | Cflags: -I${includedir}/gobject-introspection-1.0 @FFI_PC_CFLAGS@ | ||
66 | -- | ||
67 | 2.17.0 | ||
68 | |||
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch index e9338e92e2..ddd955354d 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3fea5e83803f4cfef21b2e06e37a6ba56f2bb914 Mon Sep 17 00:00:00 2001 | 1 | From 6653c28f0b76aad86e26c512b03efcec6d9d9e95 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, 3 Jan 2018 17:02:01 +0200 | 3 | Date: Wed, 3 Jan 2018 17:02:01 +0200 |
4 | Subject: [PATCH] giscanner: add a --lib-dirs-envvar option | 4 | Subject: [PATCH] giscanner: add a --lib-dirs-envvar option |
@@ -19,10 +19,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
19 | 3 files changed, 7 insertions(+), 3 deletions(-) | 19 | 3 files changed, 7 insertions(+), 3 deletions(-) |
20 | 20 | ||
21 | diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py | 21 | diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py |
22 | index c003828..8a8ba2b 100644 | 22 | index 32c9296..3fb262b 100644 |
23 | --- a/giscanner/ccompiler.py | 23 | --- a/giscanner/ccompiler.py |
24 | +++ b/giscanner/ccompiler.py | 24 | +++ b/giscanner/ccompiler.py |
25 | @@ -109,7 +109,7 @@ class CCompiler(object): | 25 | @@ -174,7 +174,7 @@ class CCompiler(object): |
26 | 26 | ||
27 | self._cflags_no_deprecation_warnings = "-Wno-deprecated-declarations" | 27 | self._cflags_no_deprecation_warnings = "-Wno-deprecated-declarations" |
28 | 28 | ||
@@ -31,7 +31,7 @@ index c003828..8a8ba2b 100644 | |||
31 | # An "internal" link is where the library to be introspected | 31 | # An "internal" link is where the library to be introspected |
32 | # is being built in the current directory. | 32 | # is being built in the current directory. |
33 | 33 | ||
34 | @@ -119,7 +119,7 @@ class CCompiler(object): | 34 | @@ -184,7 +184,7 @@ class CCompiler(object): |
35 | if os.name == 'nt': | 35 | if os.name == 'nt': |
36 | runtime_path_envvar = ['LIB', 'PATH'] | 36 | runtime_path_envvar = ['LIB', 'PATH'] |
37 | else: | 37 | else: |
@@ -41,10 +41,10 @@ index c003828..8a8ba2b 100644 | |||
41 | # (This flag is not supported nor needed for Visual C++) | 41 | # (This flag is not supported nor needed for Visual C++) |
42 | args.append('-L.') | 42 | args.append('-L.') |
43 | diff --git a/giscanner/dumper.py b/giscanner/dumper.py | 43 | diff --git a/giscanner/dumper.py b/giscanner/dumper.py |
44 | index 2c668f5..2e515a0 100644 | 44 | index 2b851a5..10a7c39 100644 |
45 | --- a/giscanner/dumper.py | 45 | --- a/giscanner/dumper.py |
46 | +++ b/giscanner/dumper.py | 46 | +++ b/giscanner/dumper.py |
47 | @@ -249,7 +249,8 @@ class DumpCompiler(object): | 47 | @@ -244,7 +244,8 @@ class DumpCompiler(object): |
48 | libtool, | 48 | libtool, |
49 | self._options.libraries, | 49 | self._options.libraries, |
50 | self._options.extra_libraries, | 50 | self._options.extra_libraries, |
@@ -55,10 +55,10 @@ index 2c668f5..2e515a0 100644 | |||
55 | 55 | ||
56 | else: | 56 | else: |
57 | diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py | 57 | diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py |
58 | index 5cb793e..87227e2 100644 | 58 | index 9013562..9c9fe12 100644 |
59 | --- a/giscanner/scannermain.py | 59 | --- a/giscanner/scannermain.py |
60 | +++ b/giscanner/scannermain.py | 60 | +++ b/giscanner/scannermain.py |
61 | @@ -132,6 +132,9 @@ def _get_option_parser(): | 61 | @@ -126,6 +126,9 @@ def _get_option_parser(): |
62 | parser.add_option("", "--use-ldd-wrapper", | 62 | parser.add_option("", "--use-ldd-wrapper", |
63 | action="store", dest="ldd_wrapper", default=None, | 63 | action="store", dest="ldd_wrapper", default=None, |
64 | help="wrapper to use instead of ldd (useful when cross-compiling)") | 64 | help="wrapper to use instead of ldd (useful when cross-compiling)") |
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch index 9167f042e5..b484b5e9e6 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f128cbeead687bfc6532cc1f2cc3e2dc5a2b5b30 Mon Sep 17 00:00:00 2001 | 1 | From f742da8b3913f4818d3f419117076afe62f4dbf4 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, 5 Sep 2018 16:46:52 +0200 | 3 | Date: Wed, 5 Sep 2018 16:46:52 +0200 |
4 | Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper | 4 | Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper |
@@ -8,15 +8,16 @@ It is not an error per se, but it breaks subprocess.check_output(). | |||
8 | 8 | ||
9 | Upstream-Status: Inappropriate [oe-core specific] | 9 | Upstream-Status: Inappropriate [oe-core specific] |
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
11 | |||
11 | --- | 12 | --- |
12 | giscanner/shlibs.py | 2 +- | 13 | giscanner/shlibs.py | 2 +- |
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 15 | ||
15 | diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py | 16 | diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py |
16 | index 01d21a3..3bd3250 100644 | 17 | index d67df95..80352a6 100644 |
17 | --- a/giscanner/shlibs.py | 18 | --- a/giscanner/shlibs.py |
18 | +++ b/giscanner/shlibs.py | 19 | +++ b/giscanner/shlibs.py |
19 | @@ -108,7 +108,7 @@ def _resolve_non_libtool(options, binary, libraries): | 20 | @@ -102,7 +102,7 @@ def _resolve_non_libtool(options, binary, libraries): |
20 | args.extend(['otool', '-L', binary.args[0]]) | 21 | args.extend(['otool', '-L', binary.args[0]]) |
21 | else: | 22 | else: |
22 | args.extend(['ldd', binary.args[0]]) | 23 | args.extend(['ldd', binary.args[0]]) |
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-disable-tests-when-cross-compiling.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-disable-tests-when-cross-compiling.patch new file mode 100644 index 0000000000..c4951b22bb --- /dev/null +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-disable-tests-when-cross-compiling.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From 2c384187cc22113c0c9b1cd233948118f7c085ef Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 25 Mar 2019 13:28:48 +0100 | ||
4 | Subject: [PATCH] meson.build: disable tests when cross-compiling | ||
5 | |||
6 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/64] | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | meson.build | 4 +++- | ||
10 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/meson.build b/meson.build | ||
13 | index 2544ff3..4c16fe5 100644 | ||
14 | --- a/meson.build | ||
15 | +++ b/meson.build | ||
16 | @@ -168,7 +168,9 @@ if get_option('enable-introspection-data') == true | ||
17 | endif | ||
18 | subdir('examples') | ||
19 | subdir('docs') | ||
20 | -subdir('tests') | ||
21 | +if not meson.is_cross_build() | ||
22 | + subdir('tests') | ||
23 | +endif | ||
24 | |||
25 | install_data('Makefile.introspection', install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0')) | ||
26 | install_data('m4/introspection.m4', install_dir: join_paths(get_option('datadir'), 'aclocal')) | ||
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch index 03ef2b0059..e4fffcf613 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a28cc8413b68bec5b4cf2ee5f37b40a8965490a5 Mon Sep 17 00:00:00 2001 | 1 | From 2335d22e4c64db3d5dfc16ac65468b9dd66db8ac 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:29:21 +0300 | 3 | Date: Mon, 19 Oct 2015 18:29:21 +0300 |
4 | Subject: [PATCH] configure.ac: add host-gi, gi-cross-wrapper, gi-ldd-wrapper | 4 | Subject: [PATCH] configure.ac: add host-gi, gi-cross-wrapper, gi-ldd-wrapper |
@@ -34,7 +34,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
34 | 4 files changed, 87 insertions(+), 1 deletion(-) | 34 | 4 files changed, 87 insertions(+), 1 deletion(-) |
35 | 35 | ||
36 | diff --git a/Makefile.am b/Makefile.am | 36 | diff --git a/Makefile.am b/Makefile.am |
37 | index 44ed115..2a1fa56 100644 | 37 | index 952bf71..797a3bd 100644 |
38 | --- a/Makefile.am | 38 | --- a/Makefile.am |
39 | +++ b/Makefile.am | 39 | +++ b/Makefile.am |
40 | @@ -21,7 +21,9 @@ include Makefile-cmph.am | 40 | @@ -21,7 +21,9 @@ include Makefile-cmph.am |
@@ -48,7 +48,7 @@ index 44ed115..2a1fa56 100644 | |||
48 | 48 | ||
49 | ## Process this file with automake to produce Makefile.in | 49 | ## Process this file with automake to produce Makefile.in |
50 | diff --git a/common.mk b/common.mk | 50 | diff --git a/common.mk b/common.mk |
51 | index e26c637..9f3a65f 100644 | 51 | index 77e819d..379ab53 100644 |
52 | --- a/common.mk | 52 | --- a/common.mk |
53 | +++ b/common.mk | 53 | +++ b/common.mk |
54 | @@ -6,6 +6,15 @@ | 54 | @@ -6,6 +6,15 @@ |
@@ -132,10 +132,10 @@ index e26c637..9f3a65f 100644 | |||
132 | INTROSPECTION_DOCTOOL_ARGS = \ | 132 | INTROSPECTION_DOCTOOL_ARGS = \ |
133 | --add-include-path=$(srcdir) \ | 133 | --add-include-path=$(srcdir) \ |
134 | diff --git a/configure.ac b/configure.ac | 134 | diff --git a/configure.ac b/configure.ac |
135 | index d48e6c3..ed5f8a2 100644 | 135 | index 885da70..cd8108b 100644 |
136 | --- a/configure.ac | 136 | --- a/configure.ac |
137 | +++ b/configure.ac | 137 | +++ b/configure.ac |
138 | @@ -367,6 +367,48 @@ dnl | 138 | @@ -383,6 +383,48 @@ dnl |
139 | AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x]) | 139 | AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x]) |
140 | AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x]) | 140 | AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x]) |
141 | 141 | ||
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-g-ir-tools-respect-gir_dir_prefix.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-g-ir-tools-respect-gir_dir_prefix.patch deleted file mode 100644 index 5e4176725c..0000000000 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-g-ir-tools-respect-gir_dir_prefix.patch +++ /dev/null | |||
@@ -1,76 +0,0 @@ | |||
1 | g-ir-tools: respect gir_dir_prefix | ||
2 | |||
3 | Configure option gir_dir_prefix is used to configure install dir for | ||
4 | .gir files, so add its value to include file search paths. | ||
5 | |||
6 | Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/gobject-introspection/commit/3fe995a] | ||
7 | |||
8 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
9 | --- | ||
10 | Makefile-tools.am | 2 +- | ||
11 | giscanner/transformer.py | 1 + | ||
12 | tests/warn/warningtester.py | 1 + | ||
13 | tools/g-ir-tool-template.in | 10 ++++++++++ | ||
14 | 6 files changed, 15 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/Makefile-tools.am b/Makefile-tools.am | ||
17 | index c70d9850..fcaf1e01 100644 | ||
18 | --- a/Makefile-tools.am | ||
19 | +++ b/Makefile-tools.am | ||
20 | @@ -9,7 +9,7 @@ EXTRA_DIST += \ | ||
21 | tools/g-ir-tool-template.in \ | ||
22 | tools/meson.build | ||
23 | |||
24 | -TOOL_SUBSTITUTIONS = -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON_CMD\@,\/usr\/bin\/env\ $(PYTHON), | ||
25 | +TOOL_SUBSTITUTIONS = -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON_CMD\@,\/usr\/bin\/env\ $(PYTHON), -e s,@GIR_DIR\@,$(GIR_DIR),g | ||
26 | |||
27 | g-ir-scanner: tools/g-ir-tool-template.in _giscanner.la Makefile | ||
28 | $(AM_V_GEN) sed $(TOOL_SUBSTITUTIONS) -e s,@TOOL_MODULE\@,scannermain, -e s,@TOOL_FUNCTION\@,scanner_main, $< > $@.tmp && mv $@.tmp $@ | ||
29 | diff --git a/giscanner/transformer.py b/giscanner/transformer.py | ||
30 | index 335e229f..2c412339 100644 | ||
31 | --- a/giscanner/transformer.py | ||
32 | +++ b/giscanner/transformer.py | ||
33 | @@ -184,6 +184,7 @@ None.""" | ||
34 | def _get_gi_data_dirs(self): | ||
35 | data_dirs = utils.get_system_data_dirs() | ||
36 | data_dirs.append(DATADIR) | ||
37 | + data_dirs.append(GIRDIR) | ||
38 | if os.name != 'nt': | ||
39 | # For backwards compatibility, was always unconditionally added to the list. | ||
40 | data_dirs.append('/usr/share') | ||
41 | diff --git a/tests/warn/warningtester.py b/tests/warn/warningtester.py | ||
42 | index f17c8889..be5aec13 100644 | ||
43 | --- a/tests/warn/warningtester.py | ||
44 | +++ b/tests/warn/warningtester.py | ||
45 | @@ -18,6 +18,7 @@ sys.path.insert(0, path) | ||
46 | |||
47 | # Not correct, but enough to get the tests going uninstalled | ||
48 | builtins.__dict__['DATADIR'] = path | ||
49 | +builtins.__dict__['GIRDIR'] = '' | ||
50 | |||
51 | from giscanner.annotationparser import GtkDocCommentBlockParser | ||
52 | from giscanner.ast import Include, Namespace | ||
53 | diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in | ||
54 | index ed33d16b..b9cf0911 100755 | ||
55 | --- a/tools/g-ir-tool-template.in | ||
56 | +++ b/tools/g-ir-tool-template.in | ||
57 | @@ -60,6 +60,16 @@ if not os.path.isdir(os.path.join(datadir, 'gir-1.0')): | ||
58 | |||
59 | builtins.__dict__['DATADIR'] = datadir | ||
60 | |||
61 | +# Respect gir_dir_prefix for meson and autotools | ||
62 | +girdir = '' | ||
63 | +# for meson | ||
64 | +if '@gir_dir_prefix@' and not '@gir_dir_prefix@'.startswith('@'): | ||
65 | + girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@')) | ||
66 | +# for autotools | ||
67 | +elif '@GIR_DIR@' and not '@GIR_DIR@'.startswith('@'): | ||
68 | + girdir = os.path.dirname(os.path.abspath('@GIR_DIR@')) | ||
69 | +builtins.__dict__['GIRDIR'] = girdir | ||
70 | + | ||
71 | # Again, relative paths first so that the installation prefix is relocatable | ||
72 | pylibdir = os.path.abspath(os.path.join(filedir, '..', 'lib', 'gobject-introspection')) | ||
73 | |||
74 | -- | ||
75 | 2.17.0 | ||
76 | |||
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) |
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch index 2e36b64bab..79264ed086 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From eba2b999e81d81b5f43bb1f0ab33881786bebdec Mon Sep 17 00:00:00 2001 | 1 | From cba7807888a4a1f1d630d16c51c89859209334b3 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: Fri, 30 Oct 2015 16:28:46 +0200 | 3 | Date: Fri, 30 Oct 2015 16:28:46 +0200 |
4 | Subject: [PATCH] giscanner: add a --use-ldd-wrapper option | 4 | Subject: [PATCH] giscanner: add a --use-ldd-wrapper option |
@@ -15,10 +15,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
15 | 2 files changed, 6 insertions(+), 1 deletion(-) | 15 | 2 files changed, 6 insertions(+), 1 deletion(-) |
16 | 16 | ||
17 | diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py | 17 | diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py |
18 | index 061def0..5cb793e 100644 | 18 | index 0b6a2d2..9013562 100644 |
19 | --- a/giscanner/scannermain.py | 19 | --- a/giscanner/scannermain.py |
20 | +++ b/giscanner/scannermain.py | 20 | +++ b/giscanner/scannermain.py |
21 | @@ -129,6 +129,9 @@ def _get_option_parser(): | 21 | @@ -123,6 +123,9 @@ def _get_option_parser(): |
22 | parser.add_option("", "--use-binary-wrapper", | 22 | parser.add_option("", "--use-binary-wrapper", |
23 | action="store", dest="wrapper", default=None, | 23 | action="store", dest="wrapper", default=None, |
24 | help="wrapper to use for running programs (useful when cross-compiling)") | 24 | help="wrapper to use for running programs (useful when cross-compiling)") |
@@ -29,10 +29,10 @@ index 061def0..5cb793e 100644 | |||
29 | action="append", dest="program_args", default=[], | 29 | action="append", dest="program_args", default=[], |
30 | help="extra arguments to program") | 30 | help="extra arguments to program") |
31 | diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py | 31 | diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py |
32 | index 7b7b2d0..01d21a3 100644 | 32 | index 2c61f2f..d67df95 100644 |
33 | --- a/giscanner/shlibs.py | 33 | --- a/giscanner/shlibs.py |
34 | +++ b/giscanner/shlibs.py | 34 | +++ b/giscanner/shlibs.py |
35 | @@ -102,7 +102,9 @@ def _resolve_non_libtool(options, binary, libraries): | 35 | @@ -96,7 +96,9 @@ def _resolve_non_libtool(options, binary, libraries): |
36 | args.extend(libtool) | 36 | args.extend(libtool) |
37 | args.append('--mode=execute') | 37 | args.append('--mode=execute') |
38 | platform_system = platform.system() | 38 | platform_system = platform.system() |
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch index 2a31117b13..74622680d6 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a97d060933932e478c03f1de9513b69bc459eefc Mon Sep 17 00:00:00 2001 | 1 | From 74dab0fb6104ab6b715a24b783f8e8dfa5f83617 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: Thu, 8 Oct 2015 18:30:35 +0300 | 3 | Date: Thu, 8 Oct 2015 18:30:35 +0300 |
4 | Subject: [PATCH] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR | 4 | Subject: [PATCH] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR |
@@ -16,7 +16,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
16 | 2 files changed, 13 insertions(+), 13 deletions(-) | 16 | 2 files changed, 13 insertions(+), 13 deletions(-) |
17 | 17 | ||
18 | diff --git a/Makefile-gir.am b/Makefile-gir.am | 18 | diff --git a/Makefile-gir.am b/Makefile-gir.am |
19 | index 2cd7358..eaf0afd 100644 | 19 | index b59b0a6..24a50c2 100644 |
20 | --- a/Makefile-gir.am | 20 | --- a/Makefile-gir.am |
21 | +++ b/Makefile-gir.am | 21 | +++ b/Makefile-gir.am |
22 | @@ -58,8 +58,8 @@ else | 22 | @@ -58,8 +58,8 @@ else |
@@ -41,7 +41,7 @@ index 2cd7358..eaf0afd 100644 | |||
41 | 41 | ||
42 | GOBJECT_LIBRARY=gobject-2.0 | 42 | GOBJECT_LIBRARY=gobject-2.0 |
43 | 43 | ||
44 | @@ -123,8 +123,8 @@ GObject_2_0_gir_FILES = \ | 44 | @@ -124,8 +124,8 @@ GObject_2_0_gir_FILES = \ |
45 | BUILT_GIRSOURCES += GObject-2.0.gir | 45 | BUILT_GIRSOURCES += GObject-2.0.gir |
46 | 46 | ||
47 | # gmodule | 47 | # gmodule |
@@ -52,7 +52,7 @@ index 2cd7358..eaf0afd 100644 | |||
52 | 52 | ||
53 | GMODULE_LIBRARY=gmodule-2.0 | 53 | GMODULE_LIBRARY=gmodule-2.0 |
54 | 54 | ||
55 | @@ -149,13 +149,13 @@ GModule_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/gmodule.h \ | 55 | @@ -150,13 +150,13 @@ GModule_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/gmodule.h \ |
56 | BUILT_GIRSOURCES += GModule-2.0.gir | 56 | BUILT_GIRSOURCES += GModule-2.0.gir |
57 | 57 | ||
58 | # gio | 58 | # gio |
@@ -66,7 +66,7 @@ index 2cd7358..eaf0afd 100644 | |||
66 | if HAVE_GIO_UNIX | 66 | if HAVE_GIO_UNIX |
67 | -GIO_UNIX_INCLUDEDIR = $(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0 | 67 | -GIO_UNIX_INCLUDEDIR = $(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0 |
68 | +GIO_UNIX_INCLUDEDIR = $(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0 | 68 | +GIO_UNIX_INCLUDEDIR = $(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0 |
69 | GIO_UNIX_HDRS = $(GIO_UNIX_INCLUDEDIR)/gio/*.h | 69 | GIO_UNIX_HDRS = $(wildcard $(GIO_UNIX_INCLUDEDIR)/gio/*.h) |
70 | GIO_UNIX_PACKAGES = gio-unix-2.0 | 70 | GIO_UNIX_PACKAGES = gio-unix-2.0 |
71 | else | 71 | else |
72 | diff --git a/m4/introspection.m4 b/m4/introspection.m4 | 72 | diff --git a/m4/introspection.m4 b/m4/introspection.m4 |
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0010-meson-add-option-gir-dir-prefix.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0010-meson-add-option-gir-dir-prefix.patch deleted file mode 100644 index 8eec5f867e..0000000000 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0010-meson-add-option-gir-dir-prefix.patch +++ /dev/null | |||
@@ -1,66 +0,0 @@ | |||
1 | From bbc34f00fd30a13eafc607a956de60d822260355 Mon Sep 17 00:00:00 2001 | ||
2 | From: Kai Kang <kai.kang@windriver.com> | ||
3 | Date: Fri, 14 Sep 2018 01:26:38 -0700 | ||
4 | Subject: [PATCH] meson: add option 'gir-dir-prefix' | ||
5 | |||
6 | Add option 'gir-dir-prefix' for meson to make the installation path of | ||
7 | .gir files could be configured which has been done for autoconf. | ||
8 | |||
9 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gobject-introspection/commit/3938b86f5289c2b28a5ec42965b8da4b509445c4] | ||
10 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
11 | --- | ||
12 | gir/meson.build | 1 - | ||
13 | meson.build | 8 +++++++- | ||
14 | meson_options.txt | 4 ++++ | ||
15 | 3 files changed, 11 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/gir/meson.build b/gir/meson.build | ||
18 | index 607bbc4..1cb514a 100644 | ||
19 | --- a/gir/meson.build | ||
20 | +++ b/gir/meson.build | ||
21 | @@ -34,7 +34,6 @@ gir_files = [ | ||
22 | ] | ||
23 | |||
24 | typelibdir = join_paths(get_option('libdir'), 'girepository-1.0') | ||
25 | -girdir = join_paths(get_option('datadir'), 'gir-1.0') | ||
26 | install_data(gir_files, install_dir: girdir) | ||
27 | |||
28 | scanner_command = [ | ||
29 | diff --git a/meson.build b/meson.build | ||
30 | index a1432f7..17acd82 100644 | ||
31 | --- a/meson.build | ||
32 | +++ b/meson.build | ||
33 | @@ -18,7 +18,12 @@ python = pymod.find_installation(get_option('python')) | ||
34 | cc = meson.get_compiler('c') | ||
35 | config = configuration_data() | ||
36 | config.set_quoted('GIR_SUFFIX', 'gir-1.0') | ||
37 | -config.set_quoted('GIR_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'gir-1.0')) | ||
38 | +gir_dir_prefix = get_option('gir-dir-prefix') | ||
39 | +if gir_dir_prefix == '' | ||
40 | + gir_dir_prefix = get_option('datadir') | ||
41 | +endif | ||
42 | +girdir = join_paths(get_option('prefix'), gir_dir_prefix, 'gir-1.0') | ||
43 | +config.set_quoted('GIR_DIR', girdir) | ||
44 | config.set_quoted('GOBJECT_INTROSPECTION_LIBDIR', join_paths(get_option('prefix'), get_option('libdir'))) | ||
45 | |||
46 | foreach type : ['char', 'short', 'int', 'long'] | ||
47 | @@ -93,6 +98,7 @@ pkgconfig_conf.set('libdir', join_paths('${prefix}', get_option('libdir'))) | ||
48 | pkgconfig_conf.set('datarootdir', join_paths('${prefix}', get_option('datadir'))) | ||
49 | pkgconfig_conf.set('datadir', '${datarootdir}') | ||
50 | pkgconfig_conf.set('includedir', join_paths('${prefix}', get_option('includedir'))) | ||
51 | +pkgconfig_conf.set('GIR_DIR', join_paths('${prefix}', gir_dir_prefix, 'gir-1.0')) | ||
52 | if host_system == 'windows' or host_system == 'cygwin' | ||
53 | pkgconfig_conf.set('EXEEXT', '.exe') | ||
54 | else | ||
55 | diff --git a/meson_options.txt b/meson_options.txt | ||
56 | index 49726be..ee6958d 100644 | ||
57 | --- a/meson_options.txt | ||
58 | +++ b/meson_options.txt | ||
59 | @@ -21,3 +21,7 @@ option('cairo-libname', type: 'string', | ||
60 | option('python', type: 'string', value: 'python3', | ||
61 | description: 'Path or name of the Python interpreter to build for' | ||
62 | ) | ||
63 | + | ||
64 | +option('gir-dir-prefix', type: 'string', | ||
65 | + description: 'Intermediate prefix for gir installation under ${prefix}' | ||
66 | +) | ||
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.3.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.60.1.bb index 4ff9b7bf4b..f87597f190 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.3.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.60.1.bb | |||
@@ -17,14 +17,12 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-$ | |||
17 | file://0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch \ | 17 | file://0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch \ |
18 | file://0001-giscanner-add-a-lib-dirs-envvar-option.patch \ | 18 | file://0001-giscanner-add-a-lib-dirs-envvar-option.patch \ |
19 | file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \ | 19 | file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \ |
20 | file://0001-configure.ac-make-GIR_DIR-configurable.patch \ | ||
21 | file://0002-g-ir-tools-respect-gir_dir_prefix.patch \ | ||
22 | file://0010-meson-add-option-gir-dir-prefix.patch \ | ||
23 | file://0001-Port-cross-compilation-support-to-meson.patch \ | 20 | file://0001-Port-cross-compilation-support-to-meson.patch \ |
21 | file://0001-meson.build-disable-tests-when-cross-compiling.patch \ | ||
24 | " | 22 | " |
25 | 23 | ||
26 | SRC_URI[md5sum] = "182432c1f33886be8f4da073218b597d" | 24 | SRC_URI[md5sum] = "46fc8a98f6563e64947ac3d574632525" |
27 | SRC_URI[sha256sum] = "025b632bbd944dcf11fc50d19a0ca086b83baf92b3e34936d008180d28cdc3c8" | 25 | SRC_URI[sha256sum] = "d844d1499ecd36f3ec8a3573616186d36626ec0c9a7981939e99aa02e9c824b3" |
28 | 26 | ||
29 | SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" | 27 | SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" |
30 | 28 | ||
@@ -56,7 +54,7 @@ EXTRA_OEMESON_class-target = " \ | |||
56 | -Denable-gi-ldd-wrapper=${B}/g-ir-scanner-lddwrapper \ | 54 | -Denable-gi-ldd-wrapper=${B}/g-ir-scanner-lddwrapper \ |
57 | -Dpkgconfig-sysroot-path=${PKG_CONFIG_SYSROOT_DIR} \ | 55 | -Dpkgconfig-sysroot-path=${PKG_CONFIG_SYSROOT_DIR} \ |
58 | ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Denable-introspection-data=true', '-Denable-introspection-data=false', d)} \ | 56 | ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Denable-introspection-data=true', '-Denable-introspection-data=false', d)} \ |
59 | ${@'-Dgir-dir-prefix=${libdir}' if d.getVar('MULTILIBS') else ''} \ | 57 | ${@'-Dgir_dir_prefix=${libdir}' if d.getVar('MULTILIBS') else ''} \ |
60 | " | 58 | " |
61 | 59 | ||
62 | # Need to ensure ld.so.conf exists so prelink-native works | 60 | # Need to ensure ld.so.conf exists so prelink-native works |