Attachment 182925 Details for Bug 219566 – patch

patch

patch-tigervnc-1.8.0.txt (text/plain), 4.81 KB, created by Koichiro Iwao on 2017-05-26 09:18:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Koichiro Iwao

Created: 2017-05-26 09:18:17 UTC

Size: 4.81 KB

patch

obsolete

>diff --git net/tigervnc-devel/Makefile net/tigervnc-devel/Makefile
>index d9ae48b..49ee25d 100644
>--- net/tigervnc-devel/Makefile
>+++ net/tigervnc-devel/Makefile
>@@ -46,6 +46,8 @@ LIB_DEPENDS=	libunwind.so:devel/libunwind \
> 
> CFLAGS+=	-fPIC
> 
>+IGNORE=		No development version available right now. Please use net/tigervnc instead.
>+
> OPTIONS_DEFINE=		GNUTLS NLS PAM VIEWER DOCS
> OPTIONS_DEFAULT=	GNUTLS PAM VIEWER
> VIEWER_DESC=		Build vncviewer
>diff --git net/tigervnc/Makefile net/tigervnc/Makefile
>index e13da17..d6b7564 100644
>--- net/tigervnc/Makefile
>+++ net/tigervnc/Makefile
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	tigervnc
>-PORTVERSION=	1.7.1
>-PORTREVISION=	2
>+PORTVERSION=	1.8.0
> DISTVERSIONPREFIX=	v
> CATEGORIES=	net x11-servers
> 
>@@ -16,6 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENCE.TXT
> PATCH_DEPENDS=	${NONEXISTENT}:x11-servers/xorg-server:patch
> BUILD_DEPENDS=	${LOCALBASE}/include/GL/internal/dri_interface.h:graphics/mesa-dri \
> 		${LOCALBASE}/libdata/pkgconfig/fontutil.pc:x11-fonts/font-util \
>+		${LOCALBASE}/include/FL/Fl.H:x11-toolkits/fltk \
> 		bash:shells/bash
> # almost equivalent to x11-servers/xorg-server's
> RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \
>@@ -23,8 +23,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \
> 
> CONFLICTS=	tigervnc-devel-[0-9]* \
> 		tightvnc-[0-9]* \
>-		tridiavnc-[0-9]* \
>-		vnc-[0-9]*
>+		tridiavnc-[0-9]*
> 
> USES=		autoreconf:build cmake cpe iconv jpeg libtool pkgconfig \
> 		python ssl
>diff --git net/tigervnc/distinfo net/tigervnc/distinfo
>index fae8e6e..203d3a1 100644
>--- net/tigervnc/distinfo
>+++ net/tigervnc/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1485135437
>-SHA256 (TigerVNC-tigervnc-v1.7.1_GH0.tar.gz) = 3c021ec0bee4611020c0bcbab995b0ef2f6f1a46127a52b368827f3275527ccc
>-SIZE (TigerVNC-tigervnc-v1.7.1_GH0.tar.gz) = 1406032
>+TIMESTAMP = 1495786956
>+SHA256 (TigerVNC-tigervnc-v1.8.0_GH0.tar.gz) = 9951dab0e10f8de03996ec94bec0d938da9f36d48dca8c954e8bbc95c16338f8
>+SIZE (TigerVNC-tigervnc-v1.8.0_GH0.tar.gz) = 1433830
>diff --git net/tigervnc/files/patch-unix_vncserver net/tigervnc/files/patch-unix_vncserver
>index 1347645..2ce761c 100644
>--- net/tigervnc/files/patch-unix_vncserver
>+++ net/tigervnc/files/patch-unix_vncserver
>@@ -1,20 +1,8 @@
>---- unix/vncserver.orig	2016-09-08 10:31:18 UTC
>+diff --git unix/vncserver unix/vncserver
>+index 2ef436a7..dac27520 100755
>+--- unix/vncserver
> +++ unix/vncserver
>-@@ -240,7 +240,13 @@ unlink($desktopLog);
>- 
>- # Make an X server cookie and set up the Xauthority file
>- 
>-+# mcookie is a part of util-linux, usually only GNU/Linux systems have it.
>- $cookie = `mcookie`;
>-+# Alternative method for cookie. For non GNU/Linux operating systems.
>-+$cookie ||= `dd if=/dev/urandom bs=16 count=1 2>/dev/null| od -x -An | tr -d ' '`;
>-+if ($cookie eq '') {
>-+    die "couldn't generate magic cookie.\n";
>-+}
>- 
>- open(XAUTH, "|xauth -f $xauthorityFile source -");
>- print XAUTH "add $host:$displayNumber . $cookie\n";
>-@@ -470,7 +476,7 @@ sub CheckDisplayNumber
>+@@ -532,7 +532,7 @@ sub CheckDisplayNumber
>  
>      socket(S, $AF_INET, $SOCK_STREAM, 0) || die "$prog: socket failed: $!\n";
>      eval 'setsockopt(S, &SOL_SOCKET, &SO_REUSEADDR, pack("l", 1))';
>@@ -23,7 +11,7 @@
>  	close(S);
>  	return 0;
>      }
>-@@ -478,7 +484,7 @@ sub CheckDisplayNumber
>+@@ -540,7 +540,7 @@ sub CheckDisplayNumber
>  
>      socket(S, $AF_INET, $SOCK_STREAM, 0) || die "$prog: socket failed: $!\n";
>      eval 'setsockopt(S, &SOL_SOCKET, &SO_REUSEADDR, pack("l", 1))';
>@@ -32,12 +20,3 @@
>  	close(S);
>  	return 0;
>      }
>-@@ -778,7 +784,7 @@ sub SanityCheck
>-     #
>- 
>-  cmd:
>--    foreach $cmd ("uname","mcookie","xauth") {
>-+    foreach $cmd ("uname","xauth") {
>- 	for (split(/:/,$ENV{PATH})) {
>- 	    if (-x "$_/$cmd") {
>- 		next cmd;
>diff --git net/tigervnc/files/patch-unix_xserver118.patch net/tigervnc/files/patch-unix_xserver118.patch
>deleted file mode 100644
>index 6cb077a..0000000
>--- net/tigervnc/files/patch-unix_xserver118.patch
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- unix/xserver118.patch.orig  2017-01-18 12:39:28 UTC
>-+++ unix/xserver118.patch
>-@@ -65,7 +65,7 @@ diff -ur xorg-server.orig/mi/miinitext.c
>- #include "globals.h"
>-  
>- +#ifdef TIGERVNC
>--+extern void vncExtensionInit(INITARGS);
>-++extern void vncExtensionInit(void);
>- +#endif
>- +
>-  /* The following is only a small first step towards run-time
>diff --git net/tigervnc/pkg-plist net/tigervnc/pkg-plist
>index 555014c..fa23778 100644
>--- net/tigervnc/pkg-plist
>+++ net/tigervnc/pkg-plist
>@@ -19,6 +19,8 @@ man/man1/Xvnc.1.gz
> %%NLS%%share/locale/es/LC_MESSAGES/tigervnc.mo
> %%NLS%%share/locale/fi/LC_MESSAGES/tigervnc.mo
> %%NLS%%share/locale/fr/LC_MESSAGES/tigervnc.mo
>+%%NLS%%share/locale/fur/LC_MESSAGES/tigervnc.mo
>+%%NLS%%share/locale/hu/LC_MESSAGES/tigervnc.mo
> %%NLS%%share/locale/it/LC_MESSAGES/tigervnc.mo
> %%NLS%%share/locale/nl/LC_MESSAGES/tigervnc.mo
> %%NLS%%share/locale/pl/LC_MESSAGES/tigervnc.mo

Actions: View

Attachments on bug 219566: 182925 | 182933