summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0/glib-2.0/0008-gdbuserror-Drop-unnecessary-volatile-qualifiers-from.patch
diff options
context:
space:
mode:
authorwangmy <wangmy@fujitsu.com>2021-03-31 22:28:01 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-04-18 11:37:25 +0100
commit54dff050027d5b9d20ff034b12bcacdfc010fa25 (patch)
tree8c53724446c3bf08407d5f241b63483712a001cb /meta/recipes-core/glib-2.0/glib-2.0/0008-gdbuserror-Drop-unnecessary-volatile-qualifiers-from.patch
parentd7e0475b50c342f555daf4cb222311f8223529fd (diff)
downloadpoky-54dff050027d5b9d20ff034b12bcacdfc010fa25.tar.gz
glib-2.0: upgrade 2.66.7 -> 2.68.0
the following patches are refreshed: 0001-Set-host_machine-correctly-when-building-with-mingw3.patch 0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch 0001-tests-codegen.py-removing-unecessary-print-statement.patch relocate-modules.patch the following patches are removed since they are included in 2.68.0: 0001-gobject-Drop-use-of-volatile-from-get_type-macros.patch 0002-tests-Fix-non-atomic-access-to-a-shared-variable.patch 0003-tests-Fix-non-atomic-access-to-a-shared-variable.patch 0004-tests-Drop-unnecessary-volatile-qualifiers-from-test.patch 0005-tests-Fix-non-atomic-access-to-some-shared-variables.patch 0006-tests-Drop-unnecessary-volatile-qualifiers-from-test.patch 0007-gdbusconnection-Drop-unnecessary-volatile-qualifiers.patch 0008-gdbuserror-Drop-unnecessary-volatile-qualifiers-from.patch 0009-gio-Drop-unnecessary-volatile-qualifiers-from-intern.patch 0010-kqueue-Fix-unlocked-access-to-shared-variable.patch 0011-tests-Drop-unnecessary-volatile-qualifiers-from-test.patch 0012-tests-Fix-non-atomic-access-to-some-shared-variables.patch 0013-gatomic-Drop-unnecessary-volatile-qualifiers-from-in.patch 0014-gatomic-Drop-unnecessary-volatile-qualifiers-from-ma.patch 0015-glib-Drop-unnecessary-volatile-qualifiers-from-inter.patch 0016-gobject-Drop-unnecessary-volatile-qualifiers-from-in.patch 0017-gmessages-Drop-unnecessary-volatile-qualifiers-from-.patch 0018-gtypes-Drop-volatile-qualifier-from-gatomicrefcount.patch 0019-gatomicarray-Drop-volatile-qualifier-from-GAtomicArr.patch 0020-gobject-Drop-volatile-qualifier-from-GObject.ref_cou.patch 0021-tests-Drop-unnecessary-volatile-qualifiers-from-test.patch 0022-build-Drop-unnecessary-volatile-qualifiers-from-conf.patch 0023-gdbusprivate-Avoid-a-warning-about-a-statement-with-.patch 0024-tests-Add-comment-to-volatile-atomic-tests.patch 0025-gthread-Use-g_atomic-primitives-correctly-in-destruc.patch 0026-gtype-Fix-some-typos-in-comments.patch 0027-gtype-Add-some-missing-atomic-accesses-to-init_state.patch 0028-gresource-Fix-a-pointer-mismatch-with-an-atomic-load.patch 0029-docs-Document-not-to-use-volatile-qualifiers.patch (From OE-Core rev: fde4cb18e28e98f934c0742292f7ec183a568233) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0/0008-gdbuserror-Drop-unnecessary-volatile-qualifiers-from.patch')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0008-gdbuserror-Drop-unnecessary-volatile-qualifiers-from.patch95
1 files changed, 0 insertions, 95 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0008-gdbuserror-Drop-unnecessary-volatile-qualifiers-from.patch b/meta/recipes-core/glib-2.0/glib-2.0/0008-gdbuserror-Drop-unnecessary-volatile-qualifiers-from.patch
deleted file mode 100644
index e947a264c5..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0008-gdbuserror-Drop-unnecessary-volatile-qualifiers-from.patch
+++ /dev/null
@@ -1,95 +0,0 @@
1From 7c7623c4a31fb0f2a7176c43acc728093818b58c Mon Sep 17 00:00:00 2001
2From: Philip Withnall <pwithnall@endlessos.org>
3Date: Wed, 11 Nov 2020 18:26:19 +0000
4Subject: [PATCH 08/29] gdbuserror: Drop unnecessary volatile qualifiers from
5 variables
6
7This should introduce no API changes. The
8`g_dbus_error_register_error_domain()` function still (incorrectly) has
9a `volatile` argument, but dropping that qualifier would be an API
10break.
11
12Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
13
14Helps: #600
15Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719]
16---
17 gio/gdbuserror.c | 28 +++++++++++++++++-----------
18 1 file changed, 17 insertions(+), 11 deletions(-)
19
20diff --git a/gio/gdbuserror.c b/gio/gdbuserror.c
21index 682677354..b03a33f27 100644
22--- a/gio/gdbuserror.c
23+++ b/gio/gdbuserror.c
24@@ -84,12 +84,12 @@
25 * GQuark
26 * foo_bar_error_quark (void)
27 * {
28- * static volatile gsize quark_volatile = 0;
29+ * static gsize quark = 0;
30 * g_dbus_error_register_error_domain ("foo-bar-error-quark",
31- * &quark_volatile,
32+ * &quark,
33 * foo_bar_error_entries,
34 * G_N_ELEMENTS (foo_bar_error_entries));
35- * return (GQuark) quark_volatile;
36+ * return (GQuark) quark;
37 * }
38 * ]|
39 * With this setup, a D-Bus peer can transparently pass e.g. %FOO_BAR_ERROR_ANOTHER_ERROR and
40@@ -160,12 +160,12 @@ GQuark
41 g_dbus_error_quark (void)
42 {
43 G_STATIC_ASSERT (G_N_ELEMENTS (g_dbus_error_entries) - 1 == G_DBUS_ERROR_PROPERTY_READ_ONLY);
44- static volatile gsize quark_volatile = 0;
45+ static gsize quark = 0;
46 g_dbus_error_register_error_domain ("g-dbus-error-quark",
47- &quark_volatile,
48+ &quark,
49 g_dbus_error_entries,
50 G_N_ELEMENTS (g_dbus_error_entries));
51- return (GQuark) quark_volatile;
52+ return (GQuark) quark;
53 }
54
55 /**
56@@ -185,25 +185,31 @@ g_dbus_error_register_error_domain (const gchar *error_domain_quark_na
57 const GDBusErrorEntry *entries,
58 guint num_entries)
59 {
60+ gsize *quark;
61+
62 g_return_if_fail (error_domain_quark_name != NULL);
63 g_return_if_fail (quark_volatile != NULL);
64 g_return_if_fail (entries != NULL);
65 g_return_if_fail (num_entries > 0);
66
67- if (g_once_init_enter (quark_volatile))
68+ /* Drop the volatile qualifier, which should never have been on the argument
69+ * in the first place. */
70+ quark = (gsize *) quark_volatile;
71+
72+ if (g_once_init_enter (quark))
73 {
74 guint n;
75- GQuark quark;
76+ GQuark new_quark;
77
78- quark = g_quark_from_static_string (error_domain_quark_name);
79+ new_quark = g_quark_from_static_string (error_domain_quark_name);
80
81 for (n = 0; n < num_entries; n++)
82 {
83- g_warn_if_fail (g_dbus_error_register_error (quark,
84+ g_warn_if_fail (g_dbus_error_register_error (new_quark,
85 entries[n].error_code,
86 entries[n].dbus_error_name));
87 }
88- g_once_init_leave (quark_volatile, quark);
89+ g_once_init_leave (quark, new_quark);
90 }
91 }
92
93--
942.30.1
95