diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /net-misc/vinagre/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'net-misc/vinagre/files')
-rw-r--r-- | net-misc/vinagre/files/vinagre-3.20.2-freerdp2.patch | 39 | ||||
-rw-r--r-- | net-misc/vinagre/files/vinagre-3.22.0-freerdp2-2.patch | 117 |
2 files changed, 156 insertions, 0 deletions
diff --git a/net-misc/vinagre/files/vinagre-3.20.2-freerdp2.patch b/net-misc/vinagre/files/vinagre-3.20.2-freerdp2.patch new file mode 100644 index 000000000000..4f88ab013e10 --- /dev/null +++ b/net-misc/vinagre/files/vinagre-3.20.2-freerdp2.patch @@ -0,0 +1,39 @@ +From 8d072483ffff3a4e752c35811fb562f61d206f68 Mon Sep 17 00:00:00 2001 +From: Adam Williamson <awilliam@redhat.com> +Date: Fri, 22 Apr 2016 14:54:09 -0700 +Subject: [PATCH] handle new freerdp pkgconfig name + +freerdp has now changed its pkgconfig name to 'freerdp2' - +https://github.com/FreeRDP/FreeRDP/commit/6fa36081 . Assuming +we can build against both 1 and 2, we should handle both names. +--- + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 585c016..362951d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -59,6 +59,7 @@ AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [test "x$have_ssh" = "xyes"]) + + # Whether to enable support for RDP. + RDP_DEPS="freerdp x11" ++RDP_2_DEPS="freerdp2 x11" + AC_ARG_ENABLE([rdp], + [AS_HELP_STRING([--disable-rdp], + [Disable Remote Desktop Protocol (RDP) support])]) +@@ -68,7 +69,10 @@ AS_IF([test "x$enable_rdp" != "xno"], + [have_rdp=yes + PKG_CHECK_EXISTS(freerdp >= 1.1, + [AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [])], +- [have_rdp=no])], ++ [PKG_CHECK_EXISTS([$RDP_2_DEPS], ++ [have_rdp=yes ++ RDP_DEPS=$RDP_2_DEPS ++ AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [have_rdp=no])])], + [have_rdp=no]) + + AS_IF([test "x$have_rdp" = "xyes"], +-- +2.7.3 + diff --git a/net-misc/vinagre/files/vinagre-3.22.0-freerdp2-2.patch b/net-misc/vinagre/files/vinagre-3.22.0-freerdp2-2.patch new file mode 100644 index 000000000000..6c22b46b2583 --- /dev/null +++ b/net-misc/vinagre/files/vinagre-3.22.0-freerdp2-2.patch @@ -0,0 +1,117 @@ +Fix build issue with freerdp2 + +Gnome-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=765444 +Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=609474 + +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 + |