Compare commits
43 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
354d6c059b | ||
|
|
6a7071dd9e | ||
|
c708bc6076 | ||
|
|
3ee6aace89 | ||
|
|
831cbc1b2d | ||
|
|
9fcdfda67b | ||
|
|
4b14ad0fe4 | ||
|
|
9ccf41175a | ||
|
|
b64e288bf5 | ||
|
78c6d28842 | ||
|
|
a6368324e1 | ||
|
|
4777617448 | ||
|
|
94cdf59cf4 | ||
|
|
82dee1f414 | ||
|
|
1c755670cc | ||
|
|
6b5ff24bd9 | ||
|
|
396a37a3d6 | ||
|
|
d1d66d09a2 | ||
|
|
e90193e796 | ||
|
|
8e4cdf5923 | ||
|
1cc2a7dd30 | ||
|
|
f265390897 | ||
|
|
2a56738b1f | ||
|
|
99a90f2250 | ||
|
|
73f66ac1dd | ||
|
|
1d74eb4bf5 | ||
|
|
2fc527c888 | ||
|
|
f20a22bccb | ||
|
|
4e3e196a13 | ||
|
|
e75a9bf32c | ||
|
|
40495a1d72 | ||
|
|
2f71e81968 | ||
|
3f731acc97 | ||
|
|
503def1f6f | ||
|
|
7b5c3f9767 | ||
|
|
ca0e90aaee | ||
| 05b78705b9 | |||
|
|
22400e4953 | ||
|
|
9129ae6191 | ||
|
|
e9fec986d5 | ||
|
3a93f40c32 | ||
|
d5eb294833 | ||
|
|
ec237e15b2 |
7 changed files with 263 additions and 939 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -2,4 +2,4 @@
|
|||
*.rpm
|
||||
x86_64
|
||||
i386
|
||||
virt-viewer-*.tar.gz
|
||||
virt-viewer-*.tar.xz
|
||||
|
|
|
|||
89
0001-Read-oVirt-CA-and-pass-it-to-gtk-vnc.patch
Normal file
89
0001-Read-oVirt-CA-and-pass-it-to-gtk-vnc.patch
Normal file
|
|
@ -0,0 +1,89 @@
|
|||
From de864c14146c120b46d435949b1d8d0b11e57b85 Mon Sep 17 00:00:00 2001
|
||||
From: Jean-Louis Dupond <jean-louis@dupond.be>
|
||||
Date: Thu, 25 May 2023 16:22:14 +0200
|
||||
Subject: [PATCH] Read oVirt CA and pass it to gtk-vnc
|
||||
|
||||
The connection file created by oVirt contains the trusted CA.
|
||||
When https://gitlab.gnome.org/GNOME/gtk-vnc/-/merge_requests/24 is
|
||||
merged, we can pass this CA certificate to gtk-vnc to have it trusted.
|
||||
This can replace manually putting the cacert.pem into ~/.pki/CA/
|
||||
|
||||
Signed-off-by: Jean-Louis Dupond <jean-louis@dupond.be>
|
||||
---
|
||||
src/virt-viewer-session-vnc.c | 25 +++++++++++++++++++++++--
|
||||
1 file changed, 23 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/virt-viewer-session-vnc.c b/src/virt-viewer-session-vnc.c
|
||||
index 6281bd0..1635c1b 100644
|
||||
--- a/src/virt-viewer-session-vnc.c
|
||||
+++ b/src/virt-viewer-session-vnc.c
|
||||
@@ -42,6 +42,9 @@
|
||||
#if VNC_CHECK_VERSION(1, 2, 0)
|
||||
# define HAVE_VNC_POWER_CONTROL
|
||||
#endif
|
||||
+#if VNC_CHECK_VERSION(1, 3, 2)
|
||||
+# define HAVE_VNC_DISPLAY_CREDENTIAL_CA_CERT_DATA
|
||||
+#endif
|
||||
|
||||
struct _VirtViewerSessionVnc {
|
||||
VirtViewerSession parent;
|
||||
@@ -343,8 +346,8 @@ virt_viewer_session_vnc_auth_credential(GtkWidget *src G_GNUC_UNUSED,
|
||||
VirtViewerSession *session)
|
||||
{
|
||||
VirtViewerSessionVnc *self = VIRT_VIEWER_SESSION_VNC(session);
|
||||
- char *username = NULL, *password = NULL;
|
||||
- gboolean wantPassword = FALSE, wantUsername = FALSE;
|
||||
+ char *username = NULL, *password = NULL, *ca = NULL;
|
||||
+ gboolean wantPassword = FALSE, wantUsername = FALSE, wantCA = FALSE;
|
||||
VirtViewerFile *file = NULL;
|
||||
int i;
|
||||
|
||||
@@ -360,6 +363,9 @@ virt_viewer_session_vnc_auth_credential(GtkWidget *src G_GNUC_UNUSED,
|
||||
wantPassword = TRUE;
|
||||
break;
|
||||
case VNC_DISPLAY_CREDENTIAL_CLIENTNAME:
|
||||
+#ifdef HAVE_VNC_DISPLAY_CREDENTIAL_CA_CERT_DATA
|
||||
+ case VNC_DISPLAY_CREDENTIAL_CA_CERT_DATA:
|
||||
+#endif
|
||||
break;
|
||||
default:
|
||||
g_debug("Unsupported credential type %d", g_value_get_enum(cred));
|
||||
@@ -382,6 +388,10 @@ virt_viewer_session_vnc_auth_credential(GtkWidget *src G_GNUC_UNUSED,
|
||||
password = virt_viewer_file_get_password(file);
|
||||
wantPassword = FALSE;
|
||||
}
|
||||
+ ca = virt_viewer_file_get_ovirt_ca(file);
|
||||
+ if (wantCA && ca) {
|
||||
+ wantCA = FALSE;
|
||||
+ }
|
||||
}
|
||||
|
||||
if (wantUsername || wantPassword) {
|
||||
@@ -427,6 +437,16 @@ virt_viewer_session_vnc_auth_credential(GtkWidget *src G_GNUC_UNUSED,
|
||||
vnc_display_close(self->vnc);
|
||||
}
|
||||
break;
|
||||
+#ifdef HAVE_VNC_DISPLAY_CREDENTIAL_CA_CERT_DATA
|
||||
+ case VNC_DISPLAY_CREDENTIAL_CA_CERT_DATA:
|
||||
+ if (vnc_display_set_credential(self->vnc,
|
||||
+ g_value_get_enum(cred),
|
||||
+ ca)) {
|
||||
+ g_debug("Failed to set credential type %d", g_value_get_enum(cred));
|
||||
+ vnc_display_close(self->vnc);
|
||||
+ }
|
||||
+ break;
|
||||
+#endif
|
||||
default:
|
||||
g_debug("Unsupported credential type %d", g_value_get_enum(cred));
|
||||
vnc_display_close(self->vnc);
|
||||
@@ -436,6 +456,7 @@ virt_viewer_session_vnc_auth_credential(GtkWidget *src G_GNUC_UNUSED,
|
||||
cleanup:
|
||||
g_free(username);
|
||||
g_free(password);
|
||||
+ g_free(ca);
|
||||
}
|
||||
|
||||
|
||||
--
|
||||
2.47.1
|
||||
|
||||
50
0001-data-remove-bogus-param-for-meson-i18n.merge_file.patch
Normal file
50
0001-data-remove-bogus-param-for-meson-i18n.merge_file.patch
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
From 98d9f202ef768f22ae21b5c43a080a1aa64a7107 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
|
||||
Date: Tue, 26 Apr 2022 17:36:54 +0100
|
||||
Subject: [PATCH] data: remove bogus param for meson i18n.merge_file
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The positional parameter used to be treated as 'input', but since we
|
||||
already set 'input' explicitly it is redundant. With latest meson
|
||||
versions it now generates an error
|
||||
|
||||
data/meson.build:4:7: ERROR: Function does not take positional arguments.
|
||||
|
||||
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
||||
---
|
||||
data/meson.build | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/data/meson.build b/data/meson.build
|
||||
index d718491..4325108 100644
|
||||
--- a/data/meson.build
|
||||
+++ b/data/meson.build
|
||||
@@ -2,7 +2,6 @@ if host_machine.system() != 'windows'
|
||||
desktop = 'remote-viewer.desktop'
|
||||
|
||||
i18n.merge_file (
|
||||
- desktop,
|
||||
type: 'desktop',
|
||||
input: desktop + '.in',
|
||||
output: desktop,
|
||||
@@ -14,7 +13,6 @@ if host_machine.system() != 'windows'
|
||||
mimetypes = 'virt-viewer-mime.xml'
|
||||
|
||||
i18n.merge_file (
|
||||
- mimetypes,
|
||||
type: 'xml',
|
||||
input: mimetypes + '.in',
|
||||
output: mimetypes,
|
||||
@@ -27,7 +25,6 @@ if host_machine.system() != 'windows'
|
||||
metainfo = 'remote-viewer.appdata.xml'
|
||||
|
||||
i18n.merge_file (
|
||||
- metainfo,
|
||||
type: 'xml',
|
||||
input: metainfo + '.in',
|
||||
output: metainfo,
|
||||
--
|
||||
2.37.1
|
||||
|
||||
|
|
@ -1,676 +0,0 @@
|
|||
From 30c34a6cb642ed3d232db1ea8b14bfbb112c6f76 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@fedoraproject.org>
|
||||
Date: Thu, 28 Jun 2018 20:34:40 +0200
|
||||
Subject: [PATCH] spice controller interface is being removed from spice-gtk.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||||
Reviewed-by: Victor Toso <victortoso@redhat.com>
|
||||
Signed-off-by: Fabiano Fidêncio <fidencio@fedoraprojet.org>
|
||||
---
|
||||
configure.ac | 3 +-
|
||||
data/Makefile.am | 1 -
|
||||
data/spice-xpi-client-remote-viewer | 6 -
|
||||
data/virt-viewer.wxs.in | 11 -
|
||||
man/remote-viewer.pod | 6 -
|
||||
src/Makefile.am | 2 -
|
||||
src/remote-viewer.c | 448 +---------------------------
|
||||
7 files changed, 5 insertions(+), 472 deletions(-)
|
||||
delete mode 100644 data/spice-xpi-client-remote-viewer
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index d5eb258..4f5e3df 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -159,13 +159,12 @@ AC_ARG_WITH([spice-gtk],
|
||||
AS_IF([test "x$with_spice_gtk" != "xno" && test "x$with_spice_gtk" != "xyes"],
|
||||
[PKG_CHECK_EXISTS([spice-client-gtk-3.0 >= $SPICE_GTK_REQUIRED
|
||||
spice-client-glib-2.0 >= $SPICE_GTK_REQUIRED
|
||||
- spice-controller spice-protocol >= $SPICE_PROTOCOL_REQUIRED],
|
||||
+ spice-protocol >= $SPICE_PROTOCOL_REQUIRED],
|
||||
[with_spice_gtk=yes], [with_spice_gtk=no])])
|
||||
|
||||
AS_IF([test "x$with_spice_gtk" = "xyes"],
|
||||
[PKG_CHECK_MODULES(SPICE_GTK, [spice-client-gtk-3.0 >= $SPICE_GTK_REQUIRED
|
||||
spice-client-glib-2.0 >= $SPICE_GTK_REQUIRED])]
|
||||
- [PKG_CHECK_MODULES(SPICE_CONTROLLER, [spice-controller])]
|
||||
[PKG_CHECK_MODULES(SPICE_PROTOCOL, [spice-protocol >= $SPICE_PROTOCOL_REQUIRED])]
|
||||
[AC_DEFINE([HAVE_SPICE_GTK], 1, [Have spice-gtk?])]
|
||||
)
|
||||
diff --git a/data/Makefile.am b/data/Makefile.am
|
||||
index 55718d9..54be2b1 100644
|
||||
--- a/data/Makefile.am
|
||||
+++ b/data/Makefile.am
|
||||
@@ -3,7 +3,6 @@ CLEANFILES =
|
||||
MANUFACTURER = Virt Manager Project
|
||||
|
||||
EXTRA_DIST = \
|
||||
- spice-xpi-client-remote-viewer \
|
||||
virt-viewer.wxs.in \
|
||||
$(NULL)
|
||||
|
||||
diff --git a/data/spice-xpi-client-remote-viewer b/data/spice-xpi-client-remote-viewer
|
||||
deleted file mode 100644
|
||||
index 3109c66..0000000
|
||||
--- a/data/spice-xpi-client-remote-viewer
|
||||
+++ /dev/null
|
||||
@@ -1,6 +0,0 @@
|
||||
-#!/bin/sh
|
||||
-
|
||||
-logger -t spice "starting remote-viewer --spice-controller $@..."
|
||||
-env | logger -t spice
|
||||
-exec remote-viewer --spice-controller "$@" 2>&1 | logger -t spice
|
||||
-logger -t spice "remote-viewer execution failed"
|
||||
diff --git a/data/virt-viewer.wxs.in b/data/virt-viewer.wxs.in
|
||||
index 9838265..2047720 100644
|
||||
--- a/data/virt-viewer.wxs.in
|
||||
+++ b/data/virt-viewer.wxs.in
|
||||
@@ -55,16 +55,6 @@
|
||||
<Condition Message="VirtViewer is already installed.">NOT NEWERVERSIONDETECTED</Condition>
|
||||
|
||||
<DirectoryRef Id="TARGETDIR">
|
||||
- <Component Id="CRegistryEntries" Guid="*">
|
||||
- <RegistryKey Root='HKLM' Key='Software\Microsoft\Internet Explorer\Low Rights\ElevationPolicy\{96190E9D-6FBB-64DB-9095-29F6FDE0B897}'>
|
||||
- <RegistryValue Type='string' Name='AppPath' Value='[INSTALLDIR]\bin'/>
|
||||
- <RegistryValue Type='string' Name='AppName' Value='remote-viewer.exe'/>
|
||||
- <RegistryValue Type='integer' Name='Policy' Value='3'/>
|
||||
- </RegistryKey>
|
||||
- <RegistryKey Root='HKLM' Key='Software\spice-space.org\spicex'>
|
||||
- <RegistryValue Type='string' Name='client' Value='[INSTALLDIR]\bin\remote-viewer.exe --spice-controller'/>
|
||||
- </RegistryKey>
|
||||
- </Component>
|
||||
<Component Id="CProgIds" Guid="89D6F46D-9C5E-4D65-8456-58FC361E553E">
|
||||
<ProgId Id='VirtViewer.vvfile' Description='VirtViewer connection file'>
|
||||
<Extension Id='vv' ContentType='application/x-virt-viewer'>
|
||||
@@ -129,7 +119,6 @@
|
||||
<ComponentGroupRef Id="CG.virt-viewer"/>
|
||||
<ComponentRef Id="CDepsFile"/>
|
||||
<ComponentRef Id="CShortcut"/>
|
||||
- <ComponentRef Id="CRegistryEntries"/>
|
||||
<ComponentRef Id="CProgIds"/>
|
||||
<ComponentRef Id="CHwdataUSB"/>
|
||||
</Feature>
|
||||
diff --git a/man/remote-viewer.pod b/man/remote-viewer.pod
|
||||
index 60ea3a6..a050f4c 100644
|
||||
--- a/man/remote-viewer.pod
|
||||
+++ b/man/remote-viewer.pod
|
||||
@@ -55,12 +55,6 @@ CONFIGURATION section below.
|
||||
|
||||
Set the window title to B<TITLE>
|
||||
|
||||
-=item --spice-controller
|
||||
-
|
||||
-Use the SPICE controller to initialize the connection with the SPICE
|
||||
-server. This option is used by the SPICE browser addons to allow web
|
||||
-page to start a client.
|
||||
-
|
||||
=item --debug
|
||||
|
||||
Print debugging information
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index e87bcc7..d17f4c1 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -178,11 +178,9 @@ remote_viewer_SOURCES = \
|
||||
$(NULL)
|
||||
remote_viewer_LDFLAGS = \
|
||||
$(COMMON_LIBS) \
|
||||
- $(SPICE_CONTROLLER_LIBS) \
|
||||
$(NULL)
|
||||
remote_viewer_CFLAGS = \
|
||||
$(COMMON_CFLAGS) \
|
||||
- $(SPICE_CONTROLLER_CFLAGS) \
|
||||
$(NULL)
|
||||
remote_viewer_LDADD = \
|
||||
libvirt-viewer-util.la \
|
||||
diff --git a/src/remote-viewer.c b/src/remote-viewer.c
|
||||
index b132214..e25208d 100644
|
||||
--- a/src/remote-viewer.c
|
||||
+++ b/src/remote-viewer.c
|
||||
@@ -36,7 +36,6 @@
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_SPICE_GTK
|
||||
-#include <spice-controller.h>
|
||||
#include "virt-viewer-session-spice.h"
|
||||
#endif
|
||||
|
||||
@@ -49,10 +48,6 @@
|
||||
#include "remote-viewer-connect.h"
|
||||
|
||||
struct _RemoteViewerPrivate {
|
||||
-#ifdef HAVE_SPICE_GTK
|
||||
- SpiceCtrlController *controller;
|
||||
- SpiceCtrlForeignMenu *ctrl_foreign_menu;
|
||||
-#endif
|
||||
#ifdef HAVE_OVIRT
|
||||
OvirtForeignMenu *ovirt_foreign_menu;
|
||||
#endif
|
||||
@@ -78,33 +73,15 @@ static OvirtVm * choose_vm(GtkWindow *main_window,
|
||||
#endif
|
||||
|
||||
static gboolean remote_viewer_start(VirtViewerApp *self, GError **error);
|
||||
-#ifdef HAVE_SPICE_GTK
|
||||
-static gboolean remote_viewer_activate(VirtViewerApp *self, GError **error);
|
||||
-static void remote_viewer_window_added(GtkApplication *app, GtkWindow *w);
|
||||
-static void spice_foreign_menu_updated(RemoteViewer *self);
|
||||
-static void foreign_menu_title_changed(SpiceCtrlForeignMenu *menu, GParamSpec *pspec, RemoteViewer *self);
|
||||
-#endif
|
||||
|
||||
static void
|
||||
remote_viewer_dispose (GObject *object)
|
||||
{
|
||||
-#if defined(HAVE_SPICE_GTK) || defined(HAVE_OVIRT)
|
||||
+#if defined(HAVE_OVIRT)
|
||||
RemoteViewer *self = REMOTE_VIEWER(object);
|
||||
RemoteViewerPrivate *priv = self->priv;
|
||||
#endif
|
||||
|
||||
-#ifdef HAVE_SPICE_GTK
|
||||
- if (priv->controller) {
|
||||
- g_object_unref(priv->controller);
|
||||
- priv->controller = NULL;
|
||||
- }
|
||||
-
|
||||
- if (priv->ctrl_foreign_menu) {
|
||||
- g_object_unref(priv->ctrl_foreign_menu);
|
||||
- priv->ctrl_foreign_menu = NULL;
|
||||
- }
|
||||
-#endif
|
||||
-
|
||||
#ifdef HAVE_OVIRT
|
||||
if (priv->ovirt_foreign_menu) {
|
||||
g_object_unref(priv->ovirt_foreign_menu);
|
||||
@@ -132,7 +109,6 @@ remote_viewer_deactivated(VirtViewerApp *app, gboolean connect_error)
|
||||
|
||||
static gchar **opt_args = NULL;
|
||||
static char *opt_title = NULL;
|
||||
-static gboolean opt_controller = FALSE;
|
||||
|
||||
static void
|
||||
remote_viewer_add_option_entries(VirtViewerApp *self, GOptionContext *context, GOptionGroup *group)
|
||||
@@ -140,10 +116,6 @@ remote_viewer_add_option_entries(VirtViewerApp *self, GOptionContext *context, G
|
||||
static const GOptionEntry options[] = {
|
||||
{ "title", 't', 0, G_OPTION_ARG_STRING, &opt_title,
|
||||
N_("Set window title"), NULL },
|
||||
-#ifdef HAVE_SPICE_GTK
|
||||
- { "spice-controller", '\0', 0, G_OPTION_ARG_NONE, &opt_controller,
|
||||
- N_("Open connection using Spice controller communication"), NULL },
|
||||
-#endif
|
||||
{ G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_STRING_ARRAY, &opt_args,
|
||||
NULL, "URI|VV-FILE" },
|
||||
{ NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }
|
||||
@@ -184,27 +156,7 @@ remote_viewer_local_command_line (GApplication *gapp,
|
||||
g_object_set(app, "guri", opt_args[0], NULL);
|
||||
}
|
||||
|
||||
-#ifdef HAVE_SPICE_GTK
|
||||
- if (opt_controller) {
|
||||
- if (opt_args) {
|
||||
- g_printerr(_("\nError: extra arguments given while using Spice controller\n\n"));
|
||||
- ret = TRUE;
|
||||
- *status = 1;
|
||||
- goto end;
|
||||
- }
|
||||
-
|
||||
- self->priv->controller = spice_ctrl_controller_new();
|
||||
- self->priv->ctrl_foreign_menu = spice_ctrl_foreign_menu_new();
|
||||
-
|
||||
- g_object_set(self, "guest-name", "defined by Spice controller", NULL);
|
||||
-
|
||||
- g_signal_connect(self->priv->ctrl_foreign_menu, "notify::title",
|
||||
- G_CALLBACK(foreign_menu_title_changed),
|
||||
- self);
|
||||
- }
|
||||
-#endif
|
||||
-
|
||||
- if (opt_title && !opt_controller)
|
||||
+ if (opt_title)
|
||||
g_object_set(app, "title", opt_title, NULL);
|
||||
|
||||
end:
|
||||
@@ -241,7 +193,6 @@ static void
|
||||
remote_viewer_class_init (RemoteViewerClass *klass)
|
||||
{
|
||||
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
||||
- GtkApplicationClass *gtk_app_class = GTK_APPLICATION_CLASS(klass);
|
||||
VirtViewerAppClass *app_class = VIRT_VIEWER_APP_CLASS (klass);
|
||||
GApplicationClass *g_app_class = G_APPLICATION_CLASS(klass);
|
||||
|
||||
@@ -255,12 +206,6 @@ remote_viewer_class_init (RemoteViewerClass *klass)
|
||||
app_class->start = remote_viewer_start;
|
||||
app_class->deactivated = remote_viewer_deactivated;
|
||||
app_class->add_option_entries = remote_viewer_add_option_entries;
|
||||
-#ifdef HAVE_SPICE_GTK
|
||||
- app_class->activate = remote_viewer_activate;
|
||||
- gtk_app_class->window_added = remote_viewer_window_added;
|
||||
-#else
|
||||
- (void) gtk_app_class;
|
||||
-#endif
|
||||
|
||||
#ifdef HAVE_OVIRT
|
||||
g_object_class_install_property(object_class,
|
||||
@@ -288,217 +233,7 @@ remote_viewer_new(void)
|
||||
NULL);
|
||||
}
|
||||
|
||||
-#ifdef HAVE_SPICE_GTK
|
||||
-static void
|
||||
-foreign_menu_title_changed(SpiceCtrlForeignMenu *menu G_GNUC_UNUSED,
|
||||
- GParamSpec *pspec G_GNUC_UNUSED,
|
||||
- RemoteViewer *self)
|
||||
-{
|
||||
- gboolean has_focus;
|
||||
-
|
||||
- g_object_get(G_OBJECT(self), "has-focus", &has_focus, NULL);
|
||||
- /* FIXME: use a proper "new client connected" event
|
||||
- ** a foreign menu client set the title when connecting,
|
||||
- ** inform of focus state at that time.
|
||||
- */
|
||||
- spice_ctrl_foreign_menu_app_activated_msg(self->priv->ctrl_foreign_menu, has_focus);
|
||||
-
|
||||
- /* update menu title */
|
||||
- spice_foreign_menu_updated(self);
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-spice_ctrl_do_connect(SpiceCtrlController *ctrl G_GNUC_UNUSED,
|
||||
- VirtViewerApp *self)
|
||||
-{
|
||||
- GError *error = NULL;
|
||||
-
|
||||
- if (!virt_viewer_app_initial_connect(self, &error)) {
|
||||
- const gchar *msg = error ? error->message :
|
||||
- _("Failed to initiate connection");
|
||||
- virt_viewer_app_simple_message_dialog(self, msg);
|
||||
- g_clear_error(&error);
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-spice_ctrl_show(SpiceCtrlController *ctrl G_GNUC_UNUSED, RemoteViewer *self)
|
||||
-{
|
||||
- virt_viewer_app_show_display(VIRT_VIEWER_APP(self));
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-spice_ctrl_hide(SpiceCtrlController *ctrl G_GNUC_UNUSED, RemoteViewer *self)
|
||||
-{
|
||||
- virt_viewer_app_show_status(VIRT_VIEWER_APP(self), _("Display disabled by controller"));
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-spice_menuitem_activate_cb(GtkMenuItem *mi, GObject *ctrl)
|
||||
-{
|
||||
- SpiceCtrlMenuItem *menuitem = g_object_get_data(G_OBJECT(mi), "spice-menuitem");
|
||||
-
|
||||
- g_return_if_fail(menuitem != NULL);
|
||||
- if (gtk_menu_item_get_submenu(mi))
|
||||
- return;
|
||||
-
|
||||
- if (SPICE_CTRL_IS_CONTROLLER(ctrl))
|
||||
- spice_ctrl_controller_menu_item_click_msg(SPICE_CTRL_CONTROLLER(ctrl), menuitem->id);
|
||||
- else if (SPICE_CTRL_IS_FOREIGN_MENU(ctrl))
|
||||
- spice_ctrl_foreign_menu_menu_item_click_msg(SPICE_CTRL_FOREIGN_MENU(ctrl), menuitem->id);
|
||||
-}
|
||||
-
|
||||
-static GtkWidget *
|
||||
-ctrlmenu_to_gtkmenu (RemoteViewer *self, SpiceCtrlMenu *ctrlmenu, GObject *ctrl)
|
||||
-{
|
||||
- GList *l;
|
||||
- GtkWidget *menu = gtk_menu_new();
|
||||
- guint n = 0;
|
||||
-
|
||||
- for (l = ctrlmenu->items; l != NULL; l = l->next) {
|
||||
- SpiceCtrlMenuItem *menuitem = l->data;
|
||||
- GtkWidget *item;
|
||||
- char *s;
|
||||
- if (menuitem->text == NULL) {
|
||||
- g_warn_if_reached();
|
||||
- continue;
|
||||
- }
|
||||
-
|
||||
- for (s = menuitem->text; *s; s++)
|
||||
- if (*s == '&')
|
||||
- *s = '_';
|
||||
-
|
||||
- if (g_str_equal(menuitem->text, "-")) {
|
||||
- item = gtk_separator_menu_item_new();
|
||||
- } else if (menuitem->flags & CONTROLLER_MENU_FLAGS_CHECKED) {
|
||||
- item = gtk_check_menu_item_new_with_mnemonic(menuitem->text);
|
||||
- g_object_set(item, "active", TRUE, NULL);
|
||||
- } else {
|
||||
- item = gtk_menu_item_new_with_mnemonic(menuitem->text);
|
||||
- }
|
||||
-
|
||||
- if (menuitem->flags & (CONTROLLER_MENU_FLAGS_GRAYED | CONTROLLER_MENU_FLAGS_DISABLED))
|
||||
- gtk_widget_set_sensitive(item, FALSE);
|
||||
-
|
||||
- g_object_set_data_full(G_OBJECT(item), "spice-menuitem",
|
||||
- g_object_ref(menuitem), g_object_unref);
|
||||
- g_signal_connect(item, "activate", G_CALLBACK(spice_menuitem_activate_cb), ctrl);
|
||||
- gtk_menu_attach(GTK_MENU (menu), item, 0, 1, n, n + 1);
|
||||
- n += 1;
|
||||
-
|
||||
- if (menuitem->submenu) {
|
||||
- gtk_menu_item_set_submenu(GTK_MENU_ITEM(item),
|
||||
- ctrlmenu_to_gtkmenu(self, menuitem->submenu, ctrl));
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- if (n == 0) {
|
||||
- g_object_ref_sink(menu);
|
||||
- g_object_unref(menu);
|
||||
- menu = NULL;
|
||||
- }
|
||||
-
|
||||
- gtk_widget_show_all(menu);
|
||||
- return menu;
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-spice_menu_update(RemoteViewer *self, VirtViewerWindow *win)
|
||||
-{
|
||||
- GtkWidget *menuitem = g_object_get_data(G_OBJECT(win), "spice-menu");
|
||||
- SpiceCtrlMenu *menu;
|
||||
-
|
||||
- if (self->priv->controller == NULL)
|
||||
- return;
|
||||
-
|
||||
- if (menuitem != NULL)
|
||||
- gtk_widget_destroy(menuitem);
|
||||
-
|
||||
- {
|
||||
- GtkMenuShell *shell = GTK_MENU_SHELL(gtk_builder_get_object(virt_viewer_window_get_builder(win), "top-menu"));
|
||||
- menuitem = gtk_menu_item_new_with_label("Spice");
|
||||
- gtk_menu_shell_append(shell, menuitem);
|
||||
- g_object_set_data(G_OBJECT(win), "spice-menu", menuitem);
|
||||
- }
|
||||
-
|
||||
- g_object_get(self->priv->controller, "menu", &menu, NULL);
|
||||
- if (menu == NULL || g_list_length(menu->items) == 0) {
|
||||
- gtk_widget_set_visible(menuitem, FALSE);
|
||||
- } else {
|
||||
- gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem),
|
||||
- ctrlmenu_to_gtkmenu(self, menu, G_OBJECT(self->priv->controller)));
|
||||
- gtk_widget_set_visible(menuitem, TRUE);
|
||||
- }
|
||||
-
|
||||
- if (menu != NULL)
|
||||
- g_object_unref(menu);
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-spice_menu_update_each(gpointer value,
|
||||
- gpointer user_data)
|
||||
-{
|
||||
- spice_menu_update(REMOTE_VIEWER(user_data), VIRT_VIEWER_WINDOW(value));
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-spice_ctrl_menu_updated(RemoteViewer *self)
|
||||
-{
|
||||
- GList *windows = virt_viewer_app_get_windows(VIRT_VIEWER_APP(self));
|
||||
-
|
||||
- g_debug("Spice controller menu updated");
|
||||
-
|
||||
- g_list_foreach(windows, spice_menu_update_each, self);
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-spice_foreign_menu_update(RemoteViewer *self, VirtViewerWindow *win)
|
||||
-{
|
||||
- GtkWidget *menuitem = g_object_get_data(G_OBJECT(win), "foreign-menu");
|
||||
- SpiceCtrlMenu *menu;
|
||||
-
|
||||
- if (self->priv->ctrl_foreign_menu == NULL)
|
||||
- return;
|
||||
-
|
||||
- if (menuitem != NULL)
|
||||
- gtk_widget_destroy(menuitem);
|
||||
-
|
||||
- {
|
||||
- GtkMenuShell *shell = GTK_MENU_SHELL(gtk_builder_get_object(virt_viewer_window_get_builder(win), "top-menu"));
|
||||
- const gchar *title = spice_ctrl_foreign_menu_get_title(self->priv->ctrl_foreign_menu);
|
||||
- menuitem = gtk_menu_item_new_with_label(title);
|
||||
- gtk_menu_shell_append(shell, menuitem);
|
||||
- g_object_set_data(G_OBJECT(win), "foreign-menu", menuitem);
|
||||
- }
|
||||
-
|
||||
- g_object_get(self->priv->ctrl_foreign_menu, "menu", &menu, NULL);
|
||||
- if (menu == NULL || g_list_length(menu->items) == 0) {
|
||||
- gtk_widget_set_visible(menuitem, FALSE);
|
||||
- } else {
|
||||
- gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem),
|
||||
- ctrlmenu_to_gtkmenu(self, menu, G_OBJECT(self->priv->ctrl_foreign_menu)));
|
||||
- gtk_widget_set_visible(menuitem, TRUE);
|
||||
- }
|
||||
- g_object_unref(menu);
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-spice_foreign_menu_update_each(gpointer value,
|
||||
- gpointer user_data)
|
||||
-{
|
||||
- spice_foreign_menu_update(REMOTE_VIEWER(user_data), VIRT_VIEWER_WINDOW(value));
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-spice_foreign_menu_updated(RemoteViewer *self)
|
||||
-{
|
||||
- GList *windows = virt_viewer_app_get_windows(VIRT_VIEWER_APP(self));
|
||||
-
|
||||
- g_debug("Spice foreign menu updated");
|
||||
-
|
||||
- g_list_foreach(windows, spice_foreign_menu_update_each, self);
|
||||
-}
|
||||
-
|
||||
+#if defined(HAVE_SPICE_GTK) && defined(HAVE_OVIRT)
|
||||
static SpiceSession *
|
||||
remote_viewer_get_spice_session(RemoteViewer *self)
|
||||
{
|
||||
@@ -514,158 +249,6 @@ remote_viewer_get_spice_session(RemoteViewer *self)
|
||||
|
||||
return session;
|
||||
}
|
||||
-
|
||||
-static void
|
||||
-app_notified(VirtViewerApp *app,
|
||||
- GParamSpec *pspec,
|
||||
- RemoteViewer *self)
|
||||
-{
|
||||
- GValue value = G_VALUE_INIT;
|
||||
-
|
||||
- g_value_init(&value, pspec->value_type);
|
||||
- g_object_get_property(G_OBJECT(app), pspec->name, &value);
|
||||
-
|
||||
- if (g_str_equal(pspec->name, "has-focus")) {
|
||||
- if (self->priv->ctrl_foreign_menu)
|
||||
- spice_ctrl_foreign_menu_app_activated_msg(self->priv->ctrl_foreign_menu, g_value_get_boolean(&value));
|
||||
- }
|
||||
-
|
||||
- g_value_unset(&value);
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-spice_ctrl_notified(SpiceCtrlController *ctrl,
|
||||
- GParamSpec *pspec,
|
||||
- RemoteViewer *self)
|
||||
-{
|
||||
- SpiceSession *session = remote_viewer_get_spice_session(self);
|
||||
- GValue value = G_VALUE_INIT;
|
||||
- VirtViewerApp *app = VIRT_VIEWER_APP(self);
|
||||
-
|
||||
- g_return_if_fail(session != NULL);
|
||||
-
|
||||
- g_value_init(&value, pspec->value_type);
|
||||
- g_object_get_property(G_OBJECT(ctrl), pspec->name, &value);
|
||||
-
|
||||
- if (g_str_equal(pspec->name, "host") ||
|
||||
- g_str_equal(pspec->name, "port") ||
|
||||
- g_str_equal(pspec->name, "password") ||
|
||||
- g_str_equal(pspec->name, "ca-file") ||
|
||||
- g_str_equal(pspec->name, "enable-smartcard") ||
|
||||
- g_str_equal(pspec->name, "color-depth") ||
|
||||
- g_str_equal(pspec->name, "disable-effects") ||
|
||||
- g_str_equal(pspec->name, "enable-usbredir") ||
|
||||
- g_str_equal(pspec->name, "secure-channels") ||
|
||||
- g_str_equal(pspec->name, "proxy")) {
|
||||
- g_object_set_property(G_OBJECT(session), pspec->name, &value);
|
||||
- } else if (g_str_equal(pspec->name, "sport")) {
|
||||
- g_object_set_property(G_OBJECT(session), "tls-port", &value);
|
||||
- } else if (g_str_equal(pspec->name, "tls-ciphers")) {
|
||||
- g_object_set_property(G_OBJECT(session), "ciphers", &value);
|
||||
- } else if (g_str_equal(pspec->name, "host-subject")) {
|
||||
- g_object_set_property(G_OBJECT(session), "cert-subject", &value);
|
||||
- } else if (g_str_equal(pspec->name, "enable-usb-autoshare")) {
|
||||
- VirtViewerSession *vsession = NULL;
|
||||
-
|
||||
- g_object_get(self, "session", &vsession, NULL);
|
||||
- g_object_set_property(G_OBJECT(vsession), "auto-usbredir", &value);
|
||||
- g_object_unref(G_OBJECT(vsession));
|
||||
- } else if (g_str_equal(pspec->name, "usb-filter")) {
|
||||
- SpiceUsbDeviceManager *manager;
|
||||
- manager = spice_usb_device_manager_get(session, NULL);
|
||||
- if (manager != NULL) {
|
||||
- g_object_set_property(G_OBJECT(manager),
|
||||
- "auto-connect-filter",
|
||||
- &value);
|
||||
- }
|
||||
- } else if (g_str_equal(pspec->name, "title")) {
|
||||
- g_object_set(app, "title", g_value_get_string(&value), NULL);
|
||||
- } else if (g_str_equal(pspec->name, "display-flags")) {
|
||||
- guint flags = g_value_get_uint(&value);
|
||||
- gboolean fullscreen = !!(flags & CONTROLLER_SET_FULL_SCREEN);
|
||||
- g_object_set(G_OBJECT(self), "fullscreen", fullscreen, NULL);
|
||||
- } else if (g_str_equal(pspec->name, "menu")) {
|
||||
- spice_ctrl_menu_updated(self);
|
||||
- } else if (g_str_equal(pspec->name, "hotkeys")) {
|
||||
- virt_viewer_app_set_hotkeys(app, g_value_get_string(&value));
|
||||
- } else {
|
||||
- gchar *content = g_strdup_value_contents(&value);
|
||||
-
|
||||
- g_debug("unimplemented property: %s=%s", pspec->name, content);
|
||||
- g_free(content);
|
||||
- }
|
||||
-
|
||||
- g_object_unref(session);
|
||||
- g_value_unset(&value);
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-spice_ctrl_foreign_menu_notified(SpiceCtrlForeignMenu *ctrl_foreign_menu G_GNUC_UNUSED,
|
||||
- GParamSpec *pspec,
|
||||
- RemoteViewer *self)
|
||||
-{
|
||||
- if (g_str_equal(pspec->name, "menu")) {
|
||||
- spice_foreign_menu_updated(self);
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-spice_ctrl_listen_async_cb(GObject *object,
|
||||
- GAsyncResult *res,
|
||||
- gpointer user_data)
|
||||
-{
|
||||
- GError *error = NULL;
|
||||
- VirtViewerApp *app = VIRT_VIEWER_APP(user_data);
|
||||
-
|
||||
- if (SPICE_CTRL_IS_CONTROLLER(object))
|
||||
- spice_ctrl_controller_listen_finish(SPICE_CTRL_CONTROLLER(object), res, &error);
|
||||
- else if (SPICE_CTRL_IS_FOREIGN_MENU(object)) {
|
||||
- spice_ctrl_foreign_menu_listen_finish(SPICE_CTRL_FOREIGN_MENU(object), res, &error);
|
||||
- } else
|
||||
- g_warn_if_reached();
|
||||
-
|
||||
- if (error != NULL) {
|
||||
- virt_viewer_app_simple_message_dialog(app,
|
||||
- _("Controller connection failed: %s"),
|
||||
- error->message);
|
||||
- g_clear_error(&error);
|
||||
- exit(EXIT_FAILURE); /* TODO: make start async? */
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-
|
||||
-static gboolean
|
||||
-remote_viewer_activate(VirtViewerApp *app, GError **error)
|
||||
-{
|
||||
- RemoteViewer *self;
|
||||
- gboolean ret = FALSE;
|
||||
-
|
||||
- g_return_val_if_fail(REMOTE_VIEWER_IS(app), FALSE);
|
||||
-
|
||||
- self = REMOTE_VIEWER(app);
|
||||
-
|
||||
- if (self->priv->controller) {
|
||||
- SpiceSession *session = remote_viewer_get_spice_session(self);
|
||||
- ret = spice_session_connect(session);
|
||||
- g_object_unref(session);
|
||||
- } else {
|
||||
- ret = VIRT_VIEWER_APP_CLASS(remote_viewer_parent_class)->activate(app, error);
|
||||
- }
|
||||
-
|
||||
- return ret;
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-remote_viewer_window_added(GtkApplication *app,
|
||||
- GtkWindow *w)
|
||||
-{
|
||||
- VirtViewerWindow *win = VIRT_VIEWER_WINDOW(
|
||||
- g_object_get_data(G_OBJECT(w), "virt-viewer-window"));
|
||||
- spice_menu_update(REMOTE_VIEWER(app), win);
|
||||
- spice_foreign_menu_update(REMOTE_VIEWER(app), win);
|
||||
-
|
||||
- GTK_APPLICATION_CLASS(remote_viewer_parent_class)->window_added(app, w);
|
||||
-}
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_OVIRT
|
||||
@@ -1094,29 +677,8 @@ remote_viewer_start(VirtViewerApp *app, GError **err)
|
||||
gchar *type = NULL;
|
||||
GError *error = NULL;
|
||||
|
||||
-#ifdef HAVE_SPICE_GTK
|
||||
- g_signal_connect(app, "notify", G_CALLBACK(app_notified), self);
|
||||
-
|
||||
- if (priv->controller) {
|
||||
- if (!virt_viewer_app_create_session(app, "spice", &error)) {
|
||||
- g_debug("Couldn't create a Spice session");
|
||||
- goto cleanup;
|
||||
- }
|
||||
-
|
||||
- g_signal_connect(priv->controller, "notify", G_CALLBACK(spice_ctrl_notified), self);
|
||||
- g_signal_connect(priv->controller, "do_connect", G_CALLBACK(spice_ctrl_do_connect), self);
|
||||
- g_signal_connect(priv->controller, "show", G_CALLBACK(spice_ctrl_show), self);
|
||||
- g_signal_connect(priv->controller, "hide", G_CALLBACK(spice_ctrl_hide), self);
|
||||
-
|
||||
- spice_ctrl_controller_listen(priv->controller, NULL, spice_ctrl_listen_async_cb, self);
|
||||
-
|
||||
- g_signal_connect(priv->ctrl_foreign_menu, "notify", G_CALLBACK(spice_ctrl_foreign_menu_notified), self);
|
||||
- spice_ctrl_foreign_menu_listen(priv->ctrl_foreign_menu, NULL, spice_ctrl_listen_async_cb, self);
|
||||
-
|
||||
- virt_viewer_app_show_status(VIRT_VIEWER_APP(self), _("Setting up Spice session..."));
|
||||
- } else {
|
||||
-#endif
|
||||
retry_dialog:
|
||||
+ {
|
||||
if (priv->open_recent_dialog) {
|
||||
VirtViewerWindow *main_window = virt_viewer_app_get_main_window(app);
|
||||
if (!remote_viewer_connect_dialog(virt_viewer_window_get_window(main_window), &guri)) {
|
||||
@@ -1186,9 +748,7 @@ retry_dialog:
|
||||
}
|
||||
goto cleanup;
|
||||
}
|
||||
-#ifdef HAVE_SPICE_GTK
|
||||
}
|
||||
-#endif
|
||||
|
||||
ret = VIRT_VIEWER_APP_CLASS(remote_viewer_parent_class)->start(app, &error);
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
64
changelog
Normal file
64
changelog
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Tue Jul 9 2024 Daniel P. Berrangé <berrange@redhat.com> - 11.0-9
|
||||
- Tweak pod2man dep to suit flatpak builds better
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Mon Aug 22 2022 Daniel P. Berrangé <berrange@redhat.com> - 11.0-5
|
||||
- Disable govirt since it is still stuck on soup2 (rhbz#2119727)
|
||||
|
||||
* Tue Aug 2 2022 Daniel P. Berrangé <berrange@redhat.com> - 11.0-4
|
||||
- Fix meson parameter error (rhbz #2113755)
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Tue Nov 30 2021 Daniel P. Berrangé <berrange@redhat.com> - 11.0-1
|
||||
- Rebase to 11.0 release
|
||||
- Fixes often disabled send-key menu (rhbz#2020872)
|
||||
|
||||
* Thu Nov 25 2021 Daniel P. Berrangé <berrange@redhat.com> - 10.0-6
|
||||
- Add missing dep on libvirt-clients for bash completion
|
||||
- Refactor setting build-id opt
|
||||
|
||||
* Tue Nov 16 2021 Tom Stellard <tstellar@redhat.com> - 10.0-5
|
||||
- Backport fix for uninitialized variable
|
||||
|
||||
* Wed Aug 11 2021 Daniel P. Berrangé <berrange@redhat.com> - 10.0-4
|
||||
- Fix build with newer glib (rhbz#1988037)
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 10.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Mon Apr 26 2021 Daniel P. Berrangé <berrange@redhat.com> - 10.0-2
|
||||
- Explicitly disable spice/ovirt
|
||||
|
||||
* Tue Apr 20 2021 Daniel P. Berrangé <berrange@redhat.com> - 10.0-1
|
||||
- Update to 10.0 release
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri May 1 2020 Daniel P. Berrangé <berrange@redhat.com> - 9.0-1
|
||||
- Update to 9.0 release
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (virt-viewer-6.0.tar.gz) = 656d48f8ab387d025c406cb5f56164d79104c6c377fae37d9c524b90e512fe873d5d1d6c435d4ea95e71468b7d3384b89789495075cafb1a9e67f583f7d49ec2
|
||||
SHA512 (virt-viewer-11.0.tar.xz) = 738034e15e40a7aaadd2646bf289c12409cbf2d06925d43baa50fa7bc8438188480d6b97687e9816427ac0a9dae84d205351715cb2f38afdbefa2dd1d134904a
|
||||
|
|
|
|||
317
virt-viewer.spec
317
virt-viewer.spec
|
|
@ -1,64 +1,48 @@
|
|||
# -*- rpm-spec -*-
|
||||
|
||||
# Default to skipping autoreconf. Distros can change just this one line
|
||||
# (or provide a command-line override) if they backport any patches that
|
||||
# touch configure.ac or Makefile.am.
|
||||
%{!?enable_autotools:%define enable_autotools 1}
|
||||
|
||||
%define with_spice 0
|
||||
%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6
|
||||
%define with_spice 1
|
||||
%endif
|
||||
|
||||
%define with_govirt 0
|
||||
%if 0%{?fedora} > 19 || 0%{?rhel} >= 7
|
||||
%define with_govirt 1
|
||||
%if 0%{?rhel} >= 9
|
||||
%global with_govirt 0
|
||||
%global with_spice 0
|
||||
%else
|
||||
# Disabled since it is still stuck on soup2
|
||||
%global with_govirt 0
|
||||
%global with_spice 1
|
||||
%endif
|
||||
|
||||
Name: virt-viewer
|
||||
Version: 6.0
|
||||
Release: 4%{?dist}%{?extra_release}
|
||||
Version: 11.0
|
||||
Release: %autorelease
|
||||
Summary: Virtual Machine Viewer
|
||||
Group: Applications/System
|
||||
License: GPLv2+
|
||||
URL: http://virt-manager.org/
|
||||
Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
|
||||
|
||||
# rhbz#1596215 - Rebuild virt-viewer with latest spice-glib
|
||||
Patch0001: 0001-spice-controller-interface-is-being-removed-from-spi.patch
|
||||
|
||||
License: GPL-2.0-or-later
|
||||
URL: https://gitlab.com/virt-viewer/virt-viewer
|
||||
Source0: https://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.xz
|
||||
Patch: 0001-data-remove-bogus-param-for-meson-i18n.merge_file.patch
|
||||
Patch: 0001-Read-oVirt-CA-and-pass-it-to-gtk-vnc.patch
|
||||
Requires: openssh-clients
|
||||
Requires(post): %{_sbindir}/update-alternatives
|
||||
Requires(postun): %{_sbindir}/update-alternatives
|
||||
Requires(post): desktop-file-utils
|
||||
Requires(postun): desktop-file-utils
|
||||
|
||||
%if 0%{?enable_autotools}
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: gettext-devel
|
||||
BuildRequires: libtool
|
||||
%endif
|
||||
# Our bash completion script uses virsh to list domains
|
||||
Requires: libvirt-client
|
||||
|
||||
BuildRequires: pkgconfig(glib-2.0) >= 2.38
|
||||
BuildRequires: pkgconfig(gtk+-3.0) >= 3.12
|
||||
BuildRequires: pkgconfig(libvirt) >= 0.10.0
|
||||
BuildRequires: pkgconfig(libvirt-glib-1.0) >= 0.1.8
|
||||
BuildRequires: pkgconfig(libxml-2.0) >= 2.6.0
|
||||
BuildRequires: pkgconfig(gtk-vnc-2.0) >= 0.4.0
|
||||
BuildRequires: gcc
|
||||
BuildRequires: meson
|
||||
BuildRequires: pkgconfig(glib-2.0)
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(libvirt)
|
||||
BuildRequires: pkgconfig(libvirt-glib-1.0)
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
BuildRequires: pkgconfig(gtk-vnc-2.0) >= 1.5.0
|
||||
BuildRequires: pkgconfig(vte-2.91)
|
||||
%if %{with_spice}
|
||||
BuildRequires: pkgconfig(spice-client-gtk-3.0) >= 0.35
|
||||
BuildRequires: pkgconfig(spice-protocol) >= 0.12.7
|
||||
BuildRequires: pkgconfig(spice-client-gtk-3.0)
|
||||
BuildRequires: pkgconfig(spice-protocol)
|
||||
%endif
|
||||
BuildRequires: /usr/bin/pod2man
|
||||
BuildRequires: intltool
|
||||
BuildRequires: perl-podlators
|
||||
BuildRequires: gettext
|
||||
%if %{with_govirt}
|
||||
BuildRequires: pkgconfig(govirt-1.0) >= 0.3.2
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} >= 20
|
||||
Obsoletes: spice-client < 0.12.3-2
|
||||
BuildRequires: pkgconfig(govirt-1.0)
|
||||
BuildRequires: pkgconfig(rest-0.7)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(bash-completion)
|
||||
|
||||
|
||||
%description
|
||||
|
|
@ -67,239 +51,52 @@ to virtual machines. It uses the GTK-VNC or SPICE-GTK widgets to provide
|
|||
the display, and libvirt for looking up VNC/SPICE server details.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0001 -p1
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
|
||||
%if 0%{?enable_autotools}
|
||||
autoreconf -if
|
||||
%endif
|
||||
%define buildid_opt -Dbuild-id=%{release}
|
||||
|
||||
%if %{with_spice}
|
||||
%define spice_arg --with-spice-gtk
|
||||
# Enable -Werror on RHEL which has stable GCC toolchain, and
|
||||
# disable on Fedora/ELN which frequently sees new warnings
|
||||
# from updated GCC versions
|
||||
%if 0%{?rhel} && !0%{?eln}
|
||||
%define werror_opt -Dwerror=true
|
||||
%else
|
||||
%define spice_arg --without-spice-gtk
|
||||
%define werror_opt -Dwerror=false -Dgit_werror=disabled
|
||||
%endif
|
||||
|
||||
%if %{with_govirt}
|
||||
%define govirt_arg --with-ovirt
|
||||
%if !%{with_govirt}
|
||||
%define ovirt_opt -Dovirt=disabled
|
||||
%endif
|
||||
|
||||
%configure %{spice_arg} %{gtk_arg} %{govirt_arg} --with-buildid=%{release} --disable-update-mimedb
|
||||
%__make %{?_smp_mflags}
|
||||
%if !%{with_spice}
|
||||
%define spice_opt -Dspice=disabled
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel} > 0
|
||||
%define osid_opt -Dos-id=rhel%{?rhel}
|
||||
%endif
|
||||
|
||||
%meson %{buildid_opt} %{werror_opt} %{?ovirt_opt} %{?spice_opt} %{?osid_opt}
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
%__make install DESTDIR=$RPM_BUILD_ROOT
|
||||
%meson_install
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root,-)
|
||||
%doc README.md COPYING AUTHORS ChangeLog NEWS
|
||||
%doc README.md COPYING AUTHORS NEWS
|
||||
%{_bindir}/%{name}
|
||||
%{_bindir}/remote-viewer
|
||||
%{_datadir}/icons/hicolor/*/apps/*
|
||||
%{_datadir}/icons/hicolor/*/devices/*
|
||||
%{_datadir}/applications/remote-viewer.desktop
|
||||
%{_datadir}/appdata/remote-viewer.appdata.xml
|
||||
%{_datadir}/metainfo/remote-viewer.appdata.xml
|
||||
%{_datadir}/mime/packages/virt-viewer-mime.xml
|
||||
%{_mandir}/man1/virt-viewer.1*
|
||||
%{_mandir}/man1/remote-viewer.1*
|
||||
%{_datadir}/bash-completion/completions/virt-viewer
|
||||
|
||||
%changelog
|
||||
* Thu Jul 19 2018 Fabiano Fidêncio <fidencio@fedoraproject.org> - 6.0-4
|
||||
- Rebuild for spice-controller so being removed
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 6.0-2
|
||||
- Remove obsolete scriptlets
|
||||
|
||||
* Tue Aug 15 2017 Daniel P. Berrange <berrange@redhat.com> - 6.0-1
|
||||
- Update to 6.0 release
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Thu Nov 24 2016 Daniel P. Berrange <berrange@redhat.com> - 5.0-1
|
||||
- Update to 5.0 release
|
||||
|
||||
* Wed Oct 05 2016 Christophe Fergeau <cfergeau@redhat.com> 4.0-2
|
||||
- Add upstream patch fixing virt-viewer window gradually getting bigger and
|
||||
bigger
|
||||
|
||||
* Thu Jun 30 2016 Daniel P. Berrange <berrange@redhat.com> - 4.0-1
|
||||
- Update to 4.0 release
|
||||
|
||||
* Wed Jun 22 2016 Christophe Fergeau <cfergeau@redhat.com> - 3.0-3
|
||||
- Rebuild for spice-gtk ABI break
|
||||
|
||||
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Fri Dec 4 2015 Fabiano Fidêncio <fidencio@redhat.com> - 3.0-1
|
||||
- Update to 3.0 release
|
||||
|
||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Mon Jan 12 2015 Daniel P. Berrange <berrange@redhat.com> - 2.0-1
|
||||
- Update to 2.0 release
|
||||
|
||||
* Sat Sep 27 2014 Rex Dieter <rdieter@fedoraproject.org> - 1.0-3
|
||||
- update/optimize mime scriptlets
|
||||
|
||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Mon Jul 21 2014 Daniel P. Berrange <berrange@redhat.com> - 1.0-1
|
||||
- Update to 1.0 release
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Wed Feb 26 2014 Christophe Fergeau <cfergeau@redhat.com> 0.6.0-1
|
||||
- Update to 0.6.0 release
|
||||
|
||||
* Tue Nov 26 2013 Christophe Fergeau <cfergeau@redhat.com> 0.5.7-2
|
||||
- Rebuild for new libgovirt
|
||||
|
||||
* Wed Jul 31 2013 Daniel P. Berrange <berrange@redhat.com> - 0.5.7-1
|
||||
- Update to 0.5.7 release
|
||||
|
||||
* Thu May 23 2013 Christophe Fergeau <cfergeau@redhat.com> - 0.5.6-2
|
||||
- Mark remote-viewer as replacing spice-client
|
||||
|
||||
* Wed May 1 2013 Daniel P. Berrange <berrange@redhat.com> - 0.5.6-1
|
||||
- Update to 0.5.6 release
|
||||
|
||||
* Wed Feb 13 2013 Daniel P. Berrange <berrange@redhat.com> - 0.5.5-1
|
||||
- Update to 0.5.5 release
|
||||
|
||||
* Fri Dec 14 2012 Cole Robinson <crobinso@redhat.com> - 0.5.4-3
|
||||
- Fix crash after entering spice password (bz #880381)
|
||||
|
||||
* Sat Oct 13 2012 Chris Tyler <chris@tylers.info> - 0.5.4-2
|
||||
- Enabled spice support for ARM archs
|
||||
|
||||
* Mon Sep 17 2012 Daniel P. Berrange <berrange@redhat.com> - 0.5.4-1
|
||||
- Update to 0.5.4 release
|
||||
|
||||
* Fri Sep 14 2012 Hans de Goede <hdegoede@redhat.com> - 0.5.3-6
|
||||
- Rebuild for spice-gtk ABI breakage (previous spice-gtk build was borked)
|
||||
|
||||
* Tue Sep 11 2012 Hans de Goede <hdegoede@redhat.com> - 0.5.3-5
|
||||
- Rebuild for spice-gtk ABI breakage
|
||||
|
||||
* Fri Sep 7 2012 Hans de Goede <hdegoede@redhat.com> - 0.5.3-4
|
||||
- Rebuild for spice-gtk soname change
|
||||
|
||||
* Mon Aug 13 2012 Daniel P. Berrange <berrange@redhat.com> - 0.5.3-3
|
||||
- Rebuild for spice-gtk soname change
|
||||
|
||||
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Wed May 16 2012 Daniel P. Berrange <berrange@redhat.com> - 0.5.3-1
|
||||
- Update to 0.5.3 release
|
||||
|
||||
* Fri Mar 9 2012 Daniel P. Berrange <berrange@redhat.com> - 0.5.2-1
|
||||
- Update to 0.5.2 release
|
||||
|
||||
* Fri Feb 17 2012 Daniel P. Berrange <berrange@redhat.com> - 0.5.1-1
|
||||
- Update to 0.5.1 release
|
||||
|
||||
* Tue Feb 14 2012 Daniel P. Berrange <berrange@redhat.com> - 0.5.0-1
|
||||
- Update to 0.5.0 release
|
||||
|
||||
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Wed Nov 9 2011 Daniel P. Berrange <berrange@redhat.com> - 0.4.2-1
|
||||
- Update to 0.4.2 release
|
||||
|
||||
* Sun Aug 14 2011 Daniel P. Berrange <berrange@redhat.com> - 0.4.1-3
|
||||
- More ssh tunnelling port fixes
|
||||
|
||||
* Fri Aug 12 2011 Daniel P. Berrange <berrange@redhat.com> - 0.4.1-2
|
||||
- Fix ssh tunnelling
|
||||
|
||||
* Thu Aug 4 2011 Daniel P. Berrange <berrange@redhat.com> - 0.4.1-1
|
||||
- Update to 0.4.1 release
|
||||
|
||||
* Tue Aug 2 2011 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-2
|
||||
- Rebuild for accidental spice-glib soname change
|
||||
|
||||
* Tue Jul 12 2011 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-1
|
||||
- Update to 0.4.0 release
|
||||
- Switch build to GTK3 instead of GTK2
|
||||
|
||||
* Tue May 31 2011 Daniel P. Berrange <berrange@redhat.com> - 0.3.1-2
|
||||
- Rebuild for spice-glib ABI breakage
|
||||
|
||||
* Wed May 11 2011 Karsten Hopp <karsten@redhat.com> 0.3.1-1.1
|
||||
- spice-gtk is x86 x86_64 only, don't require it on other archs
|
||||
|
||||
* Mon Feb 21 2011 Daniel P. Berrange <berrange@redhat.com> - 0.3.1-1
|
||||
- Update to 0.3.1 release
|
||||
|
||||
* Mon Feb 21 2011 Daniel P. Berrange <berrange@redhat.com> - 0.3.0-1
|
||||
- Update to 0.3.0 and enable SPICE
|
||||
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Fri Jan 15 2010 Daniel P. Berrange <berrange@redhat.com> - 0.2.1-1
|
||||
- Update to 0.2.1 release
|
||||
|
||||
* Wed Jul 29 2009 Daniel P. Berrange <berrange@redhat.com> - 0.2.0-1.fc12
|
||||
- Update to 0.2.0 release
|
||||
|
||||
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.3-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Thu May 7 2009 Daniel P. Berrange <berrange@redhat.com> - 0.0.3-5.fc12
|
||||
- Fix auth against libvirt (rhbz #499594)
|
||||
- Fix confusion of VNC credentials (rhbz #499595)
|
||||
- Correct keyboard grab handling (rhbz #499362)
|
||||
|
||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.3-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Mon Jul 7 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.0.3-3.fc10
|
||||
- fix conditional comparison
|
||||
- remove file dep
|
||||
|
||||
* Wed Jun 25 2008 Daniel P. Berrange <berrange@redhat.com> - 0.0.3-2.fc10
|
||||
- Rebuild for GNU TLS ABI bump
|
||||
|
||||
* Mon Mar 10 2008 Daniel P. Berrange <berrange@redhat.com> - 0.0.3-1.fc9
|
||||
- Updated to 0.0.3 release
|
||||
|
||||
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.0.2-4
|
||||
- Autorebuild for GCC 4.3
|
||||
|
||||
* Fri Jan 11 2008 Daniel P. Berrange <berrange@redhat.com> - 0.0.2-3.fc9
|
||||
- Set domain name as window title
|
||||
- Hide input for passwd fields during auth
|
||||
|
||||
* Mon Oct 15 2007 Daniel P. Berrange <berrange@redhat.com> - 0.0.2-2.fc8
|
||||
- Change TLS x509 credential name to sync with libvirt
|
||||
|
||||
* Tue Aug 28 2007 Daniel P. Berrange <berrange@redhat.com> - 0.0.2-1.fc8
|
||||
- Added support for remote console access
|
||||
|
||||
* Fri Aug 17 2007 Daniel P. Berrange <berrange@redhat.com> - 0.0.1-2.fc8
|
||||
- Restrict built to x86 & ia64 because libvirt is only on those arches
|
||||
|
||||
* Wed Aug 15 2007 Daniel P. Berrange <berrange@redhat.com> - 0.0.1-1.fc8
|
||||
- First release
|
||||
%autochangelog
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue