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:
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