Attachment 177608 Details for Bug 212004 – Patch to update net/vinagre to 3.22.0

[patch] Patch to update net/vinagre to 3.22.0

vinagre.patch (text/plain), 7.29 KB, created by Ting-Wei Lan on 2016-12-02 16:40:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ting-Wei Lan

Created: 2016-12-02 16:40:25 UTC

Size: 7.29 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 427548)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	vinagre
>-PORTVERSION=	3.18.2
>-PORTREVISION=	3
>+PORTVERSION=	3.22.0
> CATEGORIES=	net gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome3
>@@ -11,7 +10,8 @@
> MAINTAINER=	gnome@FreeBSD.org
> COMMENT=	VNC client for the GNOME Desktop
> 
>-BUILD_DEPENDS=	itstool:textproc/itstool
>+BUILD_DEPENDS=	itstool:textproc/itstool \
>+		${LOCALBASE}/share/aclocal/yelp.m4:textproc/yelp-tools
> LIB_DEPENDS=	libgtk-vnc-2.0.so:net/gtk-vnc \
> 		libgdbm.so:databases/gdbm \
> 		libsecret-1.so:security/libsecret
>@@ -19,8 +19,8 @@
> 
> PORTSCOUT=	limitw:1,even
> 
>-USES=		desktop-file-utils gettext gmake gnome pathfix pkgconfig \
>-		shared-mime-info tar:xz
>+USES=		autoreconf desktop-file-utils gettext gmake gnome pathfix \
>+		pkgconfig shared-mime-info tar:xz
> USE_GNOME=	gtk30 intlhack libxml2 vte3
> GNU_CONFIGURE=	yes
> INSTALLS_ICONS=	yes
>Index: distinfo
>===================================================================
>--- distinfo	(revision 427548)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (gnome3/vinagre-3.18.2.tar.xz) = 65b81299de0b75a9433e5654d5314f347895d5efb7acd3b111e5e8c03f48fbc4
>-SIZE (gnome3/vinagre-3.18.2.tar.xz) = 819820
>+TIMESTAMP = 1480270529
>+SHA256 (gnome3/vinagre-3.22.0.tar.xz) = cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82
>+SIZE (gnome3/vinagre-3.22.0.tar.xz) = 1574984
>Index: files/patch-configure.ac
>===================================================================
>--- files/patch-configure.ac	(nonexistent)
>+++ files/patch-configure.ac	(working copy)
>@@ -0,0 +1,30 @@
>+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.orig	2016-09-20 06:02:32 UTC
>++++ configure.ac
>+@@ -59,6 +59,7 @@ AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [te
>+ 
>+ # 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"],
>
>Property changes on: files/patch-configure.ac
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-plugins_rdp_vinagre-rdp-tab.c
>===================================================================
>--- files/patch-plugins_rdp_vinagre-rdp-tab.c	(nonexistent)
>+++ files/patch-plugins_rdp_vinagre-rdp-tab.c	(working copy)
>@@ -0,0 +1,110 @@
>+--- plugins/rdp/vinagre-rdp-tab.c.orig	2016-09-13 08:34:13 UTC
>++++ plugins/rdp/vinagre-rdp-tab.c
>+@@ -476,16 +476,18 @@ 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 +497,7 @@ frdp_end_paint (rdpContext *context)
>+   gint                  x, y, w, h;
>+ 
>+   if (gdi->primary->hdc->hwnd->invalid->null)
>+-    return;
>++    return FALSE;
>+ 
>+   x = gdi->primary->hdc->hwnd->invalid->x;
>+   y = gdi->primary->hdc->hwnd->invalid->y;
>+@@ -517,6 +519,8 @@ frdp_end_paint (rdpContext *context)
>+     {
>+       gtk_widget_queue_draw_area (priv->display, x, y, w, h);
>+     }
>++
>++  return TRUE;
>+ }
>+ 
>+ static BOOL
>+@@ -591,11 +595,15 @@ frdp_post_connect (freerdp *instance)
>+ #if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \
>+     !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && \
>+     FREERDP_VERSION_MINOR >= 2))
>+-                    CLRBUF_24BPP,
>++                    CLRBUF_24BPP, NULL
>+ #else
>+-                    CLRBUF_32BPP,
>++#ifndef PIXEL_FORMAT_ARGB32
>++                    CLRBUF_32BPP, NULL
>++#else
>++                    PIXEL_FORMAT_BGRA32
>+ #endif
>+-                    NULL);
>++#endif
>++                    );
>+   gdi = instance->context->gdi;
>+ 
>+   instance->update->BeginPaint = frdp_begin_paint;
>+@@ -862,7 +870,7 @@ frdp_mouse_moved (GtkWidget      *widget
>+   return TRUE;
>+ }
>+ 
>+-static gboolean
>++static BOOL
>+ frdp_authenticate (freerdp  *instance,
>+                    char    **username,
>+                    char    **password,
>+@@ -934,11 +942,13 @@ frdp_authenticate (freerdp  *instance,
>+   return TRUE;
>+ }
>+ 
>+-static BOOL
>+-frdp_certificate_verify (freerdp *instance,
>+-                         char    *subject,
>+-                         char    *issuer,
>+-                         char    *fingerprint)
>++static DWORD
>++frdp_certificate_verify (freerdp    *instance,
>++                         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;
>+@@ -973,12 +983,15 @@ frdp_certificate_verify (freerdp *instan
>+ 
>+ 
>+ #if HAVE_FREERDP_1_1
>+-static BOOL
>+-frdp_changed_certificate_verify (freerdp *instance,
>+-                                 char    *subject,
>+-                                 char    *issuer,
>+-                                 char    *new_fingerprint,
>+-                                 char    *old_fingerprint)
>++static DWORD
>++frdp_changed_certificate_verify (freerdp    *instance,
>++                                 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;
>
>Property changes on: files/patch-plugins_rdp_vinagre-rdp-tab.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

lantw44: maintainer-approval? (gnome)

Actions: View | Diff

Attachments on bug 212004: 173876 | 173877 | 173899 | 175216 | 177362 | 177457 | 177540 | 177608 | 177636