diff options
-rw-r--r-- | net-misc/vinagre/Manifest | 1 | ||||
-rw-r--r-- | net-misc/vinagre/files/vinagre-3.16.1-freerdp.patch | 38 | ||||
-rw-r--r-- | net-misc/vinagre/vinagre-3.16.1.ebuild | 73 |
3 files changed, 0 insertions, 112 deletions
diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest index 4d61478d57ca..be4cc6b48853 100644 --- a/net-misc/vinagre/Manifest +++ b/net-misc/vinagre/Manifest @@ -1,2 +1 @@ -DIST vinagre-3.16.1.tar.xz 812964 SHA256 d77c0057e8525efeef8b35839bce07e5451d99f3ef9d156c7f549a4c1ad6483f SHA512 60b83a7eb8f4d49e8825a4116d2de4579373cb4fbcde70c241b43f079debc30f0b5ce38da39ed4a3841724a70798338a7c319c72be0e991b97f70cdc264dfacf WHIRLPOOL 24828f91d545fd8da63f14002b1988a677c37ffc3abd10678467cfe5223ec4adbd4c9cec39e1ad7c4d46e2beb7369109445f7e1c19e5d10b7be6b79533c99a50 DIST vinagre-3.18.2.tar.xz 819820 SHA256 65b81299de0b75a9433e5654d5314f347895d5efb7acd3b111e5e8c03f48fbc4 SHA512 5d72cc5fc99a6400ef0135e65bde9bc3687257e22176f18606e8780d7a20860fa226a25e0c2bf2ffa85b58d25fa5c262ab6db1751c6f1a6a6e490a373e19a2b9 WHIRLPOOL 1d84691b203744b16fe18bf9e370554f5459f5ff2fe2d4020c79bf64c833a6c8d565a5cc843fdf398239dae17d028fb3c156f25741ae25e3b8b7de7bbdd27d4c diff --git a/net-misc/vinagre/files/vinagre-3.16.1-freerdp.patch b/net-misc/vinagre/files/vinagre-3.16.1-freerdp.patch deleted file mode 100644 index dacce43a8e82..000000000000 --- a/net-misc/vinagre/files/vinagre-3.16.1-freerdp.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 89cc8bfeaf47a24c57616021915b30bbc4d12d53 Mon Sep 17 00:00:00 2001 -From: Nick Andrade <SDNick484@gmail.com> -Date: Sat, 16 May 2015 08:03:29 +0100 -Subject: [PATCH] Fix building against newer FreeRDP versions - -https://bugzilla.gnome.org/show_bug.cgi?id=749124 ---- - plugins/rdp/vinagre-rdp-tab.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/plugins/rdp/vinagre-rdp-tab.c b/plugins/rdp/vinagre-rdp-tab.c -index c4c11f8..690a580 100644 ---- a/plugins/rdp/vinagre-rdp-tab.c -+++ b/plugins/rdp/vinagre-rdp-tab.c -@@ -887,7 +887,6 @@ open_freerdp (VinagreRdpTab *rdp_tab) - settings->RdpSecurity = TRUE; - settings->TlsSecurity = TRUE; - settings->NlaSecurity = TRUE; -- settings->DisableEncryption = FALSE; - settings->EncryptionMethods = ENCRYPTION_METHOD_40BIT | ENCRYPTION_METHOD_128BIT | ENCRYPTION_METHOD_FIPS; - settings->EncryptionLevel = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE; - #else -@@ -898,6 +897,12 @@ open_freerdp (VinagreRdpTab *rdp_tab) - settings->encryption_method = ENCRYPTION_METHOD_40BIT | ENCRYPTION_METHOD_128BIT | ENCRYPTION_METHOD_FIPS; - settings->encryption_level = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE; - #endif -+#include <freerdp/version.h> -+#if (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2 && FREERDP_VERSION_REVISION >= 1) -+ settings->UseRdpSecurityLayer = FALSE; -+#else -+ settings->DisableEncryption = FALSE; -+#endif - - /* Set display size */ - #if HAVE_FREERDP_1_1 --- -2.4.0 - diff --git a/net-misc/vinagre/vinagre-3.16.1.ebuild b/net-misc/vinagre/vinagre-3.16.1.ebuild deleted file mode 100644 index a8dd29de0749..000000000000 --- a/net-misc/vinagre/vinagre-3.16.1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" -VALA_MIN_API_VERSION="0.18" - -inherit 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 ~ia64 ~ppc ~ppc64 x86" -IUSE="rdp +ssh spice +telepathy zeroconf" - -# cairo used in vinagre-tab -# gdk-pixbuf used all over the place -RDEPEND=" - >=dev-libs/glib-2.28.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 ) - 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.6.26[dbus,gtk3] ) -" -DEPEND="${RDEPEND} - >=dev-lang/perl-5 - dev-libs/appstream-glib - >=dev-util/intltool-0.50 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - $(vala_depend) -" - -pkg_pretend() { - # Needed for VNC ssh tunnel, bug #518574 - CONFIG_CHECK="~IPV6" - check_extra_config -} - -src_prepare() { - # Fix RDP initialization with recent FreeRDP (from 'master') - epatch "${FILESDIR}"/${PN}-3.16.1-freerdp.patch - - vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README" - gnome2_src_configure \ - $(use_enable rdp) \ - $(use_enable ssh) \ - $(use_enable spice) \ - $(use_with telepathy) \ - $(use_with zeroconf avahi) \ - ITSTOOL=$(type -P true) -} |