summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-05-03 18:25:45 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-05 13:19:54 +0100
commite2e161170ed55048905f0e465dfb9278e356a2a0 (patch)
tree3563b298e54cf40e798d7cfc254ecb001e2b7789 /meta/recipes-core/glib-2.0
parent631b2221170bc8ec24e679969065f20e065655cd (diff)
downloadpoky-e2e161170ed55048905f0e465dfb9278e356a2a0.tar.gz
glib-2.0: update 2.62.4 -> 2.64.2
Add a couple of missing ptest dependencies. Drop backports. (From OE-Core rev: 8c2d45680ad0d8b2ab5bc7f78579fc82b04e6134) 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-Do-not-ignore-return-value-of-write.patch6
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch10
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch7
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch6
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch11
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch22
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch3
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch10
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch14
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0011-GMainContext-Fix-GSource-iterator-if-iteration-can-m.patch43
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0012-GMainContext-Fix-memory-leaks-and-memory-corruption-.patch109
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0013-GMainContext-Move-mutex-unlocking-in-destructor-righ.patch36
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch32
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch10
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.64.2.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb)7
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc6
16 files changed, 68 insertions, 264 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch
index 0ebf138d60..f3a0069633 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch
@@ -1,4 +1,4 @@
1From d250652782b65b071b7cc8f01f2db833df104e0e Mon Sep 17 00:00:00 2001 1From 658c034d92027dc8af5f784cae852123fac79b19 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 16 Apr 2016 13:28:59 -0700 3Date: Sat, 16 Apr 2016 13:28:59 -0700
4Subject: [PATCH] Do not ignore return value of write() 4Subject: [PATCH] Do not ignore return value of write()
@@ -16,10 +16,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
16 1 file changed, 3 insertions(+), 2 deletions(-) 16 1 file changed, 3 insertions(+), 2 deletions(-)
17 17
18diff --git a/glib/tests/unix.c b/glib/tests/unix.c 18diff --git a/glib/tests/unix.c b/glib/tests/unix.c
19index 9d55a6c..a07f945 100644 19index 7639d06..f941141 100644
20--- a/glib/tests/unix.c 20--- a/glib/tests/unix.c
21+++ b/glib/tests/unix.c 21+++ b/glib/tests/unix.c
22@@ -32,14 +32,15 @@ test_pipe (void) 22@@ -33,14 +33,15 @@ test_pipe (void)
23 GError *error = NULL; 23 GError *error = NULL;
24 int pipefd[2]; 24 int pipefd[2];
25 char buf[1024]; 25 char buf[1024];
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
index edac4c9f75..5fe3aa898e 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
@@ -1,4 +1,4 @@
1From 60b36289ac314ad972cf81c1acd19f6f2e58ff25 Mon Sep 17 00:00:00 2001 1From 0797a40627a4cb5439a24b872edc65356dceaaf0 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 15 Feb 2019 11:17:27 +0100 3Date: Fri, 15 Feb 2019 11:17:27 +0100
4Subject: [PATCH] Do not write $bindir into pkg-config files 4Subject: [PATCH] Do not write $bindir into pkg-config files
@@ -16,13 +16,13 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
16 2 files changed, 11 insertions(+), 11 deletions(-) 16 2 files changed, 11 insertions(+), 11 deletions(-)
17 17
18diff --git a/gio/meson.build b/gio/meson.build 18diff --git a/gio/meson.build b/gio/meson.build
19index 71e88c4..8ce3987 100644 19index 532b086..98468a3 100644
20--- a/gio/meson.build 20--- a/gio/meson.build
21+++ b/gio/meson.build 21+++ b/gio/meson.build
22@@ -831,14 +831,14 @@ pkg.generate(libgio, 22@@ -820,14 +820,14 @@ pkg.generate(libgio,
23 'schemasdir=' + join_paths('${datadir}', schemas_subdir), 23 'schemasdir=' + join_paths('${datadir}', schemas_subdir),
24 'bindir=' + join_paths('${prefix}', get_option('bindir')), 24 'bindir=' + join_paths('${prefix}', get_option('bindir')),
25 'giomoduledir=' + giomodulesdir, 25 'giomoduledir=' + pkgconfig_giomodulesdir,
26- 'gio=' + join_paths('${bindir}', 'gio'), 26- 'gio=' + join_paths('${bindir}', 'gio'),
27- 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'), 27- 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'),
28- 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'), 28- 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'),
@@ -43,7 +43,7 @@ index 71e88c4..8ce3987 100644
43 install_dir : glib_pkgconfigreldir, 43 install_dir : glib_pkgconfigreldir,
44 filebase : 'gio-2.0', 44 filebase : 'gio-2.0',
45diff --git a/glib/meson.build b/glib/meson.build 45diff --git a/glib/meson.build b/glib/meson.build
46index 91a48f1..978fb73 100644 46index aaf5f00..1e0992b 100644
47--- a/glib/meson.build 47--- a/glib/meson.build
48+++ b/glib/meson.build 48+++ b/glib/meson.build
49@@ -375,9 +375,9 @@ pkg.generate(libglib, 49@@ -375,9 +375,9 @@ pkg.generate(libglib,
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
index d8cf269bb8..16f2d31496 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
@@ -1,4 +1,4 @@
1From 15f807481de53942525b48952c5b6bbb9fb66542 Mon Sep 17 00:00:00 2001 1From c94e669de98a3892c699bd8d0d2b5164b2de747e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 15 Mar 2014 22:42:29 -0700 3Date: Sat, 15 Mar 2014 22:42:29 -0700
4Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux 4Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux
@@ -9,7 +9,7 @@ based systems therefore lets set DATADIRNAME to "share".
9Signed-off-by: Khem Raj <raj.khem@gmail.com> 9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10Upstream-Status: Pending 10Upstream-Status: Pending
11 11
12%% original patch: uclibc_musl_translation.patch 12
13--- 13---
14 m4macros/glib-gettext.m4 | 4 ++++ 14 m4macros/glib-gettext.m4 | 4 ++++
15 1 file changed, 4 insertions(+) 15 1 file changed, 4 insertions(+)
@@ -29,6 +29,3 @@ index df6fbf0..47db864 100644
29 *) 29 *)
30 CATOBJEXT=.mo 30 CATOBJEXT=.mo
31 DATADIRNAME=lib 31 DATADIRNAME=lib
32--
332.17.1
34
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 a3d71f2b7a..597864d9ac 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 @@
1From d29dfba67b1808eea6d428085f95b6e42cf2d1e4 Mon Sep 17 00:00:00 2001 1From 0015db45cd1bfefc04959dffab5dabeead93136f Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com> 2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Tue, 22 Mar 2016 15:14:58 +0200 3Date: Tue, 22 Mar 2016 15:14:58 +0200
4Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM 4Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM
@@ -14,10 +14,10 @@ Upstream-Status: Inappropriate [OE specific]
14 1 file changed, 1 insertion(+) 14 1 file changed, 1 insertion(+)
15 15
16diff --git a/gio/meson.build b/gio/meson.build 16diff --git a/gio/meson.build b/gio/meson.build
17index 4e5e021..90a741a 100644 17index 2ef60ed..532b086 100644
18--- a/gio/meson.build 18--- a/gio/meson.build
19+++ b/gio/meson.build 19+++ b/gio/meson.build
20@@ -940,6 +940,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu 20@@ -936,6 +936,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
21 c_args : gio_c_args, 21 c_args : gio_c_args,
22 # intl.lib is not compatible with SAFESEH 22 # intl.lib is not compatible with SAFESEH
23 link_args : noseh_link_args, 23 link_args : noseh_link_args,
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
index 67ca6240bc..6fd93526ce 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
@@ -1,7 +1,7 @@
1From 2acf40361eecd17c6981743dabd06e25a9934258 Mon Sep 17 00:00:00 2001 1From 4f47b8a8d650d185aa61aec2f56a283522a723c4 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 12 Jun 2015 17:08:46 +0300 3Date: Fri, 12 Jun 2015 17:08:46 +0300
4Subject: [PATCH 05/10] Remove the warning about deprecated paths in schemas 4Subject: [PATCH] Remove the warning about deprecated paths in schemas
5 5
6Some schemas in gsettings-desktop-schemas (such as proxy and locale) 6Some schemas in gsettings-desktop-schemas (such as proxy and locale)
7are still using deprecated paths, as of 3.16.1. This causes warning 7are still using deprecated paths, as of 3.16.1. This causes warning
@@ -15,10 +15,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
15 1 file changed, 13 deletions(-) 15 1 file changed, 13 deletions(-)
16 16
17diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c 17diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
18index b8de090..130f89b 100644 18index 7888120..7acbd5b 100644
19--- a/gio/glib-compile-schemas.c 19--- a/gio/glib-compile-schemas.c
20+++ b/gio/glib-compile-schemas.c 20+++ b/gio/glib-compile-schemas.c
21@@ -1219,19 +1219,6 @@ parse_state_start_schema (ParseState *state, 21@@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState *state,
22 return; 22 return;
23 } 23 }
24 24
@@ -38,6 +38,3 @@ index b8de090..130f89b 100644
38 state->schema_state = schema_state_new (path, gettext_domain, 38 state->schema_state = schema_state_new (path, gettext_domain,
39 extends, extends_name, list_of); 39 extends, extends_name, list_of);
40 40
41--
422.14.1
43
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
index b02169e09b..d075cd3f23 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
@@ -1,4 +1,4 @@
1From cfff734af6bff6a30a649f784ecf698658c01884 Mon Sep 17 00:00:00 2001 1From d3334e83ae0da9ca184eb9c8daf0854544ece023 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 13 Feb 2019 15:32:05 +0100 3Date: Wed, 13 Feb 2019 15:32:05 +0100
4Subject: [PATCH] Set host_machine correctly when building with mingw32 4Subject: [PATCH] Set host_machine correctly when building with mingw32
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14 4 files changed, 9 insertions(+), 6 deletions(-) 14 4 files changed, 9 insertions(+), 6 deletions(-)
15 15
16diff --git a/gio/tests/meson.build b/gio/tests/meson.build 16diff --git a/gio/tests/meson.build b/gio/tests/meson.build
17index 95aafc1..9025eb2 100644 17index dab65d2..e8bb2ee 100644
18--- a/gio/tests/meson.build 18--- a/gio/tests/meson.build
19+++ b/gio/tests/meson.build 19+++ b/gio/tests/meson.build
20@@ -13,7 +13,7 @@ test_c_args = [ 20@@ -12,7 +12,7 @@ test_c_args = [
21 '-UG_DISABLE_ASSERT', 21 '-UG_DISABLE_ASSERT',
22 ] 22 ]
23 23
@@ -26,7 +26,7 @@ index 95aafc1..9025eb2 100644
26 common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] 26 common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')]
27 endif 27 endif
28 28
29@@ -120,7 +120,7 @@ if dbus1_dep.found() 29@@ -132,7 +132,7 @@ else
30 endif 30 endif
31 31
32 # Test programs buildable on UNIX only 32 # Test programs buildable on UNIX only
@@ -35,7 +35,7 @@ index 95aafc1..9025eb2 100644
35 gio_tests += { 35 gio_tests += {
36 'file' : {}, 36 'file' : {},
37 'gdbus-peer' : { 37 'gdbus-peer' : {
38@@ -332,7 +332,7 @@ if host_machine.system() != 'windows' 38@@ -384,7 +384,7 @@ if host_machine.system() != 'windows'
39 endif # unix 39 endif # unix
40 40
41 # Test programs buildable on Windows only 41 # Test programs buildable on Windows only
@@ -44,7 +44,7 @@ index 95aafc1..9025eb2 100644
44 gio_tests += {'win32-streams' : {}} 44 gio_tests += {'win32-streams' : {}}
45 endif 45 endif
46 46
47@@ -397,7 +397,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' 47@@ -454,7 +454,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
48 } 48 }
49 endif 49 endif
50 50
@@ -54,10 +54,10 @@ index 95aafc1..9025eb2 100644
54 'gdbus-example-unix-fd-client' : { 54 'gdbus-example-unix-fd-client' : {
55 'install' : false, 55 'install' : false,
56diff --git a/glib/tests/meson.build b/glib/tests/meson.build 56diff --git a/glib/tests/meson.build b/glib/tests/meson.build
57index c47133f..cad975f 100644 57index 3dedafc..94605e6 100644
58--- a/glib/tests/meson.build 58--- a/glib/tests/meson.build
59+++ b/glib/tests/meson.build 59+++ b/glib/tests/meson.build
60@@ -132,7 +132,7 @@ if glib_conf.has('HAVE_EVENTFD') 60@@ -134,7 +134,7 @@ if glib_conf.has('HAVE_EVENTFD')
61 } 61 }
62 endif 62 endif
63 63
@@ -67,7 +67,7 @@ index c47133f..cad975f 100644
67 glib_tests += { 67 glib_tests += {
68 'gpoll' : { 68 'gpoll' : {
69diff --git a/meson.build b/meson.build 69diff --git a/meson.build b/meson.build
70index 717d1bc..2a3beb8 100644 70index e1b4b79..afb6eaa 100644
71--- a/meson.build 71--- a/meson.build
72+++ b/meson.build 72+++ b/meson.build
73@@ -32,6 +32,9 @@ else 73@@ -32,6 +32,9 @@ else
@@ -81,10 +81,10 @@ index 717d1bc..2a3beb8 100644
81 glib_version = meson.project_version() 81 glib_version = meson.project_version()
82 glib_api_version = '2.0' 82 glib_api_version = '2.0'
83diff --git a/tests/meson.build b/tests/meson.build 83diff --git a/tests/meson.build b/tests/meson.build
84index ce30442..5710f2c 100644 84index 6741f8f..12fdc90 100644
85--- a/tests/meson.build 85--- a/tests/meson.build
86+++ b/tests/meson.build 86+++ b/tests/meson.build
87@@ -66,7 +66,7 @@ test_extra_programs = { 87@@ -73,7 +73,7 @@ test_extra_programs = {
88 'unicode-collate' : {}, 88 'unicode-collate' : {},
89 } 89 }
90 90
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch
index 3dfef176fd..d33fdd4d8b 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch
@@ -1,4 +1,4 @@
1From 730803f2bc3f2f1a74f4db809a224066e7eae114 Mon Sep 17 00:00:00 2001 1From 92de6c7eb30b961b24a2dce812d5276487b7d23d Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 8 Jan 2020 18:22:46 +0100 3Date: Wed, 8 Jan 2020 18:22:46 +0100
4Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test 4Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test
@@ -8,6 +8,7 @@ not cross-compatible (hardcodes ld and objcopy).
8 8
9Upstream-Status: Inappropriate [oe-core specific] 9Upstream-Status: Inappropriate [oe-core specific]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11
11--- 12---
12 gio/tests/resources.c | 2 +- 13 gio/tests/resources.c | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch
index 833ad2540e..44482dd2b7 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch
@@ -1,4 +1,4 @@
1From cce617bec254e327ed7bcad60f58208024c6dc42 Mon Sep 17 00:00:00 2001 1From 4b97f457b7b44117e27d2a218c4b68e7fe3fe4ce Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 12 Oct 2019 17:46:26 -0700 3Date: Sat, 12 Oct 2019 17:46:26 -0700
4Subject: [PATCH] meson: Run atomics test on clang as well 4Subject: [PATCH] meson: Run atomics test on clang as well
@@ -9,15 +9,16 @@ Fixes
9 9
10Upstream-Status: Pending 10Upstream-Status: Pending
11Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12
12--- 13---
13 meson.build | 2 +- 14 meson.build | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
15 16
16diff --git a/meson.build b/meson.build 17diff --git a/meson.build b/meson.build
17index 9731de4..c678931 100644 18index afb6eaa..6aa70f5 100644
18--- a/meson.build 19--- a/meson.build
19+++ b/meson.build 20+++ b/meson.build
20@@ -1634,7 +1634,7 @@ atomicdefine = ''' 21@@ -1692,7 +1692,7 @@ atomicdefine = '''
21 # We know that we can always use real ("lock free") atomic operations with MSVC 22 # We know that we can always use real ("lock free") atomic operations with MSVC
22 if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops') 23 if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops')
23 have_atomic_lock_free = true 24 have_atomic_lock_free = true
@@ -26,6 +27,3 @@ index 9731de4..c678931 100644
26 # Old gcc release may provide 27 # Old gcc release may provide
27 # __sync_bool_compare_and_swap but doesn't define 28 # __sync_bool_compare_and_swap but doesn't define
28 # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 29 # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
29--
302.23.0
31
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch b/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch
index 872340df96..1c645f3a9a 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch
@@ -1,10 +1,11 @@
1From b9160d951b9af647b97766c57295ca4f45cf9521 Mon Sep 17 00:00:00 2001 1From 79ce7e545dd3a93f77d2146d50b6fa061fbceed9 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 3 Oct 2017 10:45:55 +0300 3Date: Tue, 3 Oct 2017 10:45:55 +0300
4Subject: [PATCH 10/10] Do not hardcode python path into various tools 4Subject: [PATCH] Do not hardcode python path into various tools
5 5
6Upstream-Status: Inappropriate [oe-core specific] 6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8
8--- 9---
9 gio/gdbus-2.0/codegen/gdbus-codegen.in | 2 +- 10 gio/gdbus-2.0/codegen/gdbus-codegen.in | 2 +-
10 gobject/glib-genmarshal.in | 2 +- 11 gobject/glib-genmarshal.in | 2 +-
@@ -12,7 +13,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12 3 files changed, 3 insertions(+), 3 deletions(-) 13 3 files changed, 3 insertions(+), 3 deletions(-)
13 14
14diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in 15diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
15index 8050981..e693ef3 100755 16index 67d3675..4e92a7a 100755
16--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in 17--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
17+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in 18+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
18@@ -1,4 +1,4 @@ 19@@ -1,4 +1,4 @@
@@ -22,7 +23,7 @@ index 8050981..e693ef3 100755
22 # GDBus - GLib D-Bus Library 23 # GDBus - GLib D-Bus Library
23 # 24 #
24diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in 25diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in
25index 09e8408..b2f9d99 100755 26index 7380f24..c8abeaa 100755
26--- a/gobject/glib-genmarshal.in 27--- a/gobject/glib-genmarshal.in
27+++ b/gobject/glib-genmarshal.in 28+++ b/gobject/glib-genmarshal.in
28@@ -1,4 +1,4 @@ 29@@ -1,4 +1,4 @@
@@ -32,7 +33,7 @@ index 09e8408..b2f9d99 100755
32 # pylint: disable=too-many-lines, missing-docstring, invalid-name 33 # pylint: disable=too-many-lines, missing-docstring, invalid-name
33 34
34diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in 35diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
35index d4bfd11..051fce4 100755 36index 91ad779..3ebef62 100755
36--- a/gobject/glib-mkenums.in 37--- a/gobject/glib-mkenums.in
37+++ b/gobject/glib-mkenums.in 38+++ b/gobject/glib-mkenums.in
38@@ -1,4 +1,4 @@ 39@@ -1,4 +1,4 @@
@@ -41,6 +42,3 @@ index d4bfd11..051fce4 100755
41 42
42 # If the code below looks horrible and unpythonic, do not panic. 43 # If the code below looks horrible and unpythonic, do not panic.
43 # 44 #
44--
452.14.1
46
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0011-GMainContext-Fix-GSource-iterator-if-iteration-can-m.patch b/meta/recipes-core/glib-2.0/glib-2.0/0011-GMainContext-Fix-GSource-iterator-if-iteration-can-m.patch
deleted file mode 100644
index 37b77d567c..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0011-GMainContext-Fix-GSource-iterator-if-iteration-can-m.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From ef2be42998e3fc10299055a5a01f7c791538174c Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
3Date: Mon, 3 Feb 2020 15:38:28 +0200
4Subject: [PATCH] GMainContext - Fix GSource iterator if iteration can modify
5 the list
6
7We first have to ref the next source and then unref the previous one.
8This might be the last reference to the previous source, and freeing the
9previous source might unref and free the next one which would then leave
10use with a dangling pointer here.
11
12Fixes https://gitlab.gnome.org/GNOME/glib/issues/2031
13
14Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/b06c48de7554607ff3fb58d6c0510cfa5088e909]
15
16---
17 glib/gmain.c | 8 ++++++--
18 1 file changed, 6 insertions(+), 2 deletions(-)
19
20diff --git a/glib/gmain.c b/glib/gmain.c
21index af979c8..a9a287d 100644
22--- a/glib/gmain.c
23+++ b/glib/gmain.c
24@@ -969,13 +969,17 @@ g_source_iter_next (GSourceIter *iter, GSource **source)
25 * GSourceList to be removed from source_lists (if iter->source is
26 * the only source in its list, and it is destroyed), so we have to
27 * keep it reffed until after we advance iter->current_list, above.
28+ *
29+ * Also we first have to ref the next source before unreffing the
30+ * previous one as unreffing the previous source can potentially
31+ * free the next one.
32 */
33+ if (next_source && iter->may_modify)
34+ g_source_ref (next_source);
35
36 if (iter->source && iter->may_modify)
37 g_source_unref_internal (iter->source, iter->context, TRUE);
38 iter->source = next_source;
39- if (iter->source && iter->may_modify)
40- g_source_ref (iter->source);
41
42 *source = iter->source;
43 return *source != NULL;
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0012-GMainContext-Fix-memory-leaks-and-memory-corruption-.patch b/meta/recipes-core/glib-2.0/glib-2.0/0012-GMainContext-Fix-memory-leaks-and-memory-corruption-.patch
deleted file mode 100644
index cf97d9d3db..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0012-GMainContext-Fix-memory-leaks-and-memory-corruption-.patch
+++ /dev/null
@@ -1,109 +0,0 @@
1From 611430a32a46d0dc806a829161e2dccf9c0196a8 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
3Date: Mon, 3 Feb 2020 15:35:51 +0200
4Subject: [PATCH] GMainContext - Fix memory leaks and memory corruption when
5 freeing sources while freeing a context
6
7Instead of destroying sources directly while freeing the context, and
8potentially freeing them if this was the last reference to them, collect
9new references of all sources in a separate list before and at the same
10time invalidate their context so that they can't access it anymore. Only
11once all sources have their context invalidated, destroy them while
12still keeping a reference to them. Once all sources are destroyed we get
13rid of the additional references and free them if nothing else keeps a
14reference to them anymore.
15
16This fixes a regression introduced by 26056558be in 2012.
17
18The previous code that invalidated the context of each source and then
19destroyed it before going to the next source without keeping an
20additional reference caused memory leaks or memory corruption depending
21on the order of the sources in the sources lists.
22
23If a source was destroyed it might happen that this was the last
24reference to this source, and it would then be freed. This would cause
25the finalize function to be called, which might destroy and unref
26another source and potentially free it. This other source would then
27either
28- go through the normal free logic and change the intern linked list
29 between the sources, while other sources that are unreffed as part of
30 the main context freeing would not. As such the list would be in an
31 inconsistent state and we might dereference freed memory.
32- go through the normal destroy and free logic but because the context
33 pointer was already invalidated it would simply mark the source as
34 destroyed without actually removing it from the context. This would
35 then cause a memory leak because the reference owned by the context is
36 not freed.
37
38Fixes https://github.com/gtk-rs/glib/issues/583 while still keeping
39https://bugzilla.gnome.org/show_bug.cgi?id=661767 fixes.
40
41Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/aa20167d419c649f34fed06a9463890b41b1eba0]
42
43---
44 glib/gmain.c | 35 ++++++++++++++++++++++++++++++++++-
45 1 file changed, 34 insertions(+), 1 deletion(-)
46
47diff --git a/glib/gmain.c b/glib/gmain.c
48index a9a287d..10ba2f8 100644
49--- a/glib/gmain.c
50+++ b/glib/gmain.c
51@@ -538,6 +538,7 @@ g_main_context_unref (GMainContext *context)
52 GSourceIter iter;
53 GSource *source;
54 GList *sl_iter;
55+ GSList *s_iter, *remaining_sources = NULL;
56 GSourceList *list;
57 guint i;
58
59@@ -557,10 +558,30 @@ g_main_context_unref (GMainContext *context)
60
61 /* g_source_iter_next() assumes the context is locked. */
62 LOCK_CONTEXT (context);
63- g_source_iter_init (&iter, context, TRUE);
64+
65+ /* First collect all remaining sources from the sources lists and store a
66+ * new reference in a separate list. Also set the context of the sources
67+ * to NULL so that they can't access a partially destroyed context anymore.
68+ *
69+ * We have to do this first so that we have a strong reference to all
70+ * sources and destroying them below does not also free them, and so that
71+ * none of the sources can access the context from their finalize/dispose
72+ * functions. */
73+ g_source_iter_init (&iter, context, FALSE);
74 while (g_source_iter_next (&iter, &source))
75 {
76 source->context = NULL;
77+ remaining_sources = g_slist_prepend (remaining_sources, g_source_ref (source));
78+ }
79+ g_source_iter_clear (&iter);
80+
81+ /* Next destroy all sources. As we still hold a reference to all of them,
82+ * this won't cause any of them to be freed yet and especially prevents any
83+ * source that unrefs another source from its finalize function to be freed.
84+ */
85+ for (s_iter = remaining_sources; s_iter; s_iter = s_iter->next)
86+ {
87+ source = s_iter->data;
88 g_source_destroy_internal (source, context, TRUE);
89 }
90 UNLOCK_CONTEXT (context);
91@@ -585,6 +606,18 @@ g_main_context_unref (GMainContext *context)
92 g_cond_clear (&context->cond);
93
94 g_free (context);
95+
96+ /* And now finally get rid of our references to the sources. This will cause
97+ * them to be freed unless something else still has a reference to them. Due
98+ * to setting the context pointers in the sources to NULL above, this won't
99+ * ever access the context or the internal linked list inside the GSource.
100+ * We already removed the sources completely from the context above. */
101+ for (s_iter = remaining_sources; s_iter; s_iter = s_iter->next)
102+ {
103+ source = s_iter->data;
104+ g_source_unref_internal (source, NULL, FALSE);
105+ }
106+ g_slist_free (remaining_sources);
107 }
108
109 /* Helper function used by mainloop/overflow test.
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0013-GMainContext-Move-mutex-unlocking-in-destructor-righ.patch b/meta/recipes-core/glib-2.0/glib-2.0/0013-GMainContext-Move-mutex-unlocking-in-destructor-righ.patch
deleted file mode 100644
index 4c9e9f5182..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0013-GMainContext-Move-mutex-unlocking-in-destructor-righ.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 3e9d85f1b75e2b1096d9643563d7d17380752fc7 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
3Date: Tue, 11 Feb 2020 09:34:38 +0200
4Subject: [PATCH] GMainContext - Move mutex unlocking in destructor right
5 before freeing the mutex
6
7This does not have any behaviour changes but is cleaner. The mutex is
8only unlocked now after all operations on the context are done and right
9before freeing the mutex and the context itself.
10
11Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/730a75fc8e8271c38fbd5363d1f77a00876b9ddc]
12
13---
14 glib/gmain.c | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/glib/gmain.c b/glib/gmain.c
18index 10ba2f8..b1df470 100644
19--- a/glib/gmain.c
20+++ b/glib/gmain.c
21@@ -584,7 +584,6 @@ g_main_context_unref (GMainContext *context)
22 source = s_iter->data;
23 g_source_destroy_internal (source, context, TRUE);
24 }
25- UNLOCK_CONTEXT (context);
26
27 for (sl_iter = context->source_lists; sl_iter; sl_iter = sl_iter->next)
28 {
29@@ -595,6 +594,7 @@ g_main_context_unref (GMainContext *context)
30
31 g_hash_table_destroy (context->sources);
32
33+ UNLOCK_CONTEXT (context);
34 g_mutex_clear (&context->mutex);
35
36 g_ptr_array_free (context->pending_dispatches, TRUE);
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 48899ce852..41ecfa1df8 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,4 +1,4 @@
1From 0061d66057dfd7e7267772df60b36474fb180eed Mon Sep 17 00:00:00 2001 1From 7cde170afe6854d674b50e32b4c1d3b511be9abe Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com> 2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Mon, 9 Nov 2015 11:07:27 +0200 3Date: Mon, 9 Nov 2015 11:07:27 +0200
4Subject: [PATCH] Enable more tests while cross-compiling 4Subject: [PATCH] Enable more tests while cross-compiling
@@ -15,10 +15,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
15 1 file changed, 12 insertions(+), 12 deletions(-) 15 1 file changed, 12 insertions(+), 12 deletions(-)
16 16
17diff --git a/gio/tests/meson.build b/gio/tests/meson.build 17diff --git a/gio/tests/meson.build b/gio/tests/meson.build
18index 382dfcc..c171717 100644 18index 788cf97..dab65d2 100644
19--- a/gio/tests/meson.build 19--- a/gio/tests/meson.build
20+++ b/gio/tests/meson.build 20+++ b/gio/tests/meson.build
21@@ -191,7 +191,7 @@ if host_machine.system() != 'windows' 21@@ -203,7 +203,7 @@ if host_machine.system() != 'windows'
22 22
23 # Test programs that need to bring up a session bus (requires dbus-daemon) 23 # Test programs that need to bring up a session bus (requires dbus-daemon)
24 have_dbus_daemon = find_program('dbus-daemon', required : false).found() 24 have_dbus_daemon = find_program('dbus-daemon', required : false).found()
@@ -27,8 +27,8 @@ index 382dfcc..c171717 100644
27 annotate_args = [ 27 annotate_args = [
28 '--annotate', 'org.project.Bar', 'Key1', 'Value1', 28 '--annotate', 'org.project.Bar', 'Key1', 'Value1',
29 '--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2', 29 '--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2',
30@@ -465,12 +465,12 @@ if installed_tests_enabled 30@@ -548,12 +548,12 @@ if installed_tests_enabled
31 install_data('static-link.py', install_dir : installed_tests_execdir) 31 endforeach
32 endif 32 endif
33 33
34-if not meson.is_cross_build() or meson.has_exe_wrapper() 34-if not meson.is_cross_build() or meson.has_exe_wrapper()
@@ -42,7 +42,7 @@ index 382dfcc..c171717 100644
42 '--target=@OUTPUT@', 42 '--target=@OUTPUT@',
43 '--sourcedir=' + meson.current_source_dir(), 43 '--sourcedir=' + meson.current_source_dir(),
44 '--generate-source', 44 '--generate-source',
45@@ -494,7 +494,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() 45@@ -577,7 +577,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
46 test_gresource = custom_target('test.gresource', 46 test_gresource = custom_target('test.gresource',
47 input : 'test.gresource.xml', 47 input : 'test.gresource.xml',
48 output : 'test.gresource', 48 output : 'test.gresource',
@@ -51,7 +51,7 @@ index 382dfcc..c171717 100644
51 '--target=@OUTPUT@', 51 '--target=@OUTPUT@',
52 '--sourcedir=' + meson.current_source_dir(), 52 '--sourcedir=' + meson.current_source_dir(),
53 '--sourcedir=' + meson.current_build_dir(), 53 '--sourcedir=' + meson.current_build_dir(),
54@@ -505,7 +505,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() 54@@ -588,7 +588,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
55 test_resources2_c = custom_target('test_resources2.c', 55 test_resources2_c = custom_target('test_resources2.c',
56 input : 'test3.gresource.xml', 56 input : 'test3.gresource.xml',
57 output : 'test_resources2.c', 57 output : 'test_resources2.c',
@@ -60,7 +60,7 @@ index 382dfcc..c171717 100644
60 '--target=@OUTPUT@', 60 '--target=@OUTPUT@',
61 '--sourcedir=' + meson.current_source_dir(), 61 '--sourcedir=' + meson.current_source_dir(),
62 '--generate', 62 '--generate',
63@@ -516,7 +516,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() 63@@ -599,7 +599,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
64 test_resources2_h = custom_target('test_resources2.h', 64 test_resources2_h = custom_target('test_resources2.h',
65 input : 'test3.gresource.xml', 65 input : 'test3.gresource.xml',
66 output : 'test_resources2.h', 66 output : 'test_resources2.h',
@@ -69,7 +69,7 @@ index 382dfcc..c171717 100644
69 '--target=@OUTPUT@', 69 '--target=@OUTPUT@',
70 '--sourcedir=' + meson.current_source_dir(), 70 '--sourcedir=' + meson.current_source_dir(),
71 '--generate', 71 '--generate',
72@@ -528,7 +528,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() 72@@ -611,7 +611,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
73 input : 'test2.gresource.xml', 73 input : 'test2.gresource.xml',
74 depends : big_test_resource, 74 depends : big_test_resource,
75 output : 'test_resources.c', 75 output : 'test_resources.c',
@@ -78,7 +78,7 @@ index 382dfcc..c171717 100644
78 '--target=@OUTPUT@', 78 '--target=@OUTPUT@',
79 '--sourcedir=' + meson.current_source_dir(), 79 '--sourcedir=' + meson.current_source_dir(),
80 '--sourcedir=' + meson.current_build_dir(), 80 '--sourcedir=' + meson.current_build_dir(),
81@@ -539,7 +539,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() 81@@ -622,7 +622,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
82 digit_test_resources_c = custom_target('digit_test_resources.c', 82 digit_test_resources_c = custom_target('digit_test_resources.c',
83 input : '111_digit_test.gresource.xml', 83 input : '111_digit_test.gresource.xml',
84 output : 'digit_test_resources.c', 84 output : 'digit_test_resources.c',
@@ -87,7 +87,7 @@ index 382dfcc..c171717 100644
87 '--target=@OUTPUT@', 87 '--target=@OUTPUT@',
88 '--sourcedir=' + meson.current_source_dir(), 88 '--sourcedir=' + meson.current_source_dir(),
89 '--sourcedir=' + meson.current_build_dir(), 89 '--sourcedir=' + meson.current_build_dir(),
90@@ -550,7 +550,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() 90@@ -633,7 +633,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
91 digit_test_resources_h = custom_target('digit_test_resources.h', 91 digit_test_resources_h = custom_target('digit_test_resources.h',
92 input : '111_digit_test.gresource.xml', 92 input : '111_digit_test.gresource.xml',
93 output : 'digit_test_resources.h', 93 output : 'digit_test_resources.h',
@@ -96,11 +96,11 @@ index 382dfcc..c171717 100644
96 '--target=@OUTPUT@', 96 '--target=@OUTPUT@',
97 '--sourcedir=' + meson.current_source_dir(), 97 '--sourcedir=' + meson.current_source_dir(),
98 '--generate', 98 '--generate',
99@@ -579,11 +579,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() 99@@ -668,11 +668,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
100 # LLVM once that support is in a stable release.
101 objcopy = find_program('objcopy', required : false)
102 100
103- if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() 101 ld = find_program('ld', required : false)
102
103- if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
104+ if not meson.is_cross_build() 104+ if not meson.is_cross_build()
105 test_gresource_binary = custom_target('test5.gresource', 105 test_gresource_binary = custom_target('test5.gresource',
106 input : 'test5.gresource.xml', 106 input : 'test5.gresource.xml',
@@ -110,7 +110,7 @@ index 382dfcc..c171717 100644
110 '--target=@OUTPUT@', 110 '--target=@OUTPUT@',
111 '--sourcedir=' + meson.current_source_dir(), 111 '--sourcedir=' + meson.current_source_dir(),
112 '--sourcedir=' + meson.current_build_dir(), 112 '--sourcedir=' + meson.current_build_dir(),
113@@ -595,7 +595,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() 113@@ -684,7 +684,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
114 test_resources_binary_c = custom_target('test_resources_binary.c', 114 test_resources_binary_c = custom_target('test_resources_binary.c',
115 input : 'test5.gresource.xml', 115 input : 'test5.gresource.xml',
116 output : 'test_resources_binary.c', 116 output : 'test_resources_binary.c',
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 fc320dcab8..fe87482ae2 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 @@
1From 8c623acdbea3ecc2812bbaafcfc892758fa978da Mon Sep 17 00:00:00 2001 1From 2a715765c6ceb2e8b4cc42e060aee75016111d1a Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Fri, 11 Mar 2016 15:35:55 +0000 3Date: Fri, 11 Mar 2016 15:35:55 +0000
4Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds 4Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
@@ -19,11 +19,11 @@ 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
21diff --git a/gio/giomodule.c b/gio/giomodule.c 21diff --git a/gio/giomodule.c b/gio/giomodule.c
22index 1007abd..5380982 100644 22index c420260..a023745 100644
23--- a/gio/giomodule.c 23--- a/gio/giomodule.c
24+++ b/gio/giomodule.c 24+++ b/gio/giomodule.c
25@@ -44,6 +44,8 @@ 25@@ -47,6 +47,8 @@
26 #include "gnetworkmonitor.h" 26 #include "gmemorymonitordbus.h"
27 #ifdef G_OS_WIN32 27 #ifdef G_OS_WIN32
28 #include "gregistrysettingsbackend.h" 28 #include "gregistrysettingsbackend.h"
29+#else 29+#else
@@ -32,7 +32,7 @@ index 1007abd..5380982 100644
32 #include <glib/gstdio.h> 32 #include <glib/gstdio.h>
33 33
34@@ -1158,7 +1160,15 @@ get_gio_module_dir (void) 34@@ -1158,7 +1160,15 @@ get_gio_module_dir (void)
35 #endif 35 NULL);
36 g_free (install_dir); 36 g_free (install_dir);
37 #else 37 #else
38- module_dir = g_strdup (GIO_MODULE_DIR); 38- module_dir = g_strdup (GIO_MODULE_DIR);
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.64.2.bb
index d496235003..1a8e9d659e 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.64.2.bb
@@ -16,15 +16,12 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
16 file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ 16 file://0001-Do-not-write-bindir-into-pkg-config-files.patch \
17 file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ 17 file://0001-meson-Run-atomics-test-on-clang-as-well.patch \
18 file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ 18 file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \
19 file://0011-GMainContext-Fix-GSource-iterator-if-iteration-can-m.patch \
20 file://0012-GMainContext-Fix-memory-leaks-and-memory-corruption-.patch \
21 file://0013-GMainContext-Move-mutex-unlocking-in-destructor-righ.patch \
22 " 19 "
23 20
24SRC_URI_append_class-native = " file://relocate-modules.patch" 21SRC_URI_append_class-native = " file://relocate-modules.patch"
25 22
26SRC_URI[md5sum] = "d52234ecba128932bed90bbc3553bfe5" 23SRC_URI[md5sum] = "78b6bda8664763a09bd12d864c0ba46c"
27SRC_URI[sha256sum] = "4c84030d77fa9712135dfa8036ad663925655ae95b1d19399b6200e869925bbc" 24SRC_URI[sha256sum] = "9a2f21ed8f13b9303399de13a0252b7cbcede593d26971378ec6cb90e87f2277"
28 25
29# Find any meson cross files in FILESPATH that are relevant for the current 26# Find any meson cross files in FILESPATH that are relevant for the current
30# build (using siteinfo) and add them to EXTRA_OEMESON. 27# build (using siteinfo) and add them to EXTRA_OEMESON.
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 7ebed0e5fd..fb84db83c2 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -30,6 +30,8 @@ LEAD_SONAME = "libglib-2.0.*"
30 30
31inherit meson gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages features_check 31inherit meson gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages features_check
32 32
33DEPENDS_append_class-target = "${@' gtk-doc' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}"
34
33GTKDOC_MESON_OPTION = "gtk_doc" 35GTKDOC_MESON_OPTION = "gtk_doc"
34 36
35# This avoids the need to depend on target python3, which in case of mingw is not even possible. 37# This avoids the need to depend on target python3, which in case of mingw is not even possible.
@@ -42,7 +44,7 @@ PACKAGECONFIG ??= "system-pcre libmount \
42 ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" 44 ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
43# To use the system pcre it must be configured with --enable-unicode-properties 45# To use the system pcre it must be configured with --enable-unicode-properties
44PACKAGECONFIG[system-pcre] = "-Dinternal_pcre=false,-Dinternal_pcre=true,libpcre" 46PACKAGECONFIG[system-pcre] = "-Dinternal_pcre=false,-Dinternal_pcre=true,libpcre"
45PACKAGECONFIG[libmount] = "-Dlibmount=true,-Dlibmount=false,util-linux" 47PACKAGECONFIG[libmount] = "-Dlibmount=enabled,-Dlibmount=disabled,util-linux"
46PACKAGECONFIG[manpages] = "-Dman=true, -Dman=false, libxslt-native xmlto-native" 48PACKAGECONFIG[manpages] = "-Dman=true, -Dman=false, libxslt-native xmlto-native"
47# libelf is auto-detected without a configuration option 49# libelf is auto-detected without a configuration option
48PACKAGECONFIG[libelf] = ",,elfutils" 50PACKAGECONFIG[libelf] = ",,elfutils"
@@ -168,6 +170,8 @@ RDEPENDS_${PN}-ptest += "\
168 ${PN}-locale-th \ 170 ${PN}-locale-th \
169 python3-core \ 171 python3-core \
170 python3-modules \ 172 python3-modules \
173 python3-dbusmock \
174 ${PN}-codegen \
171 " 175 "
172 176
173RDEPENDS_${PN}-ptest_append_libc-glibc = "\ 177RDEPENDS_${PN}-ptest_append_libc-glibc = "\