View | Details | Raw Unified | Return to bug 212004 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-5 / +5 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	vinagre
4
PORTNAME=	vinagre
5
PORTVERSION=	3.18.2
5
PORTVERSION=	3.22.0
6
PORTREVISION=	3
7
CATEGORIES=	net gnome
6
CATEGORIES=	net gnome
8
MASTER_SITES=	GNOME
7
MASTER_SITES=	GNOME
9
DIST_SUBDIR=	gnome3
8
DIST_SUBDIR=	gnome3
Lines 11-17 Link Here
11
MAINTAINER=	gnome@FreeBSD.org
10
MAINTAINER=	gnome@FreeBSD.org
12
COMMENT=	VNC client for the GNOME Desktop
11
COMMENT=	VNC client for the GNOME Desktop
13
12
14
BUILD_DEPENDS=	itstool:textproc/itstool
13
BUILD_DEPENDS=	itstool:textproc/itstool \
14
		${LOCALBASE}/share/aclocal/yelp.m4:textproc/yelp-tools
15
LIB_DEPENDS=	libgtk-vnc-2.0.so:net/gtk-vnc \
15
LIB_DEPENDS=	libgtk-vnc-2.0.so:net/gtk-vnc \
16
		libgdbm.so:databases/gdbm \
16
		libgdbm.so:databases/gdbm \
17
		libsecret-1.so:security/libsecret
17
		libsecret-1.so:security/libsecret
Lines 19-26 Link Here
19
19
20
PORTSCOUT=	limitw:1,even
20
PORTSCOUT=	limitw:1,even
21
21
22
USES=		desktop-file-utils gettext gmake gnome pathfix pkgconfig \
22
USES=		autoreconf desktop-file-utils gettext gmake gnome pathfix \
23
		shared-mime-info tar:xz
23
		pkgconfig shared-mime-info tar:xz
24
USE_GNOME=	gtk30 intlhack libxml2 vte3
24
USE_GNOME=	gtk30 intlhack libxml2 vte3
25
GNU_CONFIGURE=	yes
25
GNU_CONFIGURE=	yes
26
INSTALLS_ICONS=	yes
26
INSTALLS_ICONS=	yes
(-)distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (gnome3/vinagre-3.18.2.tar.xz) = 65b81299de0b75a9433e5654d5314f347895d5efb7acd3b111e5e8c03f48fbc4
1
TIMESTAMP = 1480270529
2
SIZE (gnome3/vinagre-3.18.2.tar.xz) = 819820
2
SHA256 (gnome3/vinagre-3.22.0.tar.xz) = cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82
3
SIZE (gnome3/vinagre-3.22.0.tar.xz) = 1574984
(-)files/patch-configure.ac (+30 lines)
Line 0 Link Here
1
From 8d072483ffff3a4e752c35811fb562f61d206f68 Mon Sep 17 00:00:00 2001
2
From: Adam Williamson <awilliam@redhat.com>
3
Date: Fri, 22 Apr 2016 14:54:09 -0700
4
Subject: [PATCH] handle new freerdp pkgconfig name
5
6
freerdp has now changed its pkgconfig name to 'freerdp2' -
7
https://github.com/FreeRDP/FreeRDP/commit/6fa36081 . Assuming
8
we can build against both 1 and 2, we should handle both names.
9
--- configure.ac.orig	2016-09-20 06:02:32 UTC
10
+++ configure.ac
11
@@ -59,6 +59,7 @@ AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [te
12
 
13
 # Whether to enable support for RDP.
14
 RDP_DEPS="freerdp x11"
15
+RDP_2_DEPS="freerdp2 x11"
16
 AC_ARG_ENABLE([rdp],
17
   [AS_HELP_STRING([--disable-rdp],
18
     [Disable Remote Desktop Protocol (RDP) support])])
19
@@ -68,7 +69,10 @@ AS_IF([test "x$enable_rdp" != "xno"],
20
     [have_rdp=yes
21
      PKG_CHECK_EXISTS(freerdp >= 1.1,
22
        [AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [])],
23
-    [have_rdp=no])],
24
+    [PKG_CHECK_EXISTS([$RDP_2_DEPS],
25
+       [have_rdp=yes
26
+        RDP_DEPS=$RDP_2_DEPS
27
+        AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [have_rdp=no])])],
28
   [have_rdp=no])
29
 
30
 AS_IF([test "x$have_rdp" = "xyes"],
(-)files/patch-plugins_rdp_vinagre-rdp-tab.c (+110 lines)
Line 0 Link Here
1
--- plugins/rdp/vinagre-rdp-tab.c.orig	2016-09-13 08:34:13 UTC
2
+++ plugins/rdp/vinagre-rdp-tab.c
3
@@ -476,16 +476,18 @@ frdp_drawing_area_draw (GtkWidget *area,
4
   return TRUE;
5
 }
6
 
7
-static void
8
+static BOOL
9
 frdp_begin_paint (rdpContext *context)
10
 {
11
   rdpGdi *gdi = context->gdi;
12
 
13
   gdi->primary->hdc->hwnd->invalid->null = 1;
14
   gdi->primary->hdc->hwnd->ninvalid = 0;
15
+
16
+  return TRUE;
17
 }
18
 
19
-static void
20
+static BOOL
21
 frdp_end_paint (rdpContext *context)
22
 {
23
   VinagreRdpTab        *rdp_tab = ((frdpContext *) context)->rdp_tab;
24
@@ -495,7 +497,7 @@ frdp_end_paint (rdpContext *context)
25
   gint                  x, y, w, h;
26
 
27
   if (gdi->primary->hdc->hwnd->invalid->null)
28
-    return;
29
+    return FALSE;
30
 
31
   x = gdi->primary->hdc->hwnd->invalid->x;
32
   y = gdi->primary->hdc->hwnd->invalid->y;
33
@@ -517,6 +519,8 @@ frdp_end_paint (rdpContext *context)
34
     {
35
       gtk_widget_queue_draw_area (priv->display, x, y, w, h);
36
     }
37
+
38
+  return TRUE;
39
 }
40
 
41
 static BOOL
42
@@ -591,11 +595,15 @@ frdp_post_connect (freerdp *instance)
43
 #if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \
44
     !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && \
45
     FREERDP_VERSION_MINOR >= 2))
46
-                    CLRBUF_24BPP,
47
+                    CLRBUF_24BPP, NULL
48
 #else
49
-                    CLRBUF_32BPP,
50
+#ifndef PIXEL_FORMAT_ARGB32
51
+                    CLRBUF_32BPP, NULL
52
+#else
53
+                    PIXEL_FORMAT_BGRA32
54
 #endif
55
-                    NULL);
56
+#endif
57
+                    );
58
   gdi = instance->context->gdi;
59
 
60
   instance->update->BeginPaint = frdp_begin_paint;
61
@@ -862,7 +870,7 @@ frdp_mouse_moved (GtkWidget      *widget
62
   return TRUE;
63
 }
64
 
65
-static gboolean
66
+static BOOL
67
 frdp_authenticate (freerdp  *instance,
68
                    char    **username,
69
                    char    **password,
70
@@ -934,11 +942,13 @@ frdp_authenticate (freerdp  *instance,
71
   return TRUE;
72
 }
73
 
74
-static BOOL
75
-frdp_certificate_verify (freerdp *instance,
76
-                         char    *subject,
77
-                         char    *issuer,
78
-                         char    *fingerprint)
79
+static DWORD
80
+frdp_certificate_verify (freerdp    *instance,
81
+                         const char *common_name,
82
+                         const char *subject,
83
+                         const char *issuer,
84
+                         const char *fingerprint,
85
+                         BOOL        host_mismatch)
86
 {
87
   VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab);
88
   GtkBuilder *builder;
89
@@ -973,12 +983,15 @@ frdp_certificate_verify (freerdp *instan
90
 
91
 
92
 #if HAVE_FREERDP_1_1
93
-static BOOL
94
-frdp_changed_certificate_verify (freerdp *instance,
95
-                                 char    *subject,
96
-                                 char    *issuer,
97
-                                 char    *new_fingerprint,
98
-                                 char    *old_fingerprint)
99
+static DWORD
100
+frdp_changed_certificate_verify (freerdp    *instance,
101
+                                 const char *common_name,
102
+                                 const char *subject,
103
+                                 const char *issuer,
104
+                                 const char *new_fingerprint,
105
+                                 const char *old_subject,
106
+                                 const char *old_issuer,
107
+                                 const char *old_fingerprint)
108
 {
109
   VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab);
110
   GtkBuilder *builder;

Return to bug 212004