summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0/glib-2.0/0023-gdbusprivate-Avoid-a-warning-about-a-statement-with-.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/0023-gdbusprivate-Avoid-a-warning-about-a-statement-with-.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/0023-gdbusprivate-Avoid-a-warning-about-a-statement-with-.patch')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0023-gdbusprivate-Avoid-a-warning-about-a-statement-with-.patch33
1 files changed, 0 insertions, 33 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0023-gdbusprivate-Avoid-a-warning-about-a-statement-with-.patch b/meta/recipes-core/glib-2.0/glib-2.0/0023-gdbusprivate-Avoid-a-warning-about-a-statement-with-.patch
deleted file mode 100644
index 012f9ca87a..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0023-gdbusprivate-Avoid-a-warning-about-a-statement-with-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 0604f5858259c32744e6fc912ed4feb308651a3a Mon Sep 17 00:00:00 2001
2From: Philip Withnall <pwithnall@endlessos.org>
3Date: Mon, 16 Nov 2020 14:47:23 +0000
4Subject: [PATCH 23/29] gdbusprivate: Avoid a warning about a statement with no
5 effect
6
7Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
8Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719]
9---
10 gio/gdbusprivate.c | 5 ++---
11 1 file changed, 2 insertions(+), 3 deletions(-)
12
13diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
14index 99b37f3eb..4e42c1a4d 100644
15--- a/gio/gdbusprivate.c
16+++ b/gio/gdbusprivate.c
17@@ -1945,11 +1945,10 @@ _g_dbus_initialize (void)
18
19 if (g_once_init_enter (&initialized))
20 {
21- GQuark g_dbus_error_domain;
22 const gchar *debug;
23
24- g_dbus_error_domain = G_DBUS_ERROR;
25- (g_dbus_error_domain); /* To avoid -Wunused-but-set-variable */
26+ /* Ensure the domain is registered. */
27+ g_dbus_error_quark ();
28
29 debug = g_getenv ("G_DBUS_DEBUG");
30 if (debug != NULL)
31--
322.30.1
33