Date: Wednesday, September 12, 2018 @ 16:41:09
Author: heftig
Revision: 334421
archrelease: copy trunk to testing-x86_64
Added:
vinagre/repos/testing-x86_64/
vinagre/repos/testing-x86_64/PKGBUILD
(from rev 334420, vinagre/trunk/PKGBUILD)
vinagre/repos/testing-x86_64/freerdp2017.diff
(from rev 334420, vinagre/trunk/freerdp2017.diff)
------------------+
PKGBUILD | 45 +++++++++++++++++
freerdp2017.diff | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 179 insertions(+)
Copied: vinagre/repos/testing-x86_64/PKGBUILD (from rev 334420,
vinagre/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2018-09-12 16:41:09 UTC (rev 334421)
@@ -0,0 +1,45 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
+# Contributor: Jan de Groot <j...@archlinux.org>
+# Contributor: Allan McRae <mcrae_al...@hotmail.com>
+# Contributor: lp76 <l.ped...@gmail.com>
+
+pkgname=vinagre
+pkgver=3.22.0+35+gadcb63c
+pkgrel=1
+pkgdesc="A VNC Client for the GNOME desktop"
+url="https://wiki.gnome.org/Apps/Vinagre";
+arch=(x86_64)
+license=(GPL)
+depends=(libsecret gtk-vnc vte3 telepathy-glib avahi dconf spice-gtk3 gnutls
freerdp)
+makedepends=(docbook-xsl intltool openssh itstool spice-protocol vala
gnome-common appstream-glib git)
+optdepends=('openssh: SSH plugin')
+_commit=adcb63cfad988a92126a751b6e8f7cfef0762955 # master
+source=("git+https://gitlab.gnome.org/GNOME/vinagre.git#commit=$_commit";
+ freerdp2017.diff)
+sha256sums=('SKIP'
+ 'fbf3ecc4126f1090e4979c4921bd52b8fa3d5c31330457d98c4df384d0cdcf34')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+
+ patch -Np1 -i ../freerdp2017.diff
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd $pkgname
+ ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/$pkgname \
+ --enable-rdp --enable-spice --enable-compile-warnings=minimum
+ make
+}
+
+package() {
+ cd $pkgname
+ make DESTDIR="$pkgdir" install
+}
Copied: vinagre/repos/testing-x86_64/freerdp2017.diff (from rev 334420,
vinagre/trunk/freerdp2017.diff)
===================================================================
--- testing-x86_64/freerdp2017.diff (rev 0)
+++ testing-x86_64/freerdp2017.diff 2018-09-12 16:41:09 UTC (rev 334421)
@@ -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
+
