From 54dff050027d5b9d20ff034b12bcacdfc010fa25 Mon Sep 17 00:00:00 2001 From: wangmy Date: Wed, 31 Mar 2021 22:28:01 +0800 Subject: 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 Signed-off-by: Richard Purdie --- ...Drop-unnecessary-volatile-qualifiers-from.patch | 95 ---------------------- 1 file changed, 95 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0008-gdbuserror-Drop-unnecessary-volatile-qualifiers-from.patch (limited to 'meta/recipes-core/glib-2.0/glib-2.0/0008-gdbuserror-Drop-unnecessary-volatile-qualifiers-from.patch') 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 @@ -From 7c7623c4a31fb0f2a7176c43acc728093818b58c Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Wed, 11 Nov 2020 18:26:19 +0000 -Subject: [PATCH 08/29] gdbuserror: Drop unnecessary volatile qualifiers from - variables - -This should introduce no API changes. The -`g_dbus_error_register_error_domain()` function still (incorrectly) has -a `volatile` argument, but dropping that qualifier would be an API -break. - -Signed-off-by: Philip Withnall - -Helps: #600 -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719] ---- - gio/gdbuserror.c | 28 +++++++++++++++++----------- - 1 file changed, 17 insertions(+), 11 deletions(-) - -diff --git a/gio/gdbuserror.c b/gio/gdbuserror.c -index 682677354..b03a33f27 100644 ---- a/gio/gdbuserror.c -+++ b/gio/gdbuserror.c -@@ -84,12 +84,12 @@ - * GQuark - * foo_bar_error_quark (void) - * { -- * static volatile gsize quark_volatile = 0; -+ * static gsize quark = 0; - * g_dbus_error_register_error_domain ("foo-bar-error-quark", -- * &quark_volatile, -+ * &quark, - * foo_bar_error_entries, - * G_N_ELEMENTS (foo_bar_error_entries)); -- * return (GQuark) quark_volatile; -+ * return (GQuark) quark; - * } - * ]| - * With this setup, a D-Bus peer can transparently pass e.g. %FOO_BAR_ERROR_ANOTHER_ERROR and -@@ -160,12 +160,12 @@ GQuark - g_dbus_error_quark (void) - { - G_STATIC_ASSERT (G_N_ELEMENTS (g_dbus_error_entries) - 1 == G_DBUS_ERROR_PROPERTY_READ_ONLY); -- static volatile gsize quark_volatile = 0; -+ static gsize quark = 0; - g_dbus_error_register_error_domain ("g-dbus-error-quark", -- &quark_volatile, -+ &quark, - g_dbus_error_entries, - G_N_ELEMENTS (g_dbus_error_entries)); -- return (GQuark) quark_volatile; -+ return (GQuark) quark; - } - - /** -@@ -185,25 +185,31 @@ g_dbus_error_register_error_domain (const gchar *error_domain_quark_na - const GDBusErrorEntry *entries, - guint num_entries) - { -+ gsize *quark; -+ - g_return_if_fail (error_domain_quark_name != NULL); - g_return_if_fail (quark_volatile != NULL); - g_return_if_fail (entries != NULL); - g_return_if_fail (num_entries > 0); - -- if (g_once_init_enter (quark_volatile)) -+ /* Drop the volatile qualifier, which should never have been on the argument -+ * in the first place. */ -+ quark = (gsize *) quark_volatile; -+ -+ if (g_once_init_enter (quark)) - { - guint n; -- GQuark quark; -+ GQuark new_quark; - -- quark = g_quark_from_static_string (error_domain_quark_name); -+ new_quark = g_quark_from_static_string (error_domain_quark_name); - - for (n = 0; n < num_entries; n++) - { -- g_warn_if_fail (g_dbus_error_register_error (quark, -+ g_warn_if_fail (g_dbus_error_register_error (new_quark, - entries[n].error_code, - entries[n].dbus_error_name)); - } -- g_once_init_leave (quark_volatile, quark); -+ g_once_init_leave (quark, new_quark); - } - } - --- -2.30.1 - -- cgit v1.2.3-54-g00ecf