summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
diff options
context:
space:
mode:
authorChristian Eggers <ceggers@arri.de>2022-03-25 07:51:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-03-26 09:33:32 +0000
commit40d6b6baaec1fdf45212f729bd5301c06a0955ec (patch)
tree727c3c2dfdb9efc56e37a6a0cf6d935f473a913c /meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
parente43cfbc69e859fe5a5f28125aa555a261165b6d8 (diff)
downloadpoky-40d6b6baaec1fdf45212f729bd5301c06a0955ec.tar.gz
glib-2.0: upgrade 2.70.4 -> 2.72.0
- 0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch: dropped (integrated upstream) News ==== * Bugs fixed: - #2620 g_time_zone_new_offset() assertion failure if offset >= 25 hours - #2538 Various unit test fixes - #2542 fuzzing: Fix test failure with G_DISABLE_ASSERT - #2547 gprintf: Fix a memory leak with an invalid format in g_vasprintf() - #2548 tests: Various fixes to gdbus-auth, gdbus-non-socket, gdbus-connection-flush, spawn-multithreaded tests - #2551 tests: More flaky test fixes to converter-stream and test-printf - #2552 gtlsconnection: fix typo in docs * Translation updates: - Czech - French - Friulian - Hebrew - Hungarian - Italian - Kazakh - Polish - Romanian - Serbian - Swedish (From OE-Core rev: bf088d1e9d13eca5b0fb1a4ab1cb689daaf1ff80) Signed-off-by: Christian Eggers <ceggers@arri.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch32
1 files changed, 17 insertions, 15 deletions
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 8a6d46df79..59de3fa969 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,11 +1,10 @@
1From 333809ded70ad4e3470b7134e3fac1a42ff48e61 Mon Sep 17 00:00:00 2001 1From 4f327be49fd6ac5a77da6e48459b37f37a601977 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
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
9--- 8---
10 gio/tests/meson.build | 8 ++++---- 9 gio/tests/meson.build | 8 ++++----
11 glib/tests/meson.build | 2 +- 10 glib/tests/meson.build | 2 +-
@@ -14,10 +13,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14 4 files changed, 9 insertions(+), 6 deletions(-) 13 4 files changed, 9 insertions(+), 6 deletions(-)
15 14
16diff --git a/gio/tests/meson.build b/gio/tests/meson.build 15diff --git a/gio/tests/meson.build b/gio/tests/meson.build
17index 3a19c82..b762835 100644 16index abe676767c60..34b347815308 100644
18--- a/gio/tests/meson.build 17--- a/gio/tests/meson.build
19+++ b/gio/tests/meson.build 18+++ b/gio/tests/meson.build
20@@ -27,7 +27,7 @@ test_c_args = [ 19@@ -27,7 +27,7 @@ if build_machine.system() == 'linux'
21 endif # libutil.length() > 0 20 endif # libutil.length() > 0
22 endif # build_machine.system() == 'linux' 21 endif # build_machine.system() == 'linux'
23 22
@@ -26,7 +25,7 @@ index 3a19c82..b762835 100644
26 common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] 25 common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')]
27 endif 26 endif
28 27
29@@ -148,7 +148,7 @@ else 28@@ -176,7 +176,7 @@ else
30 endif 29 endif
31 30
32 # Test programs buildable on UNIX only 31 # Test programs buildable on UNIX only
@@ -35,7 +34,7 @@ index 3a19c82..b762835 100644
35 gio_tests += { 34 gio_tests += {
36 'file' : {}, 35 'file' : {},
37 'gdbus-peer' : { 36 'gdbus-peer' : {
38@@ -402,7 +402,7 @@ if host_machine.system() != 'windows' 37@@ -434,7 +434,7 @@ if host_machine.system() != 'windows'
39 endif # unix 38 endif # unix
40 39
41 # Test programs buildable on Windows only 40 # Test programs buildable on Windows only
@@ -44,7 +43,7 @@ index 3a19c82..b762835 100644
44 gio_tests += {'win32-streams' : {}} 43 gio_tests += {'win32-streams' : {}}
45 endif 44 endif
46 45
47@@ -472,7 +472,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' 46@@ -504,7 +504,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
48 } 47 }
49 endif 48 endif
50 49
@@ -54,10 +53,10 @@ index 3a19c82..b762835 100644
54 'gdbus-example-unix-fd-client' : { 53 'gdbus-example-unix-fd-client' : {
55 'install' : false, 54 'install' : false,
56diff --git a/glib/tests/meson.build b/glib/tests/meson.build 55diff --git a/glib/tests/meson.build b/glib/tests/meson.build
57index 6eb23e8..36eb919 100644 56index a0c64afe6ae9..48407f99569c 100644
58--- a/glib/tests/meson.build 57--- a/glib/tests/meson.build
59+++ b/glib/tests/meson.build 58+++ b/glib/tests/meson.build
60@@ -142,7 +142,7 @@ if glib_conf.has('HAVE_EVENTFD') 59@@ -151,7 +151,7 @@ if glib_conf.has('HAVE_EVENTFD')
61 } 60 }
62 endif 61 endif
63 62
@@ -67,10 +66,10 @@ index 6eb23e8..36eb919 100644
67 glib_tests += { 66 glib_tests += {
68 'gpoll' : { 67 'gpoll' : {
69diff --git a/meson.build b/meson.build 68diff --git a/meson.build b/meson.build
70index 47f3a5c..7ea7ad1 100644 69index e0b14319fb58..f6756a3c7dfb 100644
71--- a/meson.build 70--- a/meson.build
72+++ b/meson.build 71+++ b/meson.build
73@@ -32,6 +32,9 @@ else 72@@ -54,6 +54,9 @@ else
74 endif 73 endif
75 74
76 host_system = host_machine.system() 75 host_system = host_machine.system()
@@ -81,15 +80,18 @@ index 47f3a5c..7ea7ad1 100644
81 if host_system == 'darwin' 80 if host_system == 'darwin'
82 ios_test_code = '''#include <TargetConditionals.h> 81 ios_test_code = '''#include <TargetConditionals.h>
83diff --git a/tests/meson.build b/tests/meson.build 82diff --git a/tests/meson.build b/tests/meson.build
84index 6741f8f..12fdc90 100644 83index 5ff99a4a8258..8a4dad0ccae7 100644
85--- a/tests/meson.build 84--- a/tests/meson.build
86+++ b/tests/meson.build 85+++ b/tests/meson.build
87@@ -73,7 +73,7 @@ test_extra_programs = { 86@@ -53,7 +53,7 @@ test_extra_programs = {
88 'unicode-collate' : {}, 87 'assert-msg-test' : {},
89 } 88 }
90 89
91-if host_machine.system() != 'windows' 90-if host_machine.system() != 'windows'
92+if host_system != 'windows' 91+if host_system != 'windows'
93 tests += { 92 tests += {
94 'timeloop' : {}, 93 'timeloop' : {},
95 'iochannel-test' : {}, 94 }
95--
962.34.1
97