[gnome-boxes/cleanup-displays: 2/3] Drop gtk-frdp
- From: Felipe Borges <felipeborges src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-boxes/cleanup-displays: 2/3] Drop gtk-frdp
- Date: Wed, 29 Jun 2022 09:59:39 +0000 (UTC)
commit 313221fc40bc9e9bbe31b3c3d44b793ff2d0998a
Author: Felipe Borges <felipeborges gnome org>
Date: Wed Jun 29 11:39:12 2022 +0200
Drop gtk-frdp
The same with VNC. We are no longer in the business of supporting
multiple remoting protocols.
.gitlab-ci.yml | 2 +-
.gitmodules | 4 --
build-aux/flatpak/org.gnome.BoxesDevel.json | 3 +-
meson_options.txt | 4 --
src/meson.build | 21 -------
src/rdp-display.vala | 86 -----------------------------
subprojects/gtk-frdp | 1 -
subprojects/gtk-frdp.wrap | 4 --
8 files changed, 2 insertions(+), 123 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2511bfd7..1606beec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,7 @@ fedora:latest:
libvirt-gconfig-devel libvirt-gobject-devel
spice-gtk3-vala libarchive-devel gettext
libgudev-devel webkitgtk4-devel libusbx-devel
- tracker3-devel libosinfo-vala freerdp-devel
+ tracker3-devel libosinfo-vala
python3-devel libxml2-devel
libhandy1-devel gtksourceview4-devel
--nogpgcheck
diff --git a/.gitmodules b/.gitmodules
index 524c0083..2d432f57 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "subprojects/gtk-frdp"]
- path = subprojects/gtk-frdp
- url = https://gitlab.gnome.org/gnome/gtk-frdp.git
-
[submodule "subprojects/libovf-glib"]
path = subprojects/libovf-glib
url = https://gitlab.gnome.org/felipeborges/libovf-glib.git
diff --git a/build-aux/flatpak/org.gnome.BoxesDevel.json b/build-aux/flatpak/org.gnome.BoxesDevel.json
index 68196adc..6509049c 100644
--- a/build-aux/flatpak/org.gnome.BoxesDevel.json
+++ b/build-aux/flatpak/org.gnome.BoxesDevel.json
@@ -422,8 +422,7 @@
"-Dflatpak=true",
"-Dprofile=development",
"-Ddistributor_name=gnome-boxes-nightly",
- "-Ddistributor_version=main",
- "-Drdp=false"
+ "-Ddistributor_version=main"
],
"sources": [
{
diff --git a/meson_options.txt b/meson_options.txt
index ebd86b47..1f04644b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -8,10 +8,6 @@ option ('distributor_version',
value: '3',
description: 'Distributor version used in HTTP user agent')
-option ('rdp',
- type: 'boolean',
- value: false)
-
option ('installed_tests',
type: 'boolean',
value: false,
diff --git a/src/meson.build b/src/meson.build
index eefc2990..81a4e2fb 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -135,36 +135,15 @@ if spice.found ()
]
endif
-if get_option('rdp')
- vala_sources += ['rdp-display.vala']
-
- vala_args += '--define=HAVE_RDP'
-endif
-
if get_option('flatpak')
vala_args += '--define=FLATPAK'
dependencies += dependency ('govf-0.1')
-
- if get_option('rdp')
- dependencies += dependency ('gtk-frdp-0.1')
- endif
else
dependencies += [
dependency ('gudev-1.0', version: '>= 165'),
]
- if get_option('rdp')
- gtk_frdp = subproject(
- 'gtk-frdp',
- default_options: [
- 'package_subdir=' + meson.project_name()
- ]
- )
-
- dependencies += gtk_frdp.get_variable('gtk_frdp_vapi')
- endif
-
libovf = subproject(
'libovf-glib',
default_options: [
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]