[arch-commits] Commit in vinagre/trunk (PKGBUILD freerdp2.patch freerdp2017.diff)
Jan Steffens
heftig at archlinux.org
Thu Feb 2 11:55:50 UTC 2017
Date: Thursday, February 2, 2017 @ 11:55:49
Author: heftig
Revision: 287893
3.22.0-2
Added:
vinagre/trunk/freerdp2017.diff
(from rev 287892, vinagre/trunk/freerdp2.patch)
Modified:
vinagre/trunk/PKGBUILD
Deleted:
vinagre/trunk/freerdp2.patch
------------------+
PKGBUILD | 12 ++--
freerdp2.patch | 20 -------
freerdp2017.diff | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 140 insertions(+), 26 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-02-01 21:46:59 UTC (rev 287892)
+++ PKGBUILD 2017-02-02 11:55:49 UTC (rev 287893)
@@ -6,7 +6,7 @@
pkgname=vinagre
pkgver=3.22.0
-pkgrel=1
+pkgrel=2
pkgdesc="A VNC Client for the GNOME desktop"
url="https://wiki.gnome.org/Apps/Vinagre"
arch=(i686 x86_64)
@@ -15,11 +15,11 @@
makedepends=(docbook-xsl intltool openssh itstool spice-protocol vala gnome-common appstream-glib git)
optdepends=('openssh: SSH plugin')
groups=(gnome-extra)
-_commit=272163645240debe41620f3bff84af8cb475f742 # master
-source=("git://git.gnome.org/vinagre#commit=$_commit"
- freerdp2.patch)
+_commit=272163645240debe41620f3bff84af8cb475f742 # master~2
+source=("git+https://git.gnome.org/browse/vinagre#commit=$_commit"
+ freerdp2017.diff)
sha256sums=('SKIP'
- '17282b64a78f92f317d62c98a5650595745e9dec93b4b223f1bb89747094b75c')
+ 'fbf3ecc4126f1090e4979c4921bd52b8fa3d5c31330457d98c4df384d0cdcf34')
pkgver() {
cd $pkgname
@@ -32,7 +32,7 @@
# Fixup missing tag for pkgver()
git tag -f 3.22.0 272163645240debe41620f3bff84af8cb475f742
- patch -Np1 -i ../freerdp2.patch
+ patch -Np1 -i ../freerdp2017.diff
NOCONFIGURE=1 ./autogen.sh
}
Deleted: freerdp2.patch
===================================================================
--- freerdp2.patch 2017-02-01 21:46:59 UTC (rev 287892)
+++ freerdp2.patch 2017-02-02 11:55:49 UTC (rev 287893)
@@ -1,20 +0,0 @@
---- vinagre-3.20.2/configure.ac.orig 2016-06-08 08:10:09.599068652 +0000
-+++ vinagre-3.20.2/configure.ac 2016-06-08 08:10:37.428938533 +0000
-@@ -58,7 +58,7 @@
- AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [test "x$have_ssh" = "xyes"])
-
- # Whether to enable support for RDP.
--RDP_DEPS="freerdp x11"
-+RDP_DEPS="freerdp2 x11"
- AC_ARG_ENABLE([rdp],
- [AS_HELP_STRING([--disable-rdp],
- [Disable Remote Desktop Protocol (RDP) support])])
-@@ -66,7 +66,7 @@
- AS_IF([test "x$enable_rdp" != "xno"],
- [PKG_CHECK_EXISTS([$RDP_DEPS],
- [have_rdp=yes
-- PKG_CHECK_EXISTS(freerdp >= 1.1,
-+ PKG_CHECK_EXISTS(freerdp2 >= 1.1,
- [AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [])],
- [have_rdp=no])],
- [have_rdp=no])
Copied: vinagre/trunk/freerdp2017.diff (from rev 287892, vinagre/trunk/freerdp2.patch)
===================================================================
--- freerdp2017.diff (rev 0)
+++ freerdp2017.diff 2017-02-02 11:55:49 UTC (rev 287893)
@@ -0,0 +1,134 @@
+diff --git c/configure.ac i/configure.ac
+index 0dfc0dbf3069a17b..35e5f7b59fe7f9a3 100644
+--- c/configure.ac
++++ i/configure.ac
+@@ -58,7 +58,7 @@ AS_IF([test "x$have_ssh" = "xyes"],
+ AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [test "x$have_ssh" = "xyes"])
+
+ # Whether to enable support for RDP.
+-RDP_DEPS="freerdp x11"
++RDP_DEPS="freerdp2 x11"
+ AC_ARG_ENABLE([rdp],
+ [AS_HELP_STRING([--disable-rdp],
+ [Disable Remote Desktop Protocol (RDP) support])])
+@@ -66,7 +66,7 @@ AC_ARG_ENABLE([rdp],
+ AS_IF([test "x$enable_rdp" != "xno"],
+ [PKG_CHECK_EXISTS([$RDP_DEPS],
+ [have_rdp=yes
+- PKG_CHECK_EXISTS(freerdp >= 1.1,
++ PKG_CHECK_EXISTS(freerdp2 >= 1.1,
+ [AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [])],
+ [have_rdp=no])],
+ [have_rdp=no])
+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
+
More information about the arch-commits
mailing list