summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2022-05-08 14:12:30 -0400
committerMatt Turner <mattst88@gentoo.org>2022-05-09 18:09:18 -0400
commitcf9fe128e0143304d60b3c43e6f92a07946c950c (patch)
tree312cfd46c8c9cc2e14eb5b9dc96d4f6630ec0f2f /net-misc
parentnet-misc/vino: Remove (diff)
downloadgentoo-cf9fe128e0143304d60b3c43e6f92a07946c950c.tar.gz
gentoo-cf9fe128e0143304d60b3c43e6f92a07946c950c.tar.bz2
gentoo-cf9fe128e0143304d60b3c43e6f92a07946c950c.zip
net-misc/vinagre: Remove
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/vinagre/Manifest1
-rw-r--r--net-misc/vinagre/files/vinagre-3.20.2-freerdp2.patch39
-rw-r--r--net-misc/vinagre/files/vinagre-3.22.0-freerdp2-2.patch117
-rw-r--r--net-misc/vinagre/files/vinagre-3.22.0-gcc10-fno-common.patch22
-rw-r--r--net-misc/vinagre/metadata.xml14
-rw-r--r--net-misc/vinagre/vinagre-3.22.0-r3.ebuild73
6 files changed, 0 insertions, 266 deletions
diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest
deleted file mode 100644
index 7141f7db469c..000000000000
--- a/net-misc/vinagre/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST vinagre-3.22.0.tar.xz 1574984 BLAKE2B a8e6c7be07816b49f7194ece223a3ee35608736e69c0390e5f67691135706f1e993df53b3e4cb5b1f3d6850ff546444efc477419ca1b5f5ca2fa490124f6c373 SHA512 6a84b353d75b48649af507cb747688115b35268bc0303554afc9684bbfec4f9c3b2d93d89fa64480ede07bb4fb1eabe360b6eccd11e58691ce9f955f329c615f
diff --git a/net-misc/vinagre/files/vinagre-3.20.2-freerdp2.patch b/net-misc/vinagre/files/vinagre-3.20.2-freerdp2.patch
deleted file mode 100644
index 4f88ab013e10..000000000000
--- a/net-misc/vinagre/files/vinagre-3.20.2-freerdp2.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8d072483ffff3a4e752c35811fb562f61d206f68 Mon Sep 17 00:00:00 2001
-From: Adam Williamson <awilliam@redhat.com>
-Date: Fri, 22 Apr 2016 14:54:09 -0700
-Subject: [PATCH] handle new freerdp pkgconfig name
-
-freerdp has now changed its pkgconfig name to 'freerdp2' -
-https://github.com/FreeRDP/FreeRDP/commit/6fa36081 . Assuming
-we can build against both 1 and 2, we should handle both names.
----
- configure.ac | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 585c016..362951d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -59,6 +59,7 @@ AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [test "x$have_ssh" = "xyes"])
-
- # Whether to enable support for RDP.
- RDP_DEPS="freerdp x11"
-+RDP_2_DEPS="freerdp2 x11"
- AC_ARG_ENABLE([rdp],
- [AS_HELP_STRING([--disable-rdp],
- [Disable Remote Desktop Protocol (RDP) support])])
-@@ -68,7 +69,10 @@ AS_IF([test "x$enable_rdp" != "xno"],
- [have_rdp=yes
- PKG_CHECK_EXISTS(freerdp >= 1.1,
- [AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [])],
-- [have_rdp=no])],
-+ [PKG_CHECK_EXISTS([$RDP_2_DEPS],
-+ [have_rdp=yes
-+ RDP_DEPS=$RDP_2_DEPS
-+ AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [have_rdp=no])])],
- [have_rdp=no])
-
- AS_IF([test "x$have_rdp" = "xyes"],
---
-2.7.3
-
diff --git a/net-misc/vinagre/files/vinagre-3.22.0-freerdp2-2.patch b/net-misc/vinagre/files/vinagre-3.22.0-freerdp2-2.patch
deleted file mode 100644
index 6c22b46b2583..000000000000
--- a/net-misc/vinagre/files/vinagre-3.22.0-freerdp2-2.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-Fix build issue with freerdp2
-
-Gnome-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=765444
-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=609474
-
-diff --git c/plugins/rdp/vinagre-rdp-tab.c i/plugins/rdp/vinagre-rdp-tab.c
-index b731f9b20ec910cc..13100de3dc0e07e1 100644
---- c/plugins/rdp/vinagre-rdp-tab.c
-+++ i/plugins/rdp/vinagre-rdp-tab.c
-@@ -476,16 +476,17 @@ frdp_drawing_area_draw (GtkWidget *area,
- return TRUE;
- }
-
--static void
-+static BOOL
- frdp_begin_paint (rdpContext *context)
- {
- rdpGdi *gdi = context->gdi;
-
- gdi->primary->hdc->hwnd->invalid->null = 1;
- gdi->primary->hdc->hwnd->ninvalid = 0;
-+ return TRUE;
- }
-
--static void
-+static BOOL
- frdp_end_paint (rdpContext *context)
- {
- VinagreRdpTab *rdp_tab = ((frdpContext *) context)->rdp_tab;
-@@ -495,7 +496,7 @@ frdp_end_paint (rdpContext *context)
- gint x, y, w, h;
-
- if (gdi->primary->hdc->hwnd->invalid->null)
-- return;
-+ return TRUE;
-
- x = gdi->primary->hdc->hwnd->invalid->x;
- y = gdi->primary->hdc->hwnd->invalid->y;
-@@ -517,6 +518,7 @@ frdp_end_paint (rdpContext *context)
- {
- gtk_widget_queue_draw_area (priv->display, x, y, w, h);
- }
-+ return TRUE;
- }
-
- static BOOL
-@@ -587,15 +589,7 @@ frdp_post_connect (freerdp *instance)
- rdpGdi *gdi;
- int stride;
-
-- gdi_init (instance,
--#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \
-- !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && \
-- FREERDP_VERSION_MINOR >= 2))
-- CLRBUF_24BPP,
--#else
-- CLRBUF_32BPP,
--#endif
-- NULL);
-+ gdi_init (instance, PIXEL_FORMAT_BGRA32);
- gdi = instance->context->gdi;
-
- instance->update->BeginPaint = frdp_begin_paint;
-@@ -934,11 +928,13 @@ frdp_authenticate (freerdp *instance,
- return TRUE;
- }
-
--static BOOL
-+static DWORD
- frdp_certificate_verify (freerdp *instance,
-- char *subject,
-- char *issuer,
-- char *fingerprint)
-+ const char *common_name,
-+ const char *subject,
-+ const char *issuer,
-+ const char *fingerprint,
-+ BOOL host_mismatch)
- {
- VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab);
- GtkBuilder *builder;
-@@ -968,17 +964,20 @@ frdp_certificate_verify (freerdp *instance,
- gtk_widget_hide (dialog);
-
-
-- return response == GTK_RESPONSE_YES;
-+ return (response == GTK_RESPONSE_YES) ? 1 : 0;
- }
-
-
- #if HAVE_FREERDP_1_1
--static BOOL
-+static DWORD
- frdp_changed_certificate_verify (freerdp *instance,
-- char *subject,
-- char *issuer,
-- char *new_fingerprint,
-- char *old_fingerprint)
-+ const char *common_name,
-+ const char *subject,
-+ const char *issuer,
-+ const char *new_fingerprint,
-+ const char *old_subject,
-+ const char *old_issuer,
-+ const char *old_fingerprint)
- {
- VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab);
- GtkBuilder *builder;
-@@ -1023,7 +1022,7 @@ frdp_changed_certificate_verify (freerdp *instance,
- gtk_widget_hide (dialog);
-
-
-- return response == GTK_RESPONSE_YES;
-+ return (response == GTK_RESPONSE_YES) ? 1 : 0;
- }
- #endif
-
diff --git a/net-misc/vinagre/files/vinagre-3.22.0-gcc10-fno-common.patch b/net-misc/vinagre/files/vinagre-3.22.0-gcc10-fno-common.patch
deleted file mode 100644
index d23ce4fa59f6..000000000000
--- a/net-misc/vinagre/files/vinagre-3.22.0-gcc10-fno-common.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/plugins/vnc/vinagre-vnc-connection.c
-+++ b/plugins/vnc/vinagre-vnc-connection.c
-@@ -27,6 +27,8 @@
- #include "vinagre-vnc-connection.h"
- #include "vinagre-vala.h"
-
-+gboolean scaling_command_line;
-+
- struct _VinagreVncConnectionPrivate
- {
- gchar *desktop_name;
---- a/plugins/vnc/vinagre-vnc-connection.h
-+++ b/plugins/vnc/vinagre-vnc-connection.h
-@@ -26,7 +26,7 @@
-
- G_BEGIN_DECLS
-
--gboolean scaling_command_line;
-+extern gboolean scaling_command_line;
-
- #define VINAGRE_TYPE_VNC_CONNECTION (vinagre_vnc_connection_get_type ())
- #define VINAGRE_VNC_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_VNC_CONNECTION, VinagreVncConnection))
diff --git a/net-misc/vinagre/metadata.xml b/net-misc/vinagre/metadata.xml
deleted file mode 100644
index c20584016666..000000000000
--- a/net-misc/vinagre/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <use>
- <flag name="ssh">Enable ssh plugin using <pkg>x11-libs/vte</pkg></flag>
- <flag name="spice">Enable access to SPICE-enabled virtual machines</flag>
- <flag name="telepathy">Enable access to remote desktop via a
- <pkg>net-libs/telepathy-glib</pkg> client</flag>
- </use>
-</pkgmetadata>
diff --git a/net-misc/vinagre/vinagre-3.22.0-r3.ebuild b/net-misc/vinagre/vinagre-3.22.0-r3.ebuild
deleted file mode 100644
index 143a016eb411..000000000000
--- a/net-misc/vinagre/vinagre-3.22.0-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2 linux-info vala
-
-DESCRIPTION="VNC client for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Vinagre"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86"
-IUSE="rdp +ssh spice +telepathy zeroconf"
-
-# cairo used in vinagre-tab
-# gdk-pixbuf used all over the place
-RDEPEND="
- >=dev-libs/glib-2.32.0:2
- >=x11-libs/gtk+-3.9.6:3
- app-crypt/libsecret
- >=dev-libs/libxml2-2.6.31:2
- >=net-libs/gtk-vnc-0.4.3[gtk3(+)]
- x11-libs/cairo:=
- x11-libs/gdk-pixbuf:2
- x11-themes/hicolor-icon-theme
-
- rdp? ( >=net-misc/freerdp-1.1:= )
- ssh? ( >=x11-libs/vte-0.20:2.91 )
- spice? (
- app-emulation/spice-protocol
- >=net-misc/spice-gtk-0.5[gtk3(+)] )
- telepathy? (
- dev-libs/dbus-glib
- >=net-libs/telepathy-glib-0.11.6 )
- zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- app-text/yelp-tools
- dev-libs/appstream-glib
- >=dev-util/intltool-0.50
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-
- gnome-base/gnome-common
-"
-# gnome-base/gnome-common needed for eautoreconf
-pkg_pretend() {
- # Needed for VNC ssh tunnel, bug #518574
- CONFIG_CHECK="~IPV6"
- check_extra_config
-}
-
-src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=765444
- eapply "${FILESDIR}"/${PN}-3.20.2-freerdp2.patch
- eapply "${FILESDIR}"/${PN}-3.22.0-freerdp2-2.patch
- # https://gitlab.gnome.org/GNOME/vinagre/merge_requests/8
- eapply "${FILESDIR}"/${PN}-3.22.0-gcc10-fno-common.patch
-
- vala_src_prepare
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- $(use_enable rdp) \
- $(use_enable ssh) \
- $(use_enable spice) \
- $(use_with telepathy) \
- $(use_with zeroconf avahi)
-}