From 04e63c135b69fffdda2b428a03cd6c8cf0927a4dbfbf317a4faa0411bb67d45d Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Fri, 14 Oct 2016 22:13:48 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=17 --- meson-typelib-install.patch | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 meson-typelib-install.patch diff --git a/meson-typelib-install.patch b/meson-typelib-install.patch deleted file mode 100644 index cdcb275..0000000 --- a/meson-typelib-install.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 660c872422be4ed7fb4499d1263793fb0e976141 Mon Sep 17 00:00:00 2001 -From: Wim Taymans -Date: Mon, 4 Jul 2016 12:29:56 +0200 -Subject: [PATCH] gnome.py: typelib files should be installed in libdir - -The typelib files should be installed in libdir, even on debian (which -has them in /usr/lib/x86_64-linux-gnu/girepository-1.0/). ---- - mesonbuild/modules/gnome.py | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index 2c37655..037b1f5 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -228,9 +228,7 @@ def generate_gir(self, state, args, kwargs): - - kwargs['output'] = typelib_output - kwargs['command'] = typelib_cmd -- # Note that this can't be libdir, because e.g. on Debian it points to -- # lib/x86_64-linux-gnu but the girepo dir is always under lib. -- kwargs['install_dir'] = 'lib/girepository-1.0' -+ kwargs['install_dir'] = os.path.join(state.environment.get_libdir(), 'girepository-1.0') - typelib_target = TypelibTarget(typelib_output, state.subdir, kwargs) - return [scan_target, typelib_target] - -