[gnome-boxes/cleanup-displays: 1/3] Drop VNC

[Felipe Borges <felipeborges src gnome org>]

commit a5a2ebdd67d66674f2af4c032eb392b14a0ff93f
Author: Felipe Borges <felipeborges gnome org>
Date:   Wed Jun 29 11:32:03 2022 +0200

    Drop VNC
    
    There were stakeholders that wanted us to pursue a route where Boxes
    could work without SPICE. For this reason the VNC display was kept
    around and offered as a fallback for when SPICE is not available in
    the build environment.
    
    As of now we have decided that Boxes should be a single display
    protocol tool for simplicity, and that SPICE should be only removed
    when there's a drop-in replacement with feature parity.
    
    I really don't want to go down the route of supporting multiple
    protocols again.

 .gitlab-ci.yml                               |   4 +-
 build-aux/flatpak/org.gnome.BoxesDevel.json  |  14 ---
 help/C/list-of-supported-protocols.page.stub |   1 -
 help/C/supported-protocols.page              |   8 --
 src/app.vala                                 |   1 -
 src/libvirt-machine.vala                     |   3 -
 src/meson.build                              |   3 -
 src/vm-configurator.vala                     |   2 -
 src/vnc-display.vala                         | 142 ---------------------------
 tests/meson.build                            |   3 +-
 tests/vnc.feature                            |  29 ------
 11 files changed, 3 insertions(+), 207 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58535786..2511bfd7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,12 +28,12 @@ fedora:latest:
     before_script:
     - dnf update -y --nogpgcheck
     - dnf install -y meson git vala gtk3-devel
-                     gtk-vnc2-devel libosinfo-devel libsecret-devel
+                     libosinfo-devel libsecret-devel
                      libvirt-gconfig-devel libvirt-gobject-devel
                      spice-gtk3-vala libarchive-devel gettext
                      libgudev-devel webkitgtk4-devel libusbx-devel
                      tracker3-devel libosinfo-vala freerdp-devel
-                     python3-devel libxml2-devel gvncpulse-devel
+                     python3-devel libxml2-devel
                      libhandy1-devel gtksourceview4-devel
                      --nogpgcheck
 
diff --git a/build-aux/flatpak/org.gnome.BoxesDevel.json b/build-aux/flatpak/org.gnome.BoxesDevel.json
index b2e4b609..68196adc 100644
--- a/build-aux/flatpak/org.gnome.BoxesDevel.json
+++ b/build-aux/flatpak/org.gnome.BoxesDevel.json
@@ -306,20 +306,6 @@
                 }
             ]
         },
-        {
-            "name": "gtk-vnc",
-            "buildsystem": "meson",
-            "config-opts": [
-                "-Dpulseaudio=enabled"
-            ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://download.gnome.org/sources/gtk-vnc/1.2/gtk-vnc-1.2.0.tar.xz";,
-                    "sha256": "7aaf80040d47134a963742fb6c94e970fcb6bf52dc975d7ae542b2ef5f34b94a"
-                }
-            ]
-        },
         {
             "name": "libosinfo",
             "buildsystem": "meson",
diff --git a/help/C/list-of-supported-protocols.page.stub b/help/C/list-of-supported-protocols.page.stub
index 4df8fd77..5d412858 100644
--- a/help/C/list-of-supported-protocols.page.stub
+++ b/help/C/list-of-supported-protocols.page.stub
@@ -22,7 +22,6 @@
   <list>
     <comment><p>features taken from http://fedoraproject.org/wiki/Features/Spice</p></comment>
     <item><p>SPICE (which stands for Simple Protocol for Independent Computing Environments). It features 
accelerated 2D graphics, "Hardware" cursor support, Audio playing, Audio recording, Encryption, it is a 
modern protocol.</p></item>
-    <item><p>VNC, which features only remote display, is a well know protocol but quite limited and 
slow.</p></item>
   </list>
 
 </page>
diff --git a/help/C/supported-protocols.page b/help/C/supported-protocols.page
index 374f9ff7..a775529d 100644
--- a/help/C/supported-protocols.page
+++ b/help/C/supported-protocols.page
@@ -78,13 +78,5 @@
   <p><app>spice-gtk</app> is the SPICE client that provides a view into the
    guest OS.</p>
 
-</section>
-<section id="vnc">
-
-<title>VNC</title>
-
-  <p><app>VNC</app>, Virtual Network Computing, used as fallback when SPICE
-  is not available, is a well know protocol but quite limited and slow.</p>
-
 </section>
 </page>
diff --git a/src/app.vala b/src/app.vala
index 03dac7b5..cff665b0 100644
--- a/src/app.vala
+++ b/src/app.vala
@@ -196,7 +196,6 @@ public override int command_line (GLib.ApplicationCommandLine cmdline) {
 #if HAS_SPICE
         opt_context.add_group (Spice.get_option_group ());
 #endif
-        opt_context.add_group (Vnc.Display.get_option_group ());
         opt_context.add_group (Gtk.get_option_group (true));
         opt_context.set_help_enabled (false);
 
diff --git a/src/libvirt-machine.vala b/src/libvirt-machine.vala
index 7a5b9ba1..11a00b9b 100644
--- a/src/libvirt-machine.vala
+++ b/src/libvirt-machine.vala
@@ -315,9 +315,6 @@ private Display? create_display () throws Boxes.Error {
                 return new SpiceDisplay.priv (this, config);
 #endif
 
-        case "vnc":
-            return new VncDisplay (config, host, port);
-
         default:
             throw new Boxes.Error.INVALID ("unsupported display of type " + type);
         }
diff --git a/src/meson.build b/src/meson.build
index e442406d..eefc2990 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -84,7 +84,6 @@ vala_sources = [
   'vm-configurator.vala',
   'vm-creator.vala',
   'vm-importer.vala',
-  'vnc-display.vala',
   'libvirt-vm-cloner.vala',
   'libvirt-vm-importer.vala',
   'welcome-tutorial.vala',
@@ -103,8 +102,6 @@ dependencies = [
   libarchive_dep,
   dependency ('gobject-2.0', version: '>= 2.44'),
   dependency ('gtk+-3.0', version: '>= 3.22.20'),
-  dependency ('gtk-vnc-2.0', version: '>= 0.4.4'),
-  dependency ('gvncpulse-1.0'),
   dependency ('libhandy-1', version: '>= 1.5.0'),
   dependency ('libosinfo-1.0', version: '>= 1.7.0'),
   dependency ('libsecret-1'),
diff --git a/src/vm-configurator.vala b/src/vm-configurator.vala
index 8ede133e..cbb0f4ee 100644
--- a/src/vm-configurator.vala
+++ b/src/vm-configurator.vala
@@ -328,8 +328,6 @@ else if (device is DomainDisk) {
             devices.prepend (create_spice_webdav_channel ());
             devices.prepend (create_spice_agent_channel ());
             devices.prepend (create_graphics_device ());
-        } else {
-            devices.prepend (new DomainGraphicsVnc ());
         }
 
         if (iface != null) {
diff --git a/tests/meson.build b/tests/meson.build
index 3db607b7..868e0896 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -6,8 +6,7 @@ tests_names = [
   'multi-windows.feature',
   'snapshots.feature',
   'spice.feature',
-  'system-broker.feature',
-  'vnc.feature'
+  'system-broker.feature'
 ]
 
 tests_execdir = join_paths (get_option('prefix'), get_option ('libexecdir'), meson.project_name (), 
'installed-tests')