summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-04-04 14:13:05 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 13:28:04 +0100
commit364b7ca6c672947b51790aef1e2af71ee57e736c (patch)
tree592e0af2963adcf6732ea5d407c050ff8a8dd4fa /meta/recipes-gnome
parentdabd0c0c11258021570ae3b05de88f1227fd1e21 (diff)
downloadpoky-364b7ca6c672947b51790aef1e2af71ee57e736c.tar.gz
gobject-introspection: update to 1.56.0
License-Update: bug tracker link changed (From OE-Core rev: fbd485b2666cf0212064e2d8b55f44b84108e572) (From OE-Core rev: c6986821692bb6dd3036075973b1390765dbc993) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch13
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection_1.56.0.bb (renamed from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb)13
2 files changed, 12 insertions, 14 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 4ec527dcc0..232480f3f5 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 e48f1e18f5ea41656f0ba10fe61d69d2604b0064 Mon Sep 17 00:00:00 2001 1From 06ebdaa5c8f9721acf93cc3e75a877a3c963867f 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 29de0ee..928eae8 100644 22index a8bd5b1..6cf25d5 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):
@@ -32,7 +32,7 @@ index 29de0ee..928eae8 100644
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@@ -119,7 +119,7 @@ class CCompiler(object):
35 if self.check_is_msvc(): 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']
@@ -41,7 +41,7 @@ index 29de0ee..928eae8 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.')
43diff --git a/giscanner/dumper.py b/giscanner/dumper.py 43diff --git a/giscanner/dumper.py b/giscanner/dumper.py
44index 7f77bd2..db96df6 100644 44index 3c7220b..0abd565 100644
45--- a/giscanner/dumper.py 45--- a/giscanner/dumper.py
46+++ b/giscanner/dumper.py 46+++ b/giscanner/dumper.py
47@@ -259,7 +259,8 @@ class DumpCompiler(object): 47@@ -259,7 +259,8 @@ class DumpCompiler(object):
@@ -55,7 +55,7 @@ index 7f77bd2..db96df6 100644
55 55
56 else: 56 else:
57diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py 57diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
58index 38a45c1..b603850 100755 58index d262785..51c9570 100755
59--- a/giscanner/scannermain.py 59--- a/giscanner/scannermain.py
60+++ b/giscanner/scannermain.py 60+++ b/giscanner/scannermain.py
61@@ -130,6 +130,9 @@ def _get_option_parser(): 61@@ -130,6 +130,9 @@ def _get_option_parser():
@@ -68,6 +68,3 @@ index 38a45c1..b603850 100755
68 parser.add_option("", "--program-arg", 68 parser.add_option("", "--program-arg",
69 action="append", dest="program_args", default=[], 69 action="append", dest="program_args", default=[],
70 help="extra arguments to program") 70 help="extra arguments to program")
71--
722.15.1
73
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.56.0.bb
index e330667239..8f84f832b0 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.56.0.bb
@@ -3,10 +3,11 @@ HOMEPAGE = "https://wiki.gnome.org/action/show/Projects/GObjectIntrospection"
3BUGTRACKER = "https://bugzilla.gnome.org/" 3BUGTRACKER = "https://bugzilla.gnome.org/"
4SECTION = "libs" 4SECTION = "libs"
5LICENSE = "LGPLv2+ & GPLv2+" 5LICENSE = "LGPLv2+ & GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=90d577535a3898e1ae5dbf0ae3509a8c \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=6317a809f70ed9848fa5673121908586 \
7 file://tools/compiler.c;endline=20;md5=fc5007fc20022720e6c0b0cdde41fabd \ 7 file://tools/compiler.c;md5=fc5007fc20022720e6c0b0cdde41fabd;endline=20 \
8 file://giscanner/sourcescanner.c;endline=22;md5=194d6e0c1d00662f32d030ce44de8d39 \ 8 file://giscanner/sourcescanner.c;md5=194d6e0c1d00662f32d030ce44de8d39;endline=22 \
9 file://girepository/giregisteredtypeinfo.c;endline=21;md5=661847611ae6979465415f31a759ba27" 9 file://girepository/giregisteredtypeinfo.c;md5=661847611ae6979465415f31a759ba27;endline=21 \
10 "
10 11
11SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ 12SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \
12 file://0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch \ 13 file://0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch \
@@ -16,8 +17,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-$
16 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 \
17 file://0001-giscanner-add-a-lib-dirs-envvar-option.patch \ 18 file://0001-giscanner-add-a-lib-dirs-envvar-option.patch \
18 " 19 "
19SRC_URI[md5sum] = "126c29e4d54adbed2ed4e2b04483de41" 20SRC_URI[md5sum] = "8064b5cd8fa02feeab850a0f6ef72b0f"
20SRC_URI[sha256sum] = "b88ded5e5f064ab58a93aadecd6d58db2ec9d970648534c63807d4f9a7bb877e" 21SRC_URI[sha256sum] = "0d7059fad7aa5ec50d9678aea4ea139acab23737e9cf9ca0d86c615cecbaa0f8"
21 22
22inherit 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
23BBCLASSEXTEND = "native" 24BBCLASSEXTEND = "native"