net-misc/vinagre: Backport patch to work with freerdp-1.2.0_beta, #531336

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 57 insertions, 11 deletions

diff --git a/net-misc/vinagre/ChangeLog b/net-misc/vinagre/ChangeLog
index c2be4a1a170f..c15bff9d32f8 100644
--- a/net-misc/vinagre/ChangeLog
+++ b/net-misc/vinagre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/vinagre
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.110 2014/12/23 23:08:46 eva Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.111 2015/01/04 13:16:53 jlec Exp $
+
+  04 Jan 2015; Justin Lecher <jlec@gentoo.org> vinagre-3.14.3.ebuild,
+  +files/vinagre-3.14.3-freerdp.patch, metadata.xml:
+  Backport patch to work with freerdp-1.2.0_beta, #531336
 
 *vinagre-3.14.3 (23 Dec 2014)
 
diff --git a/net-misc/vinagre/files/vinagre-3.14.3-freerdp.patch b/net-misc/vinagre/files/vinagre-3.14.3-freerdp.patch
new file mode 100644
index 000000000000..36cabca8a7ce
--- /dev/null
+++ b/net-misc/vinagre/files/vinagre-3.14.3-freerdp.patch
@@ -0,0 +1,39 @@
+From 2fd545b77c3a2c5f0bc1b0fc5f851857127cc2f3 Mon Sep 17 00:00:00 2001
+From: Jean-Philippe Menil <jpmenil@gmail.com>
+Date: Fri, 28 Nov 2014 17:08:16 +0000
+Subject: [PATCH] Fix RDP initialization with recent FreeRDP
+
+https://bugzilla.gnome.org/show_bug.cgi?id=740868
+---
+ plugins/rdp/vinagre-rdp-tab.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/rdp/vinagre-rdp-tab.c b/plugins/rdp/vinagre-rdp-tab.c
+index 02f5e4e..770fe99 100644
+--- a/plugins/rdp/vinagre-rdp-tab.c
++++ b/plugins/rdp/vinagre-rdp-tab.c
+@@ -27,7 +27,6 @@
+ #include <freerdp/api.h>
+ #include <freerdp/types.h>
+ #include <freerdp/freerdp.h>
+-#include <freerdp/utils/event.h>
+ #include <freerdp/gdi/gdi.h>
+ #if HAVE_FREERDP_1_1
+ #include <freerdp/locale/keyboard.h>
+@@ -363,7 +362,15 @@ frdp_post_connect (freerdp *instance)
+   rdpGdi               *gdi;
+   int                   stride;
+ 
+-  gdi_init (instance, CLRBUF_24BPP, NULL);
++  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 = instance->context->gdi;
+ 
+   instance->update->BeginPaint = frdp_begin_paint;
diff --git a/net-misc/vinagre/metadata.xml b/net-misc/vinagre/metadata.xml
index f796c7b607da..4708913096e3 100644
--- a/net-misc/vinagre/metadata.xml
+++ b/net-misc/vinagre/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
-	<use>
-		<flag name="rdp">Enable access to Windows RDP protocol using
+  <herd>gnome</herd>
+  <use>
+    <flag name="rdp">Enable access to Windows RDP protocol using
 			<pkg>net-misc/rdesktop</pkg></flag>
-		<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
+    <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>
+  </use>
 </pkgmetadata>
diff --git a/net-misc/vinagre/vinagre-3.14.3.ebuild b/net-misc/vinagre/vinagre-3.14.3.ebuild
index 502d376002a7..a880c93a95e8 100644
--- a/net-misc/vinagre/vinagre-3.14.3.ebuild
+++ b/net-misc/vinagre/vinagre-3.14.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-3.14.3.ebuild,v 1.1 2014/12/23 23:08:46 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-3.14.3.ebuild,v 1.2 2015/01/04 13:16:53 jlec Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -47,7 +47,10 @@ DEPEND="${RDEPEND}
 	$(vala_depend)
 "
 
+PATCHES=( "${FILESDIR}"/${P}-freerdp.patch )
+
 src_prepare() {
+	epatch "${PATCHES[@]}"
 	vala_src_prepare
 	gnome2_src_prepare
 }