diff options
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch')
-rw-r--r-- | meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch b/meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch index ded42d14f7..f32267d0c4 100644 --- a/meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch +++ b/meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 972667e0d789a6969a5d79249404f3539f891810 Mon Sep 17 00:00:00 2001 | 1 | From 0b860cb8a22ae876b6088939dbabca216bc29431 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, 4 Aug 2017 16:18:47 +0300 | 3 | Date: Fri, 4 Aug 2017 16:18:47 +0300 |
4 | Subject: [PATCH 1/2] gobject-introspection: determine g-ir-scanner and | 4 | Subject: [PATCH] gobject-introspection: determine g-ir-scanner and |
5 | g-ir-compiler paths from pkgconfig | 5 | g-ir-compiler paths from pkgconfig |
6 | 6 | ||
7 | Do not hardcode the name of those binaries; gobject-introspection | 7 | Do not hardcode the name of those binaries; gobject-introspection |
@@ -16,19 +16,19 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
16 | 1 file changed, 2 insertions(+), 2 deletions(-) | 16 | 1 file changed, 2 insertions(+), 2 deletions(-) |
17 | 17 | ||
18 | diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py | 18 | diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py |
19 | index 4f7fe30..9610cf6 100644 | 19 | index b29bab9..dc4c401 100644 |
20 | --- a/mesonbuild/modules/gnome.py | 20 | --- a/mesonbuild/modules/gnome.py |
21 | +++ b/mesonbuild/modules/gnome.py | 21 | +++ b/mesonbuild/modules/gnome.py |
22 | @@ -390,8 +390,6 @@ class GnomeModule(ExtensionModule): | 22 | @@ -393,8 +393,6 @@ class GnomeModule(ExtensionModule): |
23 | raise MesonException('Gir takes one argument') | 23 | raise MesonException('Gir takes one argument') |
24 | if kwargs.get('install_dir'): | 24 | if kwargs.get('install_dir'): |
25 | raise MesonException('install_dir is not supported with generate_gir(), see "install_dir_gir" and "install_dir_typelib"') | 25 | raise MesonException('install_dir is not supported with generate_gir(), see "install_dir_gir" and "install_dir_typelib"') |
26 | - giscanner = find_program('g-ir-scanner', 'Gir') | 26 | - giscanner = self.interpreter.find_program_impl('g-ir-scanner') |
27 | - gicompiler = find_program('g-ir-compiler', 'Gir') | 27 | - gicompiler = self.interpreter.find_program_impl('g-ir-compiler') |
28 | girtarget = args[0] | 28 | girtarget = args[0] |
29 | while hasattr(girtarget, 'held_object'): | 29 | while hasattr(girtarget, 'held_object'): |
30 | girtarget = girtarget.held_object | 30 | girtarget = girtarget.held_object |
31 | @@ -402,6 +400,8 @@ class GnomeModule(ExtensionModule): | 31 | @@ -405,6 +403,8 @@ class GnomeModule(ExtensionModule): |
32 | self.gir_dep = PkgConfigDependency('gobject-introspection-1.0', | 32 | self.gir_dep = PkgConfigDependency('gobject-introspection-1.0', |
33 | state.environment, | 33 | state.environment, |
34 | {'native': True}) | 34 | {'native': True}) |
@@ -37,6 +37,3 @@ index 4f7fe30..9610cf6 100644 | |||
37 | pkgargs = self.gir_dep.get_compile_args() | 37 | pkgargs = self.gir_dep.get_compile_args() |
38 | except Exception: | 38 | except Exception: |
39 | raise MesonException('gobject-introspection dependency was not found, gir cannot be generated.') | 39 | raise MesonException('gobject-introspection dependency was not found, gir cannot be generated.') |
40 | -- | ||
41 | 2.15.0 | ||
42 | |||