commit: 6a65a865d6bd91d3dc5f864a31bd3abff8810062 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Mon May 25 09:17:23 2015 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Mon May 25 09:18:56 2015 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=6a65a865
net-misc/vinagre: sync RDP build fixes from gentoo-x86 .../vinagre/files/vinagre-3.16.1-freerdp.patch | 38 ++++++++++++++++++++++ net-misc/vinagre/vinagre-3.16.1.ebuild | 3 ++ 2 files changed, 41 insertions(+) diff --git a/net-misc/vinagre/files/vinagre-3.16.1-freerdp.patch b/net-misc/vinagre/files/vinagre-3.16.1-freerdp.patch new file mode 100644 index 0000000..dacce43 --- /dev/null +++ b/net-misc/vinagre/files/vinagre-3.16.1-freerdp.patch @@ -0,0 +1,38 @@ +From 89cc8bfeaf47a24c57616021915b30bbc4d12d53 Mon Sep 17 00:00:00 2001 +From: Nick Andrade <sdnick...@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 index 8da8a75..033e57e 100644 --- a/net-misc/vinagre/vinagre-3.16.1.ebuild +++ b/net-misc/vinagre/vinagre-3.16.1.ebuild @@ -48,6 +48,9 @@ DEPEND="${RDEPEND} " src_prepare() { + # Fix RDP initialization with recent FreeRDP (from 'master') + epatch "${FILESDIR}"/${PN}-3.16.1-freerdp.patch + vala_src_prepare gnome2_src_prepare }
