summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch8
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection_1.56.1.bb (renamed from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.56.0.bb)4
2 files changed, 6 insertions, 6 deletions
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 232480f3f5..4aa2e3cb2b 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 @@
1From 06ebdaa5c8f9721acf93cc3e75a877a3c963867f Mon Sep 17 00:00:00 2001 1From 3875175563df28813c22b1de6bda260285f65cb0 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 3 Jan 2018 17:02:01 +0200 3Date: Wed, 3 Jan 2018 17:02:01 +0200
4Subject: [PATCH] giscanner: add a --lib-dirs-envvar option 4Subject: [PATCH] giscanner: add a --lib-dirs-envvar option
@@ -19,7 +19,7 @@ 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
21diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py 21diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
22index a8bd5b1..6cf25d5 100644 22index d10327c..47f57c6 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@@ -109,7 +109,7 @@ class CCompiler(object):
@@ -35,8 +35,8 @@ index a8bd5b1..6cf25d5 100644
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:
38- runtime_path_envvar = ['LD_LIBRARY_PATH'] 38- runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH']
39+ runtime_path_envvar = ['LD_LIBRARY_PATH'] if not lib_dirs_envvar else [lib_dirs_envvar] 39+ runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH'] if not lib_dirs_envvar else [lib_dirs_envvar]
40 # Search the current directory first 40 # Search the current directory first
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.')
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.56.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.56.1.bb
index 8f84f832b0..8d05566949 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.56.0.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.56.1.bb
@@ -17,8 +17,8 @@ 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 " 19 "
20SRC_URI[md5sum] = "8064b5cd8fa02feeab850a0f6ef72b0f" 20SRC_URI[md5sum] = "62e5f5685b8d9752fdeaf17c057d53d1"
21SRC_URI[sha256sum] = "0d7059fad7aa5ec50d9678aea4ea139acab23737e9cf9ca0d86c615cecbaa0f8" 21SRC_URI[sha256sum] = "5b2875ccff99ff7baab63a34b67f8c920def240e178ff50add809e267d9ea24b"
22 22
23inherit autotools pkgconfig gtk-doc python3native qemu gobject-introspection-data upstream-version-is-even 23inherit autotools pkgconfig gtk-doc python3native qemu gobject-introspection-data upstream-version-is-even
24BBCLASSEXTEND = "native" 24BBCLASSEXTEND = "native"