summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Volk <f_l_k@t-online.de>2024-12-15 12:17:35 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-12-17 11:41:53 +0000
commit2333609ac20698877cde5baa65e7540ca5d4fd65 (patch)
tree127a06edd6a131f5681cf589ee2b1cdbbeff27c1
parent48b0c58b34ef24d7a9066c52610da6c4324a890c (diff)
downloadpoky-2333609ac20698877cde5baa65e7540ca5d4fd65.tar.gz
glib-2.0: update 2.82.2 -> 2.82.4
- remove backported patches Overview of changes in GLib 2.82.4, 2024-12-11 ============================================== * Fix a double-unref crash which affects many apps which use pygobject to export objects on D-Bus (#3559, work by Sebastian Dröge, Philip Withnall) * Bugs fixed: - #3559 2.82.3 regression: lollypop crashes on startup (Philip Withnall) - !4430 Backport !4427 “Revert "gdbus: Fix leak of method invocation when registering an object with closures"” to glib-2-82 - !4434 Backport !4432 and !4433 “ci: Add release component to automate tarball publishing” to glib-2-82 Overview of changes in GLib 2.82.3, 2024-12-09 ============================================== * Fix compatibility with tzdata 2024b (#3502, work by Rebecca N. Palmer and Simon McVittie) * Bugs fixed: - #3502 Test regressions with tzdata 2024b (Rebecca N. Palmer) - !4357 Backport !4356 “gdatetime test: Do not assume PST8PDT was always exactly -8/-7” to glib-2-82 - !4370 Backport !4350 “glib: Don't require GLIB_DOMAIN to be a NUL-terminated string” to glib-2-82 - !4380 Backport !4378 “gio: Fix GFileEnumerator leaks in gio tools” to glib-2-82 - !4381 Backport !4373 “macos: Remove extraous space from type identifier” to glib-2-82 - !4388 Backport !4232 “refstring: Fix race between releasing and re-acquiring an interned GRefString” to glib-2-82 - !4397 Backport !4395 “appmonitor: Fix warning building test” to glib-2-82 - !4400 Backport !4398 “grefstring: Mark a variable as potentially unused” to glib-2-82 - !4417 Backport !4415 “gdbus: Fix leak of method invocation when registering an object with closures” to glib-2-82 (From OE-Core rev: 63a276d65a2cc34a8cd7756091f7f0b3908cf625) Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0001.patch69
-rw-r--r--meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0002.patch62
-rw-r--r--meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0003.patch60
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0-initial_2.82.4.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0-initial_2.82.2.bb)0
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.82.4.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.82.2.bb)0
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc5
6 files changed, 1 insertions, 195 deletions
diff --git a/meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0001.patch b/meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0001.patch
deleted file mode 100644
index 2ee9a40d3d..0000000000
--- a/meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0001.patch
+++ /dev/null
@@ -1,69 +0,0 @@
1From fc893fe975126ca7d5fcf76b66b5c0ccbd4128d5 Mon Sep 17 00:00:00 2001
2From: "Rebecca N. Palmer" <rebecca_palmer@zoho.com>
3Date: Fri, 11 Oct 2024 09:38:52 +0100
4Subject: [PATCH] gdatetime test: Do not assume PST8PDT was always exactly
5 -8/-7
6
7In newer tzdata, it is an alias for America/Los_Angeles, which has a
8slightly different meaning: DST did not exist there before 1883. As a
9result, we can no longer hard-code the knowledge that interval 0 is
10standard time and interval 1 is summer time, and instead we need to look
11up the correct intervals from known timestamps.
12
13Resolves: https://gitlab.gnome.org/GNOME/glib/-/issues/3502
14Bug-Debian: https://bugs.debian.org/1084190
15[smcv: expand commit message, fix whitespace]
16Signed-off-by: Simon McVittie <smcv@debian.org>
17
18Upstream-Status: Backport
19[https://github.com/GNOME/glib/commit/c0619f08e6c608fd6464d2f0c6970ef0bbfb9ecf]
20
21Signed-off-by: Jinfeng Wang <jinfeng.wang.cn@windriver.com>
22---
23 glib/tests/gdatetime.c | 22 ++++++++++++++++------
24 1 file changed, 16 insertions(+), 6 deletions(-)
25
26diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c
27index d46f653..2eefc41 100644
28--- a/glib/tests/gdatetime.c
29+++ b/glib/tests/gdatetime.c
30@@ -2930,6 +2930,7 @@ test_posix_parse (void)
31 {
32 GTimeZone *tz;
33 GDateTime *gdt1, *gdt2;
34+ gint i1, i2;
35
36 /* Check that an unknown zone name falls back to UTC. */
37 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
38@@ -2953,16 +2954,25 @@ test_posix_parse (void)
39
40 /* This fails rules_from_identifier on Unix (though not on Windows)
41 * but passes anyway because PST8PDT is a zone name.
42+ *
43+ * Intervals i1 and i2 (rather than 0 and 1) are needed because in
44+ * recent tzdata, PST8PDT may be an alias for America/Los_Angeles,
45+ * and hence be aware that DST has not always existed.
46+ * https://bugs.debian.org/1084190
47 */
48 tz = g_time_zone_new_identifier ("PST8PDT");
49 g_assert_nonnull (tz);
50 g_assert_cmpstr (g_time_zone_get_identifier (tz), ==, "PST8PDT");
51- g_assert_cmpstr (g_time_zone_get_abbreviation (tz, 0), ==, "PST");
52- g_assert_cmpint (g_time_zone_get_offset (tz, 0), ==, - 8 * 3600);
53- g_assert (!g_time_zone_is_dst (tz, 0));
54- g_assert_cmpstr (g_time_zone_get_abbreviation (tz, 1), ==, "PDT");
55- g_assert_cmpint (g_time_zone_get_offset (tz, 1), ==,- 7 * 3600);
56- g_assert (g_time_zone_is_dst (tz, 1));
57+ /* a date in winter = non-DST */
58+ i1 = g_time_zone_find_interval (tz, G_TIME_TYPE_STANDARD, 0);
59+ /* approximately 6 months in seconds, i.e. a date in summer = DST */
60+ i2 = g_time_zone_find_interval (tz, G_TIME_TYPE_DAYLIGHT, 15000000);
61+ g_assert_cmpstr (g_time_zone_get_abbreviation (tz, i1), ==, "PST");
62+ g_assert_cmpint (g_time_zone_get_offset (tz, i1), ==, - 8 * 3600);
63+ g_assert (!g_time_zone_is_dst (tz, i1));
64+ g_assert_cmpstr (g_time_zone_get_abbreviation (tz, i2), ==, "PDT");
65+ g_assert_cmpint (g_time_zone_get_offset (tz, i2), ==,- 7 * 3600);
66+ g_assert (g_time_zone_is_dst (tz, i2));
67 g_time_zone_unref (tz);
68
69 tz = g_time_zone_new_identifier ("PST8PDT6:32:15");
diff --git a/meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0002.patch b/meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0002.patch
deleted file mode 100644
index a03d05f0bf..0000000000
--- a/meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0002.patch
+++ /dev/null
@@ -1,62 +0,0 @@
1From 1110f463fe084ba2675e044be2e045f7c0224a7f Mon Sep 17 00:00:00 2001
2From: Simon McVittie <smcv@debian.org>
3Date: Fri, 18 Oct 2024 11:03:19 +0100
4Subject: [PATCH] gdatetime test: Try to make PST8PDT test more obviously
5 correct
6
7Instead of using timestamp 0 as a magic number (in this case interpreted
8as 1970-01-01T00:00:00-08:00), calculate a timestamp from a recent
9year/month/day in winter, in this case 2024-01-01T00:00:00-08:00.
10
11Similarly, instead of using a timestamp 15 million seconds later
12(1970-06-23T15:40:00-07:00), calculate a timestamp from a recent
13year/month/day in summer, in this case 2024-07-01T00:00:00-07:00.
14
15Signed-off-by: Simon McVittie <smcv@debian.org>
16
17Upstream-Status: Backport
18[https://github.com/GNOME/glib/commit/30e9cfa5733003cd1079e0e9e8a4bff1a191171a]
19
20Signed-off-by: Jinfeng Wang <jinfeng.wang.cn@windriver.com>
21---
22 glib/tests/gdatetime.c | 15 +++++++--------
23 1 file changed, 7 insertions(+), 8 deletions(-)
24
25diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c
26index 2eefc41..728b873 100644
27--- a/glib/tests/gdatetime.c
28+++ b/glib/tests/gdatetime.c
29@@ -2954,19 +2954,16 @@ test_posix_parse (void)
30
31 /* This fails rules_from_identifier on Unix (though not on Windows)
32 * but passes anyway because PST8PDT is a zone name.
33- *
34- * Intervals i1 and i2 (rather than 0 and 1) are needed because in
35- * recent tzdata, PST8PDT may be an alias for America/Los_Angeles,
36- * and hence be aware that DST has not always existed.
37- * https://bugs.debian.org/1084190
38 */
39 tz = g_time_zone_new_identifier ("PST8PDT");
40 g_assert_nonnull (tz);
41 g_assert_cmpstr (g_time_zone_get_identifier (tz), ==, "PST8PDT");
42 /* a date in winter = non-DST */
43- i1 = g_time_zone_find_interval (tz, G_TIME_TYPE_STANDARD, 0);
44- /* approximately 6 months in seconds, i.e. a date in summer = DST */
45- i2 = g_time_zone_find_interval (tz, G_TIME_TYPE_DAYLIGHT, 15000000);
46+ gdt1 = g_date_time_new (tz, 2024, 1, 1, 0, 0, 0);
47+ i1 = g_time_zone_find_interval (tz, G_TIME_TYPE_STANDARD, g_date_time_to_unix (gdt1));
48+ /* a date in summer = DST */
49+ gdt2 = g_date_time_new (tz, 2024, 7, 1, 0, 0, 0);
50+ i2 = g_time_zone_find_interval (tz, G_TIME_TYPE_DAYLIGHT, g_date_time_to_unix (gdt2));
51 g_assert_cmpstr (g_time_zone_get_abbreviation (tz, i1), ==, "PST");
52 g_assert_cmpint (g_time_zone_get_offset (tz, i1), ==, - 8 * 3600);
53 g_assert (!g_time_zone_is_dst (tz, i1));
54@@ -2974,6 +2971,8 @@ test_posix_parse (void)
55 g_assert_cmpint (g_time_zone_get_offset (tz, i2), ==,- 7 * 3600);
56 g_assert (g_time_zone_is_dst (tz, i2));
57 g_time_zone_unref (tz);
58+ g_date_time_unref (gdt1);
59+ g_date_time_unref (gdt2);
60
61 tz = g_time_zone_new_identifier ("PST8PDT6:32:15");
62 #ifdef G_OS_WIN32
diff --git a/meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0003.patch b/meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0003.patch
deleted file mode 100644
index 2ef5fbb993..0000000000
--- a/meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0003.patch
+++ /dev/null
@@ -1,60 +0,0 @@
1From 5652c74a14b31b730d26de74ca9dcae1df5c1883 Mon Sep 17 00:00:00 2001
2From: Simon McVittie <smcv@debian.org>
3Date: Fri, 18 Oct 2024 11:23:42 +0100
4Subject: [PATCH] gdatetime test: Fall back if legacy System V PST8PDT is not
5 available
6
7On recent versions of Debian, PST8PDT is part of the tzdata-legacy
8package, which is not always installed and might disappear in future.
9Successfully tested with and without tzdata-legacy on Debian unstable.
10
11Signed-off-by: Simon McVittie <smcv@debian.org>
12
13Upstream-Status: Backport
14[https://github.com/GNOME/glib/commit/fe2699369f79981dcf913af4cfd98b342b84a9c1]
15
16Signed-off-by: Jinfeng Wang <jinfeng.wang.cn@windriver.com>
17---
18 glib/tests/gdatetime.c | 19 +++++++++++++++++--
19 1 file changed, 17 insertions(+), 2 deletions(-)
20
21diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c
22index 728b873..9e1acd0 100644
23--- a/glib/tests/gdatetime.c
24+++ b/glib/tests/gdatetime.c
25@@ -2931,6 +2931,7 @@ test_posix_parse (void)
26 GTimeZone *tz;
27 GDateTime *gdt1, *gdt2;
28 gint i1, i2;
29+ const char *expect_id;
30
31 /* Check that an unknown zone name falls back to UTC. */
32 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
33@@ -2953,11 +2954,25 @@ test_posix_parse (void)
34 g_time_zone_unref (tz);
35
36 /* This fails rules_from_identifier on Unix (though not on Windows)
37- * but passes anyway because PST8PDT is a zone name.
38+ * but can pass anyway because PST8PDT is a legacy System V zone name.
39 */
40 tz = g_time_zone_new_identifier ("PST8PDT");
41+ expect_id = "PST8PDT";
42+
43+#ifndef G_OS_WIN32
44+ /* PST8PDT is in tzdata's "backward" set, packaged as tzdata-legacy and
45+ * not always present in some OSs; fall back to the equivalent geographical
46+ * name if the "backward" time zones are absent. */
47+ if (tz == NULL)
48+ {
49+ g_test_message ("Legacy PST8PDT time zone not available, falling back");
50+ tz = g_time_zone_new_identifier ("America/Los_Angeles");
51+ expect_id = "America/Los_Angeles";
52+ }
53+#endif
54+
55 g_assert_nonnull (tz);
56- g_assert_cmpstr (g_time_zone_get_identifier (tz), ==, "PST8PDT");
57+ g_assert_cmpstr (g_time_zone_get_identifier (tz), ==, expect_id);
58 /* a date in winter = non-DST */
59 gdt1 = g_date_time_new (tz, 2024, 1, 1, 0, 0, 0);
60 i1 = g_time_zone_find_interval (tz, G_TIME_TYPE_STANDARD, g_date_time_to_unix (gdt1));
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-initial_2.82.2.bb b/meta/recipes-core/glib-2.0/glib-2.0-initial_2.82.4.bb
index acec7e9676..acec7e9676 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0-initial_2.82.2.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0-initial_2.82.4.bb
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.82.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.82.4.bb
index ef80cc47cf..ef80cc47cf 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.82.2.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.82.4.bb
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 666d3ef8ef..9d50a95c40 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -227,15 +227,12 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
227 file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ 227 file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \
228 file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ 228 file://0010-Do-not-hardcode-python-path-into-various-tools.patch \
229 file://skip-timeout.patch \ 229 file://skip-timeout.patch \
230 file://gdatetime-test-fail-0001.patch \
231 file://gdatetime-test-fail-0002.patch \
232 file://gdatetime-test-fail-0003.patch \
233 " 230 "
234SRC_URI:append:class-native = " file://relocate-modules.patch \ 231SRC_URI:append:class-native = " file://relocate-modules.patch \
235 file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ 232 file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \
236 " 233 "
237 234
238SRC_URI[sha256sum] = "ab45f5a323048b1659ee0fbda5cecd94b099ab3e4b9abf26ae06aeb3e781fd63" 235SRC_URI[sha256sum] = "37dd0877fe964cd15e9a2710b044a1830fb1bd93652a6d0cb6b8b2dff187c709"
239 236
240# Find any meson cross files in FILESPATH that are relevant for the current 237# Find any meson cross files in FILESPATH that are relevant for the current
241# build (using siteinfo) and add them to EXTRA_OEMESON. 238# build (using siteinfo) and add them to EXTRA_OEMESON.