summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0001.patch
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 /meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0001.patch
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>
Diffstat (limited to 'meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0001.patch')
-rw-r--r--meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0001.patch69
1 files changed, 0 insertions, 69 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");