diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2018-09-06 12:29:29 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-10 12:13:06 +0100 |
commit | b4696f512443412ac79b1cc7816aa1ccf809996e (patch) | |
tree | 9afc6ff890795e523047d4f85bbf990b44db5669 /meta/recipes-core/glib-2.0 | |
parent | b0c7ed82694b7bad9d14bab9692f54a44b863583 (diff) | |
download | poky-b4696f512443412ac79b1cc7816aa1ccf809996e.tar.gz |
glib: update to 2.58.0
Drop upstreamed patches, refresh the rest.
Add an explicit dependency on gettext-native, as glib is no longer
fooled by setting msgfmt to /bin/false.
(From OE-Core rev: 79d229e8be892cc0bd36fe9f71ac4671cc34aa82)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch | 14 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-Test-for-pthread_getname_np-before-using-it.patch | 70 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-glib-mkenums-Ignore-other-per-value-options-than-ski.patch | 32 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch | 29 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch | 16 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch | 6 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.58.0.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.56.1.bb) | 6 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 4 |
8 files changed, 32 insertions, 145 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch index 561d100209..97d0aff5d6 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 80682c171ccb27d01343d4cfcfb4dd49b7863ccc Mon Sep 17 00:00:00 2001 | 1 | From 856045927b9ab391165c0ebabf401835f8439eab Mon Sep 17 00:00:00 2001 |
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
3 | Date: Tue, 22 Mar 2016 15:14:58 +0200 | 3 | Date: Tue, 22 Mar 2016 15:14:58 +0200 |
4 | Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM | 4 | Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM |
@@ -8,24 +8,22 @@ renamer does not cope with library packages with files in ${bindir} | |||
8 | 8 | ||
9 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | 9 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
10 | Upstream-Status: Inappropriate [OE specific] | 10 | Upstream-Status: Inappropriate [OE specific] |
11 | |||
11 | --- | 12 | --- |
12 | gio/Makefile.am | 3 ++- | 13 | gio/Makefile.am | 3 ++- |
13 | 1 file changed, 2 insertions(+), 1 deletion(-) | 14 | 1 file changed, 2 insertions(+), 1 deletion(-) |
14 | 15 | ||
15 | diff --git a/gio/Makefile.am b/gio/Makefile.am | 16 | diff --git a/gio/Makefile.am b/gio/Makefile.am |
16 | index b7f91cc..4d81cc0 100644 | 17 | index e14cad2..bf2bcc7 100644 |
17 | --- a/gio/Makefile.am | 18 | --- a/gio/Makefile.am |
18 | +++ b/gio/Makefile.am | 19 | +++ b/gio/Makefile.am |
19 | @@ -702,7 +702,8 @@ gio.def: libgio-2.0.la | 20 | @@ -835,7 +835,8 @@ gio.def: libgio-2.0.la |
20 | gio-2.0.lib: libgio-2.0.la gio.def | 21 | gio-2.0.lib: libgio-2.0.la gio.def |
21 | $(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gio.def -out:$@ | 22 | $(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gio.def -out:$@ |
22 | 23 | ||
23 | -bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gsettings | 24 | -bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gsettings gio-launch-desktop |
24 | +bin_PROGRAMS = glib-compile-schemas glib-compile-resources gsettings | 25 | +bin_PROGRAMS = glib-compile-schemas glib-compile-resources gsettings gio-launch-desktop |
25 | +libexec_PROGRAMS = gio-querymodules | 26 | +libexec_PROGRAMS = gio-querymodules |
26 | 27 | ||
27 | glib_compile_resources_LDADD = libgio-2.0.la \ | 28 | glib_compile_resources_LDADD = libgio-2.0.la \ |
28 | $(top_builddir)/gobject/libgobject-2.0.la \ | 29 | $(top_builddir)/gobject/libgobject-2.0.la \ |
29 | -- | ||
30 | 2.1.4 | ||
31 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Test-for-pthread_getname_np-before-using-it.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Test-for-pthread_getname_np-before-using-it.patch deleted file mode 100644 index c6e4966bb8..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Test-for-pthread_getname_np-before-using-it.patch +++ /dev/null | |||
@@ -1,70 +0,0 @@ | |||
1 | From f627fe16099a2b08d8b4e9023ae6b4f352451967 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 6 Nov 2016 08:59:08 -0800 | ||
4 | Subject: [PATCH] Test for pthread_getname_np before using it | ||
5 | |||
6 | Its a GNU extention and not all libc implement it | ||
7 | musl e.g. implements the setname API but not getname | ||
8 | in any case, it seems to be safer to check for the | ||
9 | function before using it. | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | Upstream-Status: Submitted | ||
14 | |||
15 | config.h.in | 3 +++ | ||
16 | configure.ac | 10 ++++++++++ | ||
17 | glib/tests/thread.c | 2 +- | ||
18 | 3 files changed, 14 insertions(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/config.h.in b/config.h.in | ||
21 | index 2c35ff1..da7ac30 100644 | ||
22 | --- a/config.h.in | ||
23 | +++ b/config.h.in | ||
24 | @@ -326,6 +326,9 @@ | ||
25 | #undef HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE_NP | ||
26 | |||
27 | /* Have function pthread_setname_np(const char*) */ | ||
28 | +#undef HAVE_PTHREAD_GETNAME_NP | ||
29 | + | ||
30 | +/* Have function pthread_setname_np(const char*) */ | ||
31 | #undef HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID | ||
32 | |||
33 | /* Have function pthread_setname_np(pthread_t, const char*) */ | ||
34 | diff --git a/configure.ac b/configure.ac | ||
35 | index 4309671..209770a 100644 | ||
36 | --- a/configure.ac | ||
37 | +++ b/configure.ac | ||
38 | @@ -2121,6 +2121,16 @@ AS_IF([ test x"$have_threads" = xposix], [ | ||
39 | AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE_NP,1, | ||
40 | [Have function pthread_cond_timedwait_relative_np])], | ||
41 | [AC_MSG_RESULT(no)]) | ||
42 | + dnl gets thread names | ||
43 | + AC_MSG_CHECKING(for pthread_getname_np(pthread_t, char*, size_t)) | ||
44 | + AC_LINK_IFELSE( | ||
45 | + [AC_LANG_PROGRAM( | ||
46 | + [#include <pthread.h>], | ||
47 | + [pthread_getname_np(pthread_self(),"example",0)])], | ||
48 | + [AC_MSG_RESULT(yes) | ||
49 | + AC_DEFINE(HAVE_PTHREAD_GETNAME_NP,1, | ||
50 | + [Have function pthread_setname_np(const char*)])], | ||
51 | + [AC_MSG_RESULT(no)]) | ||
52 | dnl Sets thread names on OS X 10.6, iOS 3.2 (and higher) | ||
53 | AC_MSG_CHECKING(for pthread_setname_np(const char*)) | ||
54 | AC_LINK_IFELSE( | ||
55 | diff --git a/glib/tests/thread.c b/glib/tests/thread.c | ||
56 | index 5447836..2f248a6 100644 | ||
57 | --- a/glib/tests/thread.c | ||
58 | +++ b/glib/tests/thread.c | ||
59 | @@ -174,7 +174,7 @@ test_thread5 (void) | ||
60 | static gpointer | ||
61 | thread6_func (gpointer data) | ||
62 | { | ||
63 | -#ifdef HAVE_PTHREAD_SETNAME_NP_WITH_TID | ||
64 | +#if defined(HAVE_PTHREAD_SETNAME_NP_WITH_TID) && defined(HAVE_PTHREAD_GETNAME_NP) | ||
65 | char name[16]; | ||
66 | |||
67 | pthread_getname_np (pthread_self(), name, 16); | ||
68 | -- | ||
69 | 2.10.2 | ||
70 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-glib-mkenums-Ignore-other-per-value-options-than-ski.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-glib-mkenums-Ignore-other-per-value-options-than-ski.patch deleted file mode 100644 index c87635a082..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-glib-mkenums-Ignore-other-per-value-options-than-ski.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From 12ffb50d587003a46678567b771c6e984035a5e9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Kjellerstedt <pkj@axis.com> | ||
3 | Date: Sat, 28 Apr 2018 03:07:50 +0200 | ||
4 | Subject: [PATCH] glib-mkenums: Ignore other per value options than 'skip' and | ||
5 | 'nick' | ||
6 | |||
7 | If some other per value option was present than 'skip' or 'nick' then | ||
8 | a KeyError would occur. Ignoring such options matches the behaviour of | ||
9 | the old, Perl-based glib-mkenums. | ||
10 | |||
11 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=795008] | ||
12 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | ||
13 | --- | ||
14 | gobject/glib-mkenums.in | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in | ||
18 | index fe9a10756..4ccc1f458 100755 | ||
19 | --- a/gobject/glib-mkenums.in | ||
20 | +++ b/gobject/glib-mkenums.in | ||
21 | @@ -218,7 +218,7 @@ def parse_entries(file, file_name): | ||
22 | if options is not None: | ||
23 | options = parse_trigraph(options) | ||
24 | if 'skip' not in options: | ||
25 | - entries.append((name, value, options['nick'])) | ||
26 | + entries.append((name, value, options.get('nick', None))) | ||
27 | else: | ||
28 | entries.append((name, value)) | ||
29 | elif re.match(r's*\#', line): | ||
30 | -- | ||
31 | 2.12.0 | ||
32 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch b/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch index b98f933dae..50781e7892 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From d762907d33b81cf7469b5696c87f2188d2050afb Mon Sep 17 00:00:00 2001 | 1 | From 4b1a6d247c78125096a6ea5ab3cab8a1f000dc23 Mon Sep 17 00:00:00 2001 |
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
3 | Date: Mon, 9 Nov 2015 11:07:27 +0200 | 3 | Date: Mon, 9 Nov 2015 11:07:27 +0200 |
4 | Subject: [PATCH 06/10] Enable more tests while cross-compiling | 4 | Subject: [PATCH] Enable more tests while cross-compiling |
5 | 5 | ||
6 | Upstream disables a few tests while cross-compiling because their build requires | 6 | Upstream disables a few tests while cross-compiling because their build requires |
7 | running other built binaries. This usually makes sense but in the cross-compile | 7 | running other built binaries. This usually makes sense but in the cross-compile |
@@ -16,10 +16,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | |||
16 | 2 files changed, 11 insertions(+), 7 deletions(-) | 16 | 2 files changed, 11 insertions(+), 7 deletions(-) |
17 | 17 | ||
18 | diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am | 18 | diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am |
19 | index acc1da4..9176640 100644 | 19 | index 1f0bed7..8295deb 100644 |
20 | --- a/gio/tests/Makefile.am | 20 | --- a/gio/tests/Makefile.am |
21 | +++ b/gio/tests/Makefile.am | 21 | +++ b/gio/tests/Makefile.am |
22 | @@ -516,10 +516,9 @@ test_programs += \ | 22 | @@ -550,10 +550,9 @@ test_programs += \ |
23 | endif | 23 | endif |
24 | 24 | ||
25 | # ----------------------------------------------------------------------------- | 25 | # ----------------------------------------------------------------------------- |
@@ -32,7 +32,7 @@ index acc1da4..9176640 100644 | |||
32 | test_programs += resources | 32 | test_programs += resources |
33 | resources_SOURCES = resources.c | 33 | resources_SOURCES = resources.c |
34 | nodist_resources_SOURCES = test_resources.c test_resources2.c test_resources2.h | 34 | nodist_resources_SOURCES = test_resources.c test_resources2.c test_resources2.h |
35 | @@ -543,7 +542,11 @@ if !ENABLE_INSTALLED_TESTS | 35 | @@ -578,7 +577,11 @@ if !ENABLE_INSTALLED_TESTS |
36 | libresourceplugin_la_LDFLAGS += -rpath / | 36 | libresourceplugin_la_LDFLAGS += -rpath / |
37 | endif | 37 | endif |
38 | 38 | ||
@@ -44,7 +44,7 @@ index acc1da4..9176640 100644 | |||
44 | 44 | ||
45 | test-generated.txt: test1.txt | 45 | test-generated.txt: test1.txt |
46 | $(AM_V_GEN) echo "Generated" > $@ && \ | 46 | $(AM_V_GEN) echo "Generated" > $@ && \ |
47 | @@ -564,7 +567,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) -- | 47 | @@ -599,7 +602,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) -- |
48 | 48 | ||
49 | EXTRA_DIST += test.gresource.xml test1.txt test2.gresource.xml test2.txt test3.gresource.xml test3.txt test4.gresource.xml | 49 | EXTRA_DIST += test.gresource.xml test1.txt test2.gresource.xml test2.txt test3.gresource.xml test3.txt test4.gresource.xml |
50 | CLEANFILES += test-generated.txt test_resources.c test_resources2.[ch] plugin_resources.c test.gresource | 50 | CLEANFILES += test-generated.txt test_resources.c test_resources2.[ch] plugin_resources.c test.gresource |
@@ -53,10 +53,10 @@ index acc1da4..9176640 100644 | |||
53 | BUILT_SOURCES += giotypefuncs.inc | 53 | BUILT_SOURCES += giotypefuncs.inc |
54 | 54 | ||
55 | diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am | 55 | diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am |
56 | index 656941d..68555ff 100644 | 56 | index 0e60987..927d13a 100644 |
57 | --- a/tests/gobject/Makefile.am | 57 | --- a/tests/gobject/Makefile.am |
58 | +++ b/tests/gobject/Makefile.am | 58 | +++ b/tests/gobject/Makefile.am |
59 | @@ -48,10 +48,13 @@ if ENABLE_TIMELOOP | 59 | @@ -51,10 +51,13 @@ if ENABLE_TIMELOOP |
60 | installed_test_programs += timeloop-closure | 60 | installed_test_programs += timeloop-closure |
61 | endif | 61 | endif |
62 | 62 | ||
@@ -72,14 +72,9 @@ index 656941d..68555ff 100644 | |||
72 | 72 | ||
73 | testmarshal.h: stamp-testmarshal.h | 73 | testmarshal.h: stamp-testmarshal.h |
74 | @true | 74 | @true |
75 | @@ -69,7 +72,6 @@ BUILT_SOURCES += testmarshal.h testmarshal.c | 75 | @@ -71,4 +74,3 @@ testmarshal.c: testmarshal.h testmarshal.list $(glib_genmarshal) |
76 | CLEANFILES += stamp-testmarshal.h | 76 | BUILT_SOURCES += testmarshal.h testmarshal.c |
77 | CLEANFILES += stamp-testmarshal.h testmarshal.h testmarshal.c | ||
77 | EXTRA_DIST += testcommon.h testmarshal.list | 78 | EXTRA_DIST += testcommon.h testmarshal.list |
78 | BUILT_EXTRA_DIST += testmarshal.h testmarshal.c | ||
79 | -endif # !CROSS_COMPILING | 79 | -endif # !CROSS_COMPILING |
80 | 80 | \ No newline at end of file | |
81 | dist-hook: $(BUILT_EXTRA_DIST) | ||
82 | files='$(BUILT_EXTRA_DIST)'; \ | ||
83 | -- | ||
84 | 2.14.1 | ||
85 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch b/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch index 3d0c008bbe..3040479422 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c53e94a520b573aa0dcf12903e9563fe8badc34c Mon Sep 17 00:00:00 2001 | 1 | From 66e5fd5e870a2de04ec0f0c5dbfa23db496bad43 Mon Sep 17 00:00:00 2001 |
2 | From: Marius Avram <marius.avram@intel.com> | 2 | From: Marius Avram <marius.avram@intel.com> |
3 | Date: Wed, 27 Aug 2014 12:10:41 +0300 | 3 | Date: Wed, 27 Aug 2014 12:10:41 +0300 |
4 | Subject: [PATCH] Allow /run/media/sdX drive mount if username root | 4 | Subject: [PATCH] Allow /run/media/sdX drive mount if username root |
@@ -14,17 +14,18 @@ graphical applications such as the File Manager (pcmanfm). | |||
14 | Upstream-Status: Inappropriate | 14 | Upstream-Status: Inappropriate |
15 | 15 | ||
16 | Signed-off-by: Marius Avram <marius.avram@intel.com> | 16 | Signed-off-by: Marius Avram <marius.avram@intel.com> |
17 | |||
17 | --- | 18 | --- |
18 | gio/gunixmounts.c | 5 +++++ | 19 | gio/gunixmounts.c | 5 +++++ |
19 | 1 file changed, 5 insertions(+) | 20 | 1 file changed, 5 insertions(+) |
20 | 21 | ||
21 | diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c | 22 | diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c |
22 | index 4999354..f6c1472 100644 | 23 | index 355329c..6467fc5 100644 |
23 | --- a/gio/gunixmounts.c | 24 | --- a/gio/gunixmounts.c |
24 | +++ b/gio/gunixmounts.c | 25 | +++ b/gio/gunixmounts.c |
25 | @@ -2136,6 +2136,11 @@ g_unix_mount_guess_should_display (GUnixMountEntry *mount_entry) | 26 | @@ -2745,6 +2745,11 @@ g_unix_mount_guess_should_display (GUnixMountEntry *mount_entry) |
26 | mount_path[sizeof ("/run/media/") - 1 + user_name_len] == '/') | 27 | is_in_runtime_dir = TRUE; |
27 | is_in_runtime_dir = TRUE; | 28 | } |
28 | 29 | ||
29 | + /* Allow no username in path in /run/media if current user is root */ | 30 | + /* Allow no username in path in /run/media if current user is root */ |
30 | + if (strcmp(user_name, "root") == 0 && | 31 | + if (strcmp(user_name, "root") == 0 && |
@@ -34,6 +35,3 @@ index 4999354..f6c1472 100644 | |||
34 | if (is_in_runtime_dir || g_str_has_prefix (mount_path, "/media/")) | 35 | if (is_in_runtime_dir || g_str_has_prefix (mount_path, "/media/")) |
35 | { | 36 | { |
36 | char *path; | 37 | char *path; |
37 | -- | ||
38 | 1.7.9.5 | ||
39 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch index 0c8cbd731b..f9794d3dd2 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c8fa58dc2e9322727ba21eafbe9a69a5f68ffd35 Mon Sep 17 00:00:00 2001 | 1 | From 8326961841f4d16c7239e747de11e3817c35cfd2 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Fri, 11 Mar 2016 15:35:55 +0000 | 3 | Date: Fri, 11 Mar 2016 15:35:55 +0000 |
4 | Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds | 4 | Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds |
@@ -19,7 +19,7 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | |||
19 | 1 file changed, 11 insertions(+), 1 deletion(-) | 19 | 1 file changed, 11 insertions(+), 1 deletion(-) |
20 | 20 | ||
21 | diff --git a/gio/giomodule.c b/gio/giomodule.c | 21 | diff --git a/gio/giomodule.c b/gio/giomodule.c |
22 | index 1ead84c..f744aa2 100644 | 22 | index 36c0cef..912e490 100644 |
23 | --- a/gio/giomodule.c | 23 | --- a/gio/giomodule.c |
24 | +++ b/gio/giomodule.c | 24 | +++ b/gio/giomodule.c |
25 | @@ -40,6 +40,8 @@ | 25 | @@ -40,6 +40,8 @@ |
@@ -31,7 +31,7 @@ index 1ead84c..f744aa2 100644 | |||
31 | #endif | 31 | #endif |
32 | #include <glib/gstdio.h> | 32 | #include <glib/gstdio.h> |
33 | 33 | ||
34 | @@ -1083,7 +1085,15 @@ get_gio_module_dir (void) | 34 | @@ -1099,7 +1101,15 @@ get_gio_module_dir (void) |
35 | #endif | 35 | #endif |
36 | g_free (install_dir); | 36 | g_free (install_dir); |
37 | #else | 37 | #else |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.56.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.58.0.bb index 7bc437d47f..92c7997a27 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.56.1.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.58.0.bb | |||
@@ -13,12 +13,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ | |||
13 | file://Enable-more-tests-while-cross-compiling.patch \ | 13 | file://Enable-more-tests-while-cross-compiling.patch \ |
14 | file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ | 14 | file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ |
15 | file://0001-Do-not-ignore-return-value-of-write.patch \ | 15 | file://0001-Do-not-ignore-return-value-of-write.patch \ |
16 | file://0001-Test-for-pthread_getname_np-before-using-it.patch \ | ||
17 | file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ | 16 | file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ |
18 | file://0001-glib-mkenums-Ignore-other-per-value-options-than-ski.patch \ | ||
19 | " | 17 | " |
20 | 18 | ||
21 | SRC_URI_append_class-native = " file://relocate-modules.patch" | 19 | SRC_URI_append_class-native = " file://relocate-modules.patch" |
22 | 20 | ||
23 | SRC_URI[md5sum] = "988af38524804ea1ae6bc9a2bad181ff" | 21 | SRC_URI[md5sum] = "9b5d21c802f55bf37171c4fbfe7d32d1" |
24 | SRC_URI[sha256sum] = "40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d" | 22 | SRC_URI[sha256sum] = "c0f4ce0730b4f95c47b711613b5406a887c2ee13ea6d25930d72a4fa7fdb77f6" |
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index d6d91335a6..6dab19283c 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
@@ -87,10 +87,10 @@ ARM_INSTRUCTION_SET_armv5 = "arm" | |||
87 | CPPFLAGS_append_class-target_mips16e = " -DNVALGRIND=1" | 87 | CPPFLAGS_append_class-target_mips16e = " -DNVALGRIND=1" |
88 | 88 | ||
89 | # GLib generally requires gettext to be present so for USE_NLS to yes. For | 89 | # GLib generally requires gettext to be present so for USE_NLS to yes. For |
90 | # native builds as i18n is disabled globally we can tell it to use a fake msgfmt. | 90 | # native builds as i18n is disabled globally we have to add a gettext-native dependency. |
91 | USE_NLS_class-target = "yes" | 91 | USE_NLS_class-target = "yes" |
92 | USE_NLS_class-nativesdk = "yes" | 92 | USE_NLS_class-nativesdk = "yes" |
93 | CACHED_CONFIGUREVARS_append_class-native = " ac_cv_path_MSGFMT=/bin/false" | 93 | DEPENDS_append_class-native = " gettext-native" |
94 | 94 | ||
95 | EXEEXT = "" | 95 | EXEEXT = "" |
96 | EXEEXT_mingw32 = ".exe" | 96 | EXEEXT_mingw32 = ".exe" |