glib-2.0: upgrade 2.70.4 -> 2.72.0
PATCH 1/1 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
---
...-correctly-when-building-with-mingw3.patch | 32 +++++++------
...degen.py-bump-timeout-to-100-seconds.patch | 26 ----------
...ble-more-tests-while-cross-compiling.patch | 48 ++++++++++---------
...{glib-2.0_2.70.4.bb => glib-2.0_2.72.0.bb} | 3 +-
4 files changed, 44 insertions(+), 65 deletions(-)
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch
rename meta/recipes-core/glib-2.0/{glib-2.0_2.70.4.bb => glib-2.0_2.72.0.bb} (93%)meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +17 -15
@@ -1,11 +1,10 @@ -From 333809ded70ad4e3470b7134e3fac1a42ff48e61 Mon Sep 17 00:00:00 2001 +From 4f327be49fd6ac5a77da6e48459b37f37a601977 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 13 Feb 2019 15:32:05 +0100 Subject: [PATCH] Set host_machine correctly when building with mingw32 Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]> - --- gio/tests/meson.build | 8 ++++---- glib/tests/meson.build | 2 +-
@@ -14,10 +13,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index 3a19c82..b762835 100644 +index abe676767c60..34b347815308 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build -@@ -27,7 +27,7 @@ test_c_args = [ +@@ -27,7 +27,7 @@ if build_machine.system() == 'linux' endif # libutil.length() > 0 endif # build_machine.system() == 'linux'
@@ -26,7 +25,7 @@ index 3a19c82..b762835 100644 common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] endif -@@ -148,7 +148,7 @@ else +@@ -176,7 +176,7 @@ else endif # Test programs buildable on UNIX only
@@ -35,7 +34,7 @@ index 3a19c82..b762835 100644 gio_tests += { 'file' : {}, 'gdbus-peer' : { -@@ -402,7 +402,7 @@ if host_machine.system() != 'windows' +@@ -434,7 +434,7 @@ if host_machine.system() != 'windows' endif # unix # Test programs buildable on Windows only
@@ -44,7 +43,7 @@ index 3a19c82..b762835 100644 gio_tests += {'win32-streams' : {}} endif -@@ -472,7 +472,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' +@@ -504,7 +504,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' } endif
@@ -54,10 +53,10 @@ index 3a19c82..b762835 100644 'gdbus-example-unix-fd-client' : { 'install' : false, diff --git a/glib/tests/meson.build b/glib/tests/meson.build -index 6eb23e8..36eb919 100644 +index a0c64afe6ae9..48407f99569c 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build -@@ -142,7 +142,7 @@ if glib_conf.has('HAVE_EVENTFD') +@@ -151,7 +151,7 @@ if glib_conf.has('HAVE_EVENTFD') } endif
@@ -67,10 +66,10 @@ index 6eb23e8..36eb919 100644 glib_tests += { 'gpoll' : { diff --git a/meson.build b/meson.build -index 47f3a5c..7ea7ad1 100644 +index e0b14319fb58..f6756a3c7dfb 100644 --- a/meson.build +++ b/meson.build -@@ -32,6 +32,9 @@ else +@@ -54,6 +54,9 @@ else endif host_system = host_machine.system()
@@ -81,15 +80,18 @@ index 47f3a5c..7ea7ad1 100644 if host_system == 'darwin' ios_test_code = '''#include <TargetConditionals.h> diff --git a/tests/meson.build b/tests/meson.build -index 6741f8f..12fdc90 100644 +index 5ff99a4a8258..8a4dad0ccae7 100644 --- a/tests/meson.build +++ b/tests/meson.build -@@ -73,7 +73,7 @@ test_extra_programs = { - 'unicode-collate' : {}, +@@ -53,7 +53,7 @@ test_extra_programs = { + 'assert-msg-test' : {}, } -if host_machine.system() != 'windows' +if host_system != 'windows' tests += { 'timeloop' : {}, - 'iochannel-test' : {}, + } +-- +2.34.1 +
meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch deleted +0 -26
@@ -1,26 +0,0 @@ -From b833254bcc9fcf4cdc2572027b1154d799535ca4 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Sun, 20 Dec 2020 22:01:43 +0100 -Subject: [PATCH] gio/tests/codegen.py: bump timeout to 100 seconds - -This may be necessary on overloaded CI systems. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2348] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - gio/tests/codegen.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gio/tests/codegen.py b/gio/tests/codegen.py -index 51de0ed..ca98c9d 100644 ---- a/gio/tests/codegen.py -+++ b/gio/tests/codegen.py -@@ -55,7 +55,7 @@ class TestCodegen(unittest.TestCase): - cwd = "" - - def setUp(self): -- self.timeout_seconds = 10 # seconds per test -+ self.timeout_seconds = 100 # seconds per test - self.tmpdir = tempfile.TemporaryDirectory() - self.cwd = os.getcwd() - os.chdir(self.tmpdir.name)
meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch +26 -22
137 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0_2.72.0.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.70.4.bb +1 -2
@@ -16,11 +16,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ - file://0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch \ " SRC_URI:append:class-native = " file://relocate-modules.patch" -SRC_URI[sha256sum] = "ab3d176f3115dcc4e5d02db795984e04e4f4b48d836252e23e8c468e9d423c33" +SRC_URI[sha256sum] = "d7bef0d4c4e7a62e08efb8e5f252a01357007b9588a87ff2b463a3857011f79d" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON.
Signature · 1 line
2.34.1