diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2018-09-06 12:29:30 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-10 12:13:06 +0100 |
commit | c687dcb312e055c64ca8a17e492f3ca5f0236ece (patch) | |
tree | 12cfe4b03264cb4bb6878b93c1b712b06e79158f /meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch | |
parent | b4696f512443412ac79b1cc7816aa1ccf809996e (diff) | |
download | poky-c687dcb312e055c64ca8a17e492f3ca5f0236ece.tar.gz |
gobject-introspection: update to 1.58.0
License-Update: clarification of what parts of g-i are licensed under which license.
Actual terms are the same.
Add a patch to deal with prelink-rtld returning 127 in some cases despite there being no error.
(From OE-Core rev: 50b2187ed8b54317e953882034ba5648e0a4b764)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch')
-rw-r--r-- | meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch | 12 |
1 files changed, 5 insertions, 7 deletions
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 644cab929d..ba85c317f6 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 31ef4cce83c1770ea1e816d91b7e258fbf170035 Mon Sep 17 00:00:00 2001 | 1 | From 4cf37d56fddcc22bcd818f6d470404f56d907f3c 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 |
@@ -14,12 +14,13 @@ cache or sstate mirror). | |||
14 | 14 | ||
15 | Upstream-Status: Inappropriate | 15 | Upstream-Status: Inappropriate |
16 | Signed-off-by: Sascha Silbe <x-yo17@se-silbe.de> | 16 | Signed-off-by: Sascha Silbe <x-yo17@se-silbe.de> |
17 | |||
17 | --- | 18 | --- |
18 | girepository/girepository.c | 15 +++++++++++++-- | 19 | girepository/girepository.c | 15 +++++++++++++-- |
19 | 1 file changed, 13 insertions(+), 2 deletions(-) | 20 | 1 file changed, 13 insertions(+), 2 deletions(-) |
20 | 21 | ||
21 | diff --git a/girepository/girepository.c b/girepository/girepository.c | 22 | diff --git a/girepository/girepository.c b/girepository/girepository.c |
22 | index 10282c72..60c45104 100644 | 23 | index c1fa3d3..efa557e 100644 |
23 | --- a/girepository/girepository.c | 24 | --- a/girepository/girepository.c |
24 | +++ b/girepository/girepository.c | 25 | +++ b/girepository/girepository.c |
25 | @@ -21,6 +21,8 @@ | 26 | @@ -21,6 +21,8 @@ |
@@ -40,7 +41,7 @@ index 10282c72..60c45104 100644 | |||
40 | /** | 41 | /** |
41 | * SECTION:girepository | 42 | * SECTION:girepository |
42 | * @short_description: GObject Introspection repository manager | 43 | * @short_description: GObject Introspection repository manager |
43 | @@ -191,9 +195,16 @@ init_globals (void) | 44 | @@ -188,9 +192,16 @@ init_globals (void) |
44 | g_free (custom_dirs); | 45 | g_free (custom_dirs); |
45 | } | 46 | } |
46 | 47 | ||
@@ -57,8 +58,5 @@ index 10282c72..60c45104 100644 | |||
57 | + typelib_dir = g_build_filename (libdir, "girepository-1.0", NULL); | 58 | + typelib_dir = g_build_filename (libdir, "girepository-1.0", NULL); |
58 | + } | 59 | + } |
59 | 60 | ||
60 | search_path = g_slist_prepend (search_path, typelib_dir); | 61 | typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir); |
61 | 62 | ||
62 | -- | ||
63 | 2.11.0 | ||
64 | |||