Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package virt-viewer for openSUSE:Factory
checked in at 2021-10-12 21:49:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virt-viewer (Old)
and /work/SRC/openSUSE:Factory/.virt-viewer.new.2443 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-viewer"
Tue Oct 12 21:49:34 2021 rev:70 rq:924776 version:10.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/virt-viewer/virt-viewer.changes 2021-07-21
19:07:34.735416494 +0200
+++ /work/SRC/openSUSE:Factory/.virt-viewer.new.2443/virt-viewer.changes
2021-10-12 21:50:57.684009843 +0200
@@ -1,0 +2,6 @@
+Mon Oct 11 16:54:27 MDT 2021 - carn...@suse.com
+
+- Fix broken build in Factory (bsc#1166289)
+ 0006-src-avoid-warnings-from-use-of-G_GNUC_FALLTHROUGH.patch
+
+-------------------------------------------------------------------
New:
----
0006-src-avoid-warnings-from-use-of-G_GNUC_FALLTHROUGH.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virt-viewer.spec ++++++
--- /var/tmp/diff_new_pack.FpMWZm/_old 2021-10-12 21:50:58.352010799 +0200
+++ /var/tmp/diff_new_pack.FpMWZm/_new 2021-10-12 21:50:58.352010799 +0200
@@ -37,6 +37,7 @@
Patch3: 0003-config.h-avoid-extra-hyphen-in-build-ID-value.patch
Patch4: 0004-config.h-conditionally-define-REMOTE_VIEWER_OS_ID.patch
Patch5:
0005-Fix-creation-of-window-when-using-single-QXL-card-with-2-heads.patch
+Patch6: 0006-src-avoid-warnings-from-use-of-G_GNUC_FALLTHROUGH.patch
Patch50: netcat.patch
Patch51: virtview-desktop.patch
Patch52: virtview-dont-show-Domain-0.patch
++++++ 0006-src-avoid-warnings-from-use-of-G_GNUC_FALLTHROUGH.patch ++++++
Subject: src: avoid warnings from use of G_GNUC_FALLTHROUGH
From: Daniel P. Berrang?? berra...@redhat.com Tue Jul 27 16:25:12 2021 +0100
Date: Tue Jul 27 16:50:04 2021 +0100:
Git: 2e6adf9b85cee3b85a9f7da8d976f3dd022afaa3
Since glib >= 2.69 we get warnings:
../src/ovirt-foreign-menu.c: In function 'ovirt_foreign_menu_next_async_step':
../src/ovirt-foreign-menu.c:319:13: error: Not available before 2.60 [-Werror]
319 | G_GNUC_FALLTHROUGH;
| ^~~~~~~~~~~~~~~
../src/ovirt-foreign-menu.c:345:13: error: Not available before 2.60 [-Werror]
345 | G_GNUC_FALLTHROUGH;
| ^~~~~~~~~~~~~~~
../src/ovirt-foreign-menu.c:351:13: error: Not available before 2.60 [-Werror]
351 | G_GNUC_FALLTHROUGH;
| ^~~~~~~~~~~~~~~
../src/ovirt-foreign-menu.c:357:13: error: Not available before 2.60 [-Werror]
357 | G_GNUC_FALLTHROUGH;
| ^~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
GLib is right to warn about this, since it does not know that we
provided our own back-compat definition of the macro. For now we have to
temporarily purge glib's macro entirely in order to get rid of the
warning that is bogus for our usage.
Signed-off-by: Daniel P. Berrang?? <berra...@redhat.com>
diff --git a/src/ovirt-foreign-menu.c b/src/ovirt-foreign-menu.c
index c19e913..91b6824 100644
--- a/src/ovirt-foreign-menu.c
+++ b/src/ovirt-foreign-menu.c
@@ -31,12 +31,23 @@
#include "virt-viewer-util.h"
#include "glib-compat.h"
-#if !GLIB_CHECK_VERSION(2, 60, 0)
-# if __GNUC_PREREQ (7, 0)
-# define G_GNUC_FALLTHROUGH __attribute__((fallthrough))
-# else
-# define G_GNUC_FALLTHROUGH do {} while(0)
-# endif
+/* GLib 2.69 annotated macros with version tags, and
+ * since we set GLIB_VERSION_MAX_ALLOWED to 2.48
+ * it complains if we use G_GNUC_FALLTHROUGH at
+ * all. We temporarily purge the GLib definition
+ * of G_GNUC_FALLTHROUGH and define it ourselves.
+ * When we set min glib >= 2.60, we can delete
+ * all this
+ */
+#ifndef __GNUC_PREREQ
+# define __GNUC_PREREQ(maj, min) \
+ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+#endif
+#undef G_GNUC_FALLTHROUGH
+#if __GNUC_PREREQ (7, 0)
+# define G_GNUC_FALLTHROUGH __attribute__((fallthrough))
+#else
+# define G_GNUC_FALLTHROUGH do {} while(0)
#endif
typedef enum {
