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-05-11 23:04:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-viewer (Old) and /work/SRC/openSUSE:Factory/.virt-viewer.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-viewer" Tue May 11 23:04:38 2021 rev:67 rq:892281 version:10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/virt-viewer/virt-viewer.changes 2021-04-21 21:01:16.986379360 +0200 +++ /work/SRC/openSUSE:Factory/.virt-viewer.new.2988/virt-viewer.changes 2021-05-11 23:04:50.132778777 +0200 @@ -1,0 +2,9 @@ +Tue May 4 11:44:45 MDT 2021 - [email protected] + +- Upstream bug fixes (bsc#1166289) + 0001-src-initialize-keymaps-variable.patch + 0002-rpm-explicitly-tell-meson-to-disable-spice-ovirt.patch + 0003-config.h-avoid-extra-hyphen-in-build-ID-value.patch + 0004-config.h-conditionally-define-REMOTE_VIEWER_OS_ID.patch + +------------------------------------------------------------------- New: ---- 0001-src-initialize-keymaps-variable.patch 0002-rpm-explicitly-tell-meson-to-disable-spice-ovirt.patch 0003-config.h-avoid-extra-hyphen-in-build-ID-value.patch 0004-config.h-conditionally-define-REMOTE_VIEWER_OS_ID.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-viewer.spec ++++++ --- /var/tmp/diff_new_pack.Dpgjlz/_old 2021-05-11 23:04:50.652776632 +0200 +++ /var/tmp/diff_new_pack.Dpgjlz/_new 2021-05-11 23:04:50.656776615 +0200 @@ -25,6 +25,10 @@ URL: http://www.virt-manager.org Source: https://releases.pagure.org/virt-viewer/virt-viewer-%{version}.tar.xz Source1: https://releases.pagure.org/virt-viewer/virt-viewer-%{version}.tar.xz.asc +Patch1: 0001-src-initialize-keymaps-variable.patch +Patch2: 0002-rpm-explicitly-tell-meson-to-disable-spice-ovirt.patch +Patch3: 0003-config.h-avoid-extra-hyphen-in-build-ID-value.patch +Patch4: 0004-config.h-conditionally-define-REMOTE_VIEWER_OS_ID.patch Patch50: netcat.patch Patch51: virtview-desktop.patch Patch52: virtview-dont-show-Domain-0.patch @@ -54,10 +58,7 @@ the display, and libvirt for looking up VNC server details. %prep -%setup -q -%patch50 -p1 -%patch51 -p1 -%patch52 -p1 +%autosetup -p1 %build %meson \ ++++++ 0001-src-initialize-keymaps-variable.patch ++++++ Subject: src: initialize keymaps variable From: J??n Tomko [email protected] Fri Apr 23 15:58:56 2021 +0200 Date: Fri Apr 23 15:59:49 2021 +0200: Git: 9e36a59c806de3de77c046df0b8c80bd9a0f4863 My clang version 11.0.0 (Fedora 11.0.0-2.fc33) complains: ../src/virt-viewer-app.c:610:9: error: variable 'keymaps' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized] if (keymap_string) { ^~~~~~~~~~~~~ ../src/virt-viewer-app.c:614:10: note: uninitialized use occurs here if (!keymaps || g_strv_length(keymaps) == 0) { ^~~~~~~ ../src/virt-viewer-app.c:610:5: note: remove the 'if' if its condition is always true if (keymap_string) { ^~~~~~~~~~~~~~~~~~~ ../src/virt-viewer-app.c:595:27: note: initialize the variable 'keymaps' to silence this warning gchar **key, **keymaps, **valkey, **valuekeys = NULL; ^ = NULL 1 error generated. Initialize the variable to fix the uninitialized use. Signed-off-by: J??n Tomko <[email protected]> diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c index 0095398..de2677c 100644 --- a/src/virt-viewer-app.c +++ b/src/virt-viewer-app.c @@ -592,7 +592,7 @@ static void virt_viewer_app_set_keymap(VirtViewerApp *self, const gchar *keymap_string) { VirtViewerAppPrivate *priv = virt_viewer_app_get_instance_private(self); - gchar **key, **keymaps, **valkey, **valuekeys = NULL; + gchar **key, **keymaps = NULL, **valkey, **valuekeys = NULL; VirtViewerKeyMapping *keyMappingArray, *keyMappingPtr; guint *mappedArray, *ptrMove; ++++++ 0002-rpm-explicitly-tell-meson-to-disable-spice-ovirt.patch ++++++ Subject: rpm: explicitly tell meson to disable spice/ovirt From: Daniel P. Berrang?? [email protected] Mon Apr 26 10:13:32 2021 +0100 Date: Mon Apr 26 10:24:23 2021 +0100: Git: 7dc64fef6b006a81dc0d7645bbcea6a2252c4f45 %meson will force enable all features, so simply omitting the BuildRequires is not sufficient to disable spice/ovirt. Meson must be explicitly told to do so. Signed-off-by: Daniel P. Berrang?? <[email protected]> diff --git a/virt-viewer.spec.in b/virt-viewer.spec.in index 95a133d..91b62b9 100644 --- a/virt-viewer.spec.in +++ b/virt-viewer.spec.in @@ -50,7 +50,15 @@ the display, and libvirt for looking up VNC/SPICE server details. %setup -q %build -%meson -Dbuild-id=%{release} +%if !%{with_govirt} +%define ovirt_opt -Dovirt=disabled +%endif + +%if !%{with_spice} +%define spice_opt -Dspice=disabled +%endif + +%meson -Dbuild-id=%{release} %{?ovirt_opt} %{?spice_opt} %meson_build %install ++++++ 0003-config.h-avoid-extra-hyphen-in-build-ID-value.patch ++++++ Subject: config.h: avoid extra hyphen in build ID value From: Daniel P. Berrang?? [email protected] Mon Apr 26 11:00:15 2021 +0100 Date: Mon Apr 26 14:57:22 2021 +0100: Git: d07b1e5badb7624298d4bcfdcb6764b2a5d8a9de The meson.build file already adds a hyphen. Signed-off-by: Daniel P. Berrang?? <[email protected]> diff --git a/config.h.in b/config.h.in index 1d72f7e..eb4f03b 100644 --- a/config.h.in +++ b/config.h.in @@ -16,7 +16,7 @@ #define _GNU_SOURCE /* Build version details */ -#define BUILDID "-@BUILDID@" +#define BUILDID "@BUILDID@" /* Define to the full name and version of this package. */ #define PACKAGE_STRING "virt-viewer @VERSION@" ++++++ 0004-config.h-conditionally-define-REMOTE_VIEWER_OS_ID.patch ++++++ Subject: config.h: conditionally define REMOTE_VIEWER_OS_ID From: Daniel P. Berrang?? [email protected] Mon Apr 26 11:01:31 2021 +0100 Date: Mon Apr 26 15:01:50 2021 +0100: Git: 65fe7379f85924b5bc3770fa9be5b08ba9a8704f It should only be set in config.h if it is not the empty string Signed-off-by: Daniel P. Berrang?? <[email protected]> diff --git a/config.h.in b/config.h.in index eb4f03b..0af0fa4 100644 --- a/config.h.in +++ b/config.h.in @@ -25,7 +25,7 @@ #define PACKAGE_VERSION "@VERSION@" /* OS ID for this build */ -#define REMOTE_VIEWER_OS_ID "@OS_ID@" +#mesondefine REMOTE_VIEWER_OS_ID /* Version number of package */ #define VERSION "@VERSION@" diff --git a/meson.build b/meson.build index e5ed47b..2c92d75 100644 --- a/meson.build +++ b/meson.build @@ -478,7 +478,10 @@ if id != '' else conf_data.set('BUILDID', '') endif -conf_data.set('OS_ID', get_option('os-id')) +osid = get_option('os-id') +if osid != '' + conf_data.set('REMOTE_VIEWER_OS_ID', '"' + osid + '"') +endif arr_version = meson.project_version().split('.') ++++++ netcat.patch ++++++ --- /var/tmp/diff_new_pack.Dpgjlz/_old 2021-05-11 23:04:50.696776450 +0200 +++ /var/tmp/diff_new_pack.Dpgjlz/_new 2021-05-11 23:04:50.696776450 +0200 @@ -1,8 +1,8 @@ -Index: virt-viewer-9.0/src/virt-viewer-app.c +Index: virt-viewer-10.0/src/virt-viewer-app.c =================================================================== ---- virt-viewer-9.0.orig/src/virt-viewer-app.c -+++ virt-viewer-9.0/src/virt-viewer-app.c -@@ -739,7 +739,7 @@ virt_viewer_app_open_tunnel_ssh(const ch +--- virt-viewer-10.0.orig/src/virt-viewer-app.c ++++ virt-viewer-10.0/src/virt-viewer-app.c +@@ -855,7 +855,7 @@ virt_viewer_app_open_tunnel_ssh(const ch else g_string_append_printf(cat, "UNIX-CONNECT:%s", unixsock);
