Date: Wednesday, November 16, 2022 @ 16:15:58 Author: heftig Revision: 461933
3.22.0+r160+gc86e114-1: FS#76597 fix build; overhaul Modified: vinagre/trunk/PKGBUILD Deleted: vinagre/trunk/freerdp2017.diff ------------------+ PKGBUILD | 28 +++++------ freerdp2017.diff | 134 ----------------------------------------------------- 2 files changed, 14 insertions(+), 148 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-11-16 16:13:50 UTC (rev 461932) +++ PKGBUILD 2022-11-16 16:15:58 UTC (rev 461933) @@ -1,34 +1,32 @@ -# Maintainer: Jan Alexander Steffens (heftig) <[email protected]> +# Maintainer: Jan Alexander Steffens (heftig) <[email protected]> # Contributor: Jan de Groot <[email protected]> # Contributor: Allan McRae <[email protected]> # Contributor: lp76 <[email protected]> pkgname=vinagre -pkgver=3.22.0+35+gadcb63c -pkgrel=2 +pkgver=3.22.0+r160+gc86e114 +pkgrel=1 +epoch=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) +depends=(libsecret gtk-vnc vte3 telepathy-glib avahi spice-gtk3 gnutls freerdp) +makedepends=(docbook-xsl intltool openssh itstool spice-protocol vala + gnome-common appstream-glib git gobject-introspection) optdepends=('openssh: SSH plugin') -_commit=adcb63cfad988a92126a751b6e8f7cfef0762955 # master -source=("git+https://gitlab.gnome.org/GNOME/vinagre.git#commit=$_commit"; - freerdp2017.diff) -sha256sums=('SKIP' - 'fbf3ecc4126f1090e4979c4921bd52b8fa3d5c31330457d98c4df384d0cdcf34') +options=(debug) +_commit=c86e114efe31381bff3cad008e9f2cd84a83a803 # master +source=("git+https://gitlab.gnome.org/GNOME/vinagre.git#commit=$_commit";) +b2sums=('SKIP') pkgver() { cd $pkgname - git describe --tags | sed 's/-/+/g' + git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g' } prepare() { cd $pkgname - - patch -Np1 -i ../freerdp2017.diff - NOCONFIGURE=1 ./autogen.sh } @@ -44,3 +42,5 @@ cd $pkgname make DESTDIR="$pkgdir" install } + +# vim:set sw=2 sts=-1 et: Deleted: freerdp2017.diff =================================================================== --- freerdp2017.diff 2022-11-16 16:13:50 UTC (rev 461932) +++ freerdp2017.diff 2022-11-16 16:15:58 UTC (rev 461933) @@ -1,134 +0,0 @@ -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 -
