Tue Jul 21 21:51:39 2015 UTC ()
Update tigervnc to 1.5.0

TigerVNC 1.5.0 - Lots of changes have been made since
the last release, but the highlights are:

  - IPv6 support in the servers
  - You can now have two passwords, one for full access and one for
    "view only".
  - syslog support in Xvnc
  - GnuTLS priority configuration
  - Performance fixes
  - You can now easily start more clients on OS X
  - More translations

TigerVNC 1.4.3 - This release addresses the following issues:

  - Upstream patches applied to the underlying Xorg code base to
    mitigate CVE-2015-0255.
  - Fixes for performance regressions introduced in 1.4.0.
  - Character encoding of clipboard text send by Java viewer now
    strictly adheres to the RFB specification.

TigerVNC 1.4.1 - This is release is in response to the recent Xorg
  Security Advisory. There are no known vulnerabilities in TigerVNC itself
  related to this advisory, however some of the changes to the Xorg
  codebase were not compatible with TigerVNC.

TigerVNC 1.4.0 - Lots of changes have been made since
the last release, but the highlights are:

 - Colour map (aka indexed, palette) mode is largely removed. TigerVNC
   is still compatible with other VNC implementations, but you can no
   longer run Xvnc in colour map mode.
 - Improvements to the keyboard handling both on the server and client
 - Support for newer Xorg versions in the server build
 - x0vncserver now supports XDamage for instant updates, making it
   slightly less useless
 - WinVNC now works in service mode on newer Windows versions
 - Better full screen mode for the Java client on OS X
 - man pages should now be up to date
 - Improved TLS implementation in the Java client
 - Lots and lots of cleanups and bug fixes


(markd)
diff -r1.6 -r1.7 pkgsrc/net/tigervnc/Makefile
diff -r1.1 -r1.2 pkgsrc/net/tigervnc/PLIST
diff -r1.2 -r1.3 pkgsrc/net/tigervnc/distinfo
diff -r1.1 -r1.2 pkgsrc/net/tigervnc/patches/patch-CMakeLists.txt
diff -r1.1 -r1.2 pkgsrc/net/tigervnc/patches/patch-common_CMakeLists.txt
diff -r1.1 -r1.2 pkgsrc/net/tigervnc/patches/patch-unix_xserver_hw_vnc_InputXKB.cc
diff -r1.1 -r1.2 pkgsrc/net/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am
diff -r0 -r1.1 pkgsrc/net/tigervnc/patches/patch-unix_xserver117.patch
diff -r1.1 -r0 pkgsrc/net/tigervnc/patches/patch-unix_xserver_hw_vnc_vncHooks.cc
diff -r1.1 -r0 pkgsrc/net/tigervnc/patches/patch-unix_xserver_hw_vnc_xorg-version.h
cvs diff -r1.6 -r1.7 pkgsrc/net/tigervnc/Makefile (expand / switch to unified diff)

--- pkgsrc/net/tigervnc/Makefile 2015/06/12 10:50:53 1.6
+++ pkgsrc/net/tigervnc/Makefile 2015/07/21 21:51:39 1.7
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.6 2015/06/12 10:50:53 wiz Exp $ 1# $NetBSD: Makefile,v 1.7 2015/07/21 21:51:39 markd Exp $
2 2
3DISTNAME= tigervnc-1.3.1 3DISTNAME= tigervnc-1.5.0
4PKGREVISION= 3 
5CATEGORIES= net 4CATEGORIES= net
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tigervnc/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=TigerVNC/}
7XORG_SERVER_FILE= xorg-server-1.12.4 6GITHUB_TAG= v${PKGVERSION_NOREV}
 7XORG_SERVER_FILE= xorg-server-1.17.2
8SITES.${XORG_SERVER_FILE}.tar.bz2= ${MASTER_SITE_XORG:=xserver/} 8SITES.${XORG_SERVER_FILE}.tar.bz2= ${MASTER_SITE_XORG:=xserver/}
9DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.bz2 9DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://tigervnc.org/ 12HOMEPAGE= http://tigervnc.org/
13COMMENT= High-performance, platform-neutral VNC client/server 13COMMENT= High-performance, platform-neutral VNC client/server
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
15 15
16BUILD_DEPENDS+= xorg-util-macros-[0-9]*:../../devel/xorg-util-macros 16BUILD_DEPENDS+= xorg-util-macros-[0-9]*:../../devel/xorg-util-macros
17BUILD_DEPENDS+= font-util-[0-9]*:../../fonts/font-util 17BUILD_DEPENDS+= font-util-[0-9]*:../../fonts/font-util
18BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp 18BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
19 19
20USE_CMAKE= yes 20USE_CMAKE= yes
@@ -34,57 +34,60 @@ SUBST_CLASSES+= hpath @@ -34,57 +34,60 @@ SUBST_CLASSES+= hpath
34SUBST_STAGE.hpath= pre-configure 34SUBST_STAGE.hpath= pre-configure
35SUBST_MESSAGE.hpath= fixing hardcoded paths 35SUBST_MESSAGE.hpath= fixing hardcoded paths
36SUBST_FILES.hpath= unix/vncserver 36SUBST_FILES.hpath= unix/vncserver
37SUBST_SED.hpath+= -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' 37SUBST_SED.hpath+= -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g'
38SUBST_VARS.hpath+= PREFIX X11BASE 38SUBST_VARS.hpath+= PREFIX X11BASE
39 39
40REPLACE_PERL+= unix/vncserver 40REPLACE_PERL+= unix/vncserver
41 41
42post-extract: 42post-extract:
43 cd ${WRKDIR} && ${EXTRACTOR} ${_DISTDIR}/${XORG_SERVER_FILE}.tar.bz2 43 cd ${WRKDIR} && ${EXTRACTOR} ${_DISTDIR}/${XORG_SERVER_FILE}.tar.bz2
44 cp -r ${WRKDIR}/${XORG_SERVER_FILE}/* ${WRKSRC}/unix/xserver 44 cp -r ${WRKDIR}/${XORG_SERVER_FILE}/* ${WRKSRC}/unix/xserver
45 45
46post-patch: 46post-patch:
47 cd ${WRKSRC}/unix/xserver && ${PATCH} --batch -p1 <../xserver112.patch 47 cd ${WRKSRC}/unix/xserver && ${PATCH} --batch -p1 <../xserver117.patch
48 48
49XORG_CONFIGURE_ARGS+= --prefix=${PREFIX} --mandir=${PREFIX}/${PKGMANDIR} 49XORG_CONFIGURE_ARGS+= --prefix=${PREFIX} --mandir=${PREFIX}/${PKGMANDIR}
50XORG_CONFIGURE_ARGS+= --disable-wayland --disable-present --disable-dri3 50XORG_CONFIGURE_ARGS+= --disable-xwayland --disable-kdrive --disable-xephyr
51XORG_CONFIGURE_ARGS+= --disable-static --disable-xinerama --without-dtrace 51XORG_CONFIGURE_ARGS+= --disable-static --disable-xinerama --without-dtrace
52XORG_CONFIGURE_ARGS+= --disable-xorg --disable-xnest --disable-xvfb --disable-dmx 52XORG_CONFIGURE_ARGS+= --disable-xorg --disable-xnest --disable-xvfb --disable-dmx
 53XORG_CONFIGURE_ARGS+= --disable-config-hal --disable-config-udev --with-pic
53XORG_CONFIGURE_ARGS+= --disable-unit-tests --disable-devel-docs --disable-selective-werror 54XORG_CONFIGURE_ARGS+= --disable-unit-tests --disable-devel-docs --disable-selective-werror
54XORG_CONFIGURE_ARGS+= --disable-dri --enable-dri2 --enable-glx --enable-glx-tls 55XORG_CONFIGURE_ARGS+= --disable-dri --enable-dri2 --disable-dri3 --enable-glx --enable-glx-tls
55 56
56pre-configure: 57pre-configure:
57 cd ${WRKSRC}/unix/xserver && autoreconf -fvi && \ 58 cd ${WRKSRC}/unix/xserver && autoreconf -fvi && \
58 ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} CONFIG_SHELL=${BASH} \ 59 ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} CONFIG_SHELL=${BASH} \
59 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \ 60 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \
60 ./configure ${XORG_CONFIGURE_ARGS} 61 ./configure ${XORG_CONFIGURE_ARGS}
61 62
62.include "../../mk/jpeg.buildlink3.mk" 63.include "../../mk/jpeg.buildlink3.mk"
63.include "../../converters/libiconv/buildlink3.mk" 64.include "../../converters/libiconv/buildlink3.mk"
64.include "../../devel/gettext-lib/buildlink3.mk" 65.include "../../devel/gettext-lib/buildlink3.mk"
65.include "../../devel/zlib/buildlink3.mk" 66.include "../../devel/zlib/buildlink3.mk"
66.include "../../security/gnutls/buildlink3.mk" 67.include "../../security/gnutls/buildlink3.mk"
67.include "../../security/libgcrypt/buildlink3.mk" 68.include "../../security/libgcrypt/buildlink3.mk"
68.include "../../x11/libXft/buildlink3.mk" 69.include "../../x11/libXft/buildlink3.mk"
69.include "../../x11/libX11/buildlink3.mk" 70.include "../../x11/libX11/buildlink3.mk"
70.include "../../x11/libXcursor/buildlink3.mk" 71.include "../../x11/libXcursor/buildlink3.mk"
71.include "../../x11/libXinerama/buildlink3.mk" 72.include "../../x11/libXinerama/buildlink3.mk"
72.include "../../x11/libXtst/buildlink3.mk" 73.include "../../x11/libXtst/buildlink3.mk"
73.include "../../x11/libdrm/buildlink3.mk" 74.include "../../x11/libdrm/buildlink3.mk"
 75BUILDLINK_API_DEPENDS.fltk+= fltk>=1.3.3
74.include "../../x11/fltk13/buildlink3.mk" 76.include "../../x11/fltk13/buildlink3.mk"
75.include "../../x11/pixman/buildlink3.mk" 77.include "../../x11/pixman/buildlink3.mk"
76.include "../../x11/xcmiscproto/buildlink3.mk" 78.include "../../x11/xcmiscproto/buildlink3.mk"
77.include "../../x11/xtrans/buildlink3.mk" 79.include "../../x11/xtrans/buildlink3.mk"
78.include "../../x11/bigreqsproto/buildlink3.mk" 80.include "../../x11/bigreqsproto/buildlink3.mk"
79.include "../../x11/compositeproto/buildlink3.mk" 81.include "../../x11/compositeproto/buildlink3.mk"
80.include "../../x11/damageproto/buildlink3.mk" 82.include "../../x11/damageproto/buildlink3.mk"
81.include "../../x11/dri2proto/buildlink3.mk" 83.include "../../x11/dri2proto/buildlink3.mk"
82.include "../../x11/libXfont/buildlink3.mk" 84.include "../../x11/libXfont/buildlink3.mk"
83.include "../../x11/libxkbfile/buildlink3.mk" 85.include "../../x11/libxkbfile/buildlink3.mk"
84.include "../../x11/randrproto/buildlink3.mk" 86.include "../../x11/randrproto/buildlink3.mk"
85.include "../../x11/fontsproto/buildlink3.mk" 87.include "../../x11/fontsproto/buildlink3.mk"
86.include "../../x11/glproto/buildlink3.mk" 88.include "../../x11/glproto/buildlink3.mk"
 89.include "../../x11/presentproto/buildlink3.mk"
87.include "../../x11/resourceproto/buildlink3.mk" 90.include "../../x11/resourceproto/buildlink3.mk"
88.include "../../x11/scrnsaverproto/buildlink3.mk" 91.include "../../x11/scrnsaverproto/buildlink3.mk"
89.include "../../x11/videoproto/buildlink3.mk" 92.include "../../x11/videoproto/buildlink3.mk"
90.include "../../mk/bsd.pkg.mk" 93.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/net/tigervnc/PLIST (expand / switch to unified diff)

--- pkgsrc/net/tigervnc/PLIST 2015/02/08 19:42:09 1.1
+++ pkgsrc/net/tigervnc/PLIST 2015/07/21 21:51:39 1.2
@@ -1,22 +1,33 @@ @@ -1,22 +1,33 @@
1@comment $NetBSD: PLIST,v 1.1 2015/02/08 19:42:09 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.2 2015/07/21 21:51:39 markd Exp $
2bin/Xvnc 2bin/Xvnc
3bin/vncconfig 3bin/vncconfig
4bin/vncpasswd 4bin/vncpasswd
5bin/vncserver 5bin/vncserver
6bin/vncviewer 6bin/vncviewer
7bin/x0vncserver 7bin/x0vncserver
8lib/xorg/modules/extensions/libvnc.la 8lib/xorg/modules/extensions/libvnc.la
9man/man1/Xvnc.1 9man/man1/Xvnc.1
10man/man1/vncconfig.1 10man/man1/vncconfig.1
11man/man1/vncpasswd.1 11man/man1/vncpasswd.1
12man/man1/vncserver.1 12man/man1/vncserver.1
13man/man1/vncviewer.1 13man/man1/vncviewer.1
14man/man1/x0vncserver.1 14man/man1/x0vncserver.1
15share/doc/${PKGNAME}/LICENCE.TXT 15share/doc/${PKGNAME}/LICENCE.TXT
16share/doc/${PKGNAME}/README.txt 16share/doc/${PKGNAME}/README.txt
 17share/locale/bg/LC_MESSAGES/tigervnc.mo
 18share/locale/da/LC_MESSAGES/tigervnc.mo
17share/locale/de/LC_MESSAGES/tigervnc.mo 19share/locale/de/LC_MESSAGES/tigervnc.mo
 20share/locale/el/LC_MESSAGES/tigervnc.mo
 21share/locale/eo/LC_MESSAGES/tigervnc.mo
 22share/locale/es/LC_MESSAGES/tigervnc.mo
 23share/locale/fi/LC_MESSAGES/tigervnc.mo
18share/locale/fr/LC_MESSAGES/tigervnc.mo 24share/locale/fr/LC_MESSAGES/tigervnc.mo
 25share/locale/it/LC_MESSAGES/tigervnc.mo
 26share/locale/nl/LC_MESSAGES/tigervnc.mo
19share/locale/pl/LC_MESSAGES/tigervnc.mo 27share/locale/pl/LC_MESSAGES/tigervnc.mo
 28share/locale/pt_BR/LC_MESSAGES/tigervnc.mo
20share/locale/ru/LC_MESSAGES/tigervnc.mo 29share/locale/ru/LC_MESSAGES/tigervnc.mo
21share/locale/sk/LC_MESSAGES/tigervnc.mo 30share/locale/sk/LC_MESSAGES/tigervnc.mo
22share/locale/sv/LC_MESSAGES/tigervnc.mo 31share/locale/sv/LC_MESSAGES/tigervnc.mo
 32share/locale/tr/LC_MESSAGES/tigervnc.mo
 33share/locale/uk/LC_MESSAGES/tigervnc.mo
cvs diff -r1.2 -r1.3 pkgsrc/net/tigervnc/distinfo (expand / switch to unified diff)

--- pkgsrc/net/tigervnc/distinfo 2015/03/22 20:07:46 1.2
+++ pkgsrc/net/tigervnc/distinfo 2015/07/21 21:51:39 1.3
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1$NetBSD: distinfo,v 1.2 2015/03/22 20:07:46 joerg Exp $ 1$NetBSD: distinfo,v 1.3 2015/07/21 21:51:39 markd Exp $
2 2
3SHA1 (tigervnc-1.3.1.tar.gz) = 308ec9a9a627d20406eebfaeac4f3d4398278cc1 3SHA1 (tigervnc-1.5.0.tar.gz) = e03e618c06153b83d1fec756cd817885c371cd0b
4RMD160 (tigervnc-1.3.1.tar.gz) = 522cbd74cfd0293dbc82f4a570dc5beb206c9ed8 4RMD160 (tigervnc-1.5.0.tar.gz) = 57240c4a5db8c0d013dbc12322e48901f5750d90
5Size (tigervnc-1.3.1.tar.gz) = 6888105 bytes 5Size (tigervnc-1.5.0.tar.gz) = 1268682 bytes
6SHA1 (xorg-server-1.12.4.tar.bz2) = 6d616874f9c7677bda08dc073c03f83e78fbc585 6SHA1 (xorg-server-1.17.2.tar.bz2) = 56ac29a82b99bcf4c7ba2fca41a44cfa18748262
7RMD160 (xorg-server-1.12.4.tar.bz2) = 4907b5dc42efd6b3fb6bf9d64f1441080a6a6983 7RMD160 (xorg-server-1.17.2.tar.bz2) = bf575a269f1e7b729992a20989be84e09fcc88a2
8Size (xorg-server-1.12.4.tar.bz2) = 5444761 bytes 8Size (xorg-server-1.17.2.tar.bz2) = 5767983 bytes
9SHA1 (patch-CMakeLists.txt) = c5d2bd4b0f56977c8cd3c4b0a46359c765ada200 9SHA1 (patch-CMakeLists.txt) = 8528782142ef7bc95151f8a130bc8626ad9ee93c
10SHA1 (patch-common_CMakeLists.txt) = e3dabe3d8ae146cf68a9660a20af2f36c2827731 10SHA1 (patch-common_CMakeLists.txt) = d879e36df9db9978adaa5545758f43097d40f10a
11SHA1 (patch-media_CMakeLists.txt) = cd50f9b7a9405aa523412ef823a32437a3c19ffa 11SHA1 (patch-media_CMakeLists.txt) = cd50f9b7a9405aa523412ef823a32437a3c19ffa
12SHA1 (patch-unix_vncserver) = 8baacca2d1083f330781caff7da2ac996af91aa4 12SHA1 (patch-unix_vncserver) = 8baacca2d1083f330781caff7da2ac996af91aa4
13SHA1 (patch-unix_xserver_hw_vnc_InputXKB.cc) = 440067e4995b7e1a0580bd106eb63740f400cb2c 13SHA1 (patch-unix_xserver117.patch) = 5e5d2a98f0b765ae0d6bb5f200808126b03dcc51
14SHA1 (patch-unix_xserver_hw_vnc_Makefile.am) = 7644bbf5a111ec765d45d057a430ce07ece9e90b 14SHA1 (patch-unix_xserver_hw_vnc_InputXKB.cc) = 58dfddf27233b534bbb0e05edd4db3392a8a38df
15SHA1 (patch-unix_xserver_hw_vnc_vncHooks.cc) = aa247443fe39279e3f6c75067dd644546d01420a 15SHA1 (patch-unix_xserver_hw_vnc_Makefile.am) = d2d61050cdc5a54b46a2c41cd8ea394fa0b1a574
16SHA1 (patch-unix_xserver_hw_vnc_xorg-version.h) = 77dadfc369dc07dc7a2eb115be9e3ab5234f0270 
cvs diff -r1.1 -r1.2 pkgsrc/net/tigervnc/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/net/tigervnc/patches/patch-CMakeLists.txt 2015/02/08 19:42:09 1.1
+++ pkgsrc/net/tigervnc/patches/patch-CMakeLists.txt 2015/07/21 21:51:39 1.2
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: patch-CMakeLists.txt,v 1.1 2015/02/08 19:42:09 wiz Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.2 2015/07/21 21:51:39 markd Exp $
2 2
3--- CMakeLists.txt.orig 2014-08-14 09:25:26.000000000 +0000 3--- CMakeLists.txt.orig 2015-07-11 13:00:36.000000000 +0000
4+++ CMakeLists.txt 4+++ CMakeLists.txt
5@@ -26,7 +26,7 @@ set(RCVERSION 1,3,1,0) 5@@ -26,7 +26,7 @@ set(RCVERSION 1,5,0,0)
6 # Installation paths 6 # Installation paths
7 set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin") 7 set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
8 set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share") 8 set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share")
9-set(MAN_DIR "${DATA_DIR}/man") 9-set(MAN_DIR "${DATA_DIR}/man")
10+set(MAN_DIR "${CMAKE_INSTALL_PREFIX}/man") 10+set(MAN_DIR "${CMAKE_INSTALL_PREFIX}/man")
11 set(LOCALE_DIR "${DATA_DIR}/locale") 11 set(LOCALE_DIR "${DATA_DIR}/locale")
12 set(DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${CMAKE_PROJECT_NAME}-${VERSION}") 12 set(DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${CMAKE_PROJECT_NAME}-${VERSION}")
13  13
14@@ -269,6 +269,7 @@ if(UNIX AND NOT APPLE) 14@@ -268,6 +268,7 @@ else()
15 if(X11_Xcursor_FOUND) 15 if(NOT APPLE)
16 set(FLTK_LIBRARIES ${FLTK_LIBRARIES} ${X11_Xcursor_LIB}) 16 add_subdirectory(unix)
17 endif() 17 endif()
18+ set(FLTK_LIBRARIES ${FLTK_LIBRARIES} -lpng -ljpeg) 18+ set(FLTK_LIBRARIES ${FLTK_LIBRARIES} -lpng -ljpeg)
19 endif() 19 endif()
20  20
21 if(FLTK_FOUND) 21 if(ENABLE_NLS)
cvs diff -r1.1 -r1.2 pkgsrc/net/tigervnc/patches/Attic/patch-common_CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/net/tigervnc/patches/Attic/patch-common_CMakeLists.txt 2015/03/22 20:07:46 1.1
+++ pkgsrc/net/tigervnc/patches/Attic/patch-common_CMakeLists.txt 2015/07/21 21:51:39 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-common_CMakeLists.txt,v 1.1 2015/03/22 20:07:46 joerg Exp $ 1$NetBSD: patch-common_CMakeLists.txt,v 1.2 2015/07/21 21:51:39 markd Exp $
2 2
3--- common/CMakeLists.txt.orig 2015-03-22 17:29:15.000000000 +0000 3--- common/CMakeLists.txt.orig 2015-07-11 13:00:36.000000000 +0000
4+++ common/CMakeLists.txt 4+++ common/CMakeLists.txt
5@@ -16,7 +16,7 @@ add_subdirectory(rfb) 5@@ -9,7 +9,7 @@ add_subdirectory(rfb)
6 # because PIC code does not exist on that platform and MinGW complains if -fPIC 6 # because PIC code does not exist on that platform and MinGW complains if -fPIC
7 # is passed (additionally, libvnc is not used on Windows.) 7 # is passed (additionally, libvnc is not used on Windows.)
8  8
9-if(CMAKE_COMPILER_IS_GNUCXX AND (CMAKE_SIZEOF_VOID_P MATCHES 8) AND NOT WIN32) 9-if(CMAKE_COMPILER_IS_GNUCXX AND (CMAKE_SIZEOF_VOID_P MATCHES 8) AND NOT WIN32)
10+if(NOT WIN32) 10+if(NOT WIN32)
11 set_target_properties(os rdr network Xregion rfb 11 set_target_properties(os rdr network Xregion rfb
12 PROPERTIES COMPILE_FLAGS -fPIC) 12 PROPERTIES COMPILE_FLAGS -fPIC)
13 if(USE_INCLUDED_ZLIB) 13 endif()
cvs diff -r1.1 -r1.2 pkgsrc/net/tigervnc/patches/Attic/patch-unix_xserver_hw_vnc_InputXKB.cc (expand / switch to unified diff)

--- pkgsrc/net/tigervnc/patches/Attic/patch-unix_xserver_hw_vnc_InputXKB.cc 2015/02/08 19:42:09 1.1
+++ pkgsrc/net/tigervnc/patches/Attic/patch-unix_xserver_hw_vnc_InputXKB.cc 2015/07/21 21:51:39 1.2
@@ -1,97 +1,94 @@ @@ -1,97 +1,94 @@
1$NetBSD: patch-unix_xserver_hw_vnc_InputXKB.cc,v 1.1 2015/02/08 19:42:09 wiz Exp $ 1$NetBSD: patch-unix_xserver_hw_vnc_InputXKB.cc,v 1.2 2015/07/21 21:51:39 markd Exp $
2 2
3--- unix/xserver/hw/vnc/InputXKB.cc.orig 2013-05-30 14:53:40.000000000 +0000 3--- unix/xserver/hw/vnc/InputXKB.c.orig 2015-07-11 13:00:36.000000000 +0000
4+++ unix/xserver/hw/vnc/InputXKB.cc 4+++ unix/xserver/hw/vnc/InputXKB.c
5@@ -232,10 +232,7 @@ void InputDevice::PrepareInputDevices(vo 5@@ -212,7 +212,7 @@ unsigned vncGetKeyboardState(void)
6  
7 unsigned InputDevice::getKeyboardState(void) 
8 { 6 {
9- DeviceIntPtr master; 7 DeviceIntPtr master;
10- 8
11- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT); 9- master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
12- return XkbStateFieldFromRec(&master->key->xkbInfo->state); 10+ master = vncKeyboardDev->master;
13+ return XkbStateFieldFromRec(&keyboardDev->master->key->xkbInfo->state); 11 return XkbStateFieldFromRec(&master->key->xkbInfo->state);
14 } 12 }
15  13
16 unsigned InputDevice::getLevelThreeMask(void) 14@@ -234,7 +234,7 @@ unsigned vncGetLevelThreeMask(void)
17@@ -256,7 +253,7 @@ unsigned InputDevice::getLevelThreeMask( 
18 return 0; 15 return 0;
19 } 16 }
20  17
21- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc; 18- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
22+ xkb = keyboardDev->master->key->xkbInfo->desc; 19+ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
23  20
24 act = XkbKeyActionPtr(xkb, keycode, state); 21 act = XkbKeyActionPtr(xkb, keycode, state);
25 if (act == NULL) 22 if (act == NULL)
26@@ -281,7 +278,7 @@ KeyCode InputDevice::pressShift(void) 23@@ -259,7 +259,7 @@ KeyCode vncPressShift(void)
27 if (state & ShiftMask) 24 if (state & ShiftMask)
28 return 0; 25 return 0;
29  26
30- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc; 27- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
31+ xkb = keyboardDev->master->key->xkbInfo->desc; 28+ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
32 for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) { 29 for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
33 XkbAction *act; 30 XkbAction *act;
34 unsigned char mask; 31 unsigned char mask;
35@@ -318,7 +315,7 @@ std::list<KeyCode> InputDevice::releaseS 32@@ -299,7 +299,7 @@ size_t vncReleaseShift(KeyCode *keys, si
36 if (!(state & ShiftMask)) 33
37 return keys; 34 count = 0;
38  35
39- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT); 36- master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
40+ master = keyboardDev->master; 37+ master = vncKeyboardDev->master;
41 xkb = master->key->xkbInfo->desc; 38 xkb = master->key->xkbInfo->desc;
42 for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) { 39 for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
43 XkbAction *act; 40 XkbAction *act;
44@@ -371,7 +368,7 @@ KeyCode InputDevice::pressLevelThree(voi 41@@ -355,7 +355,7 @@ KeyCode vncPressLevelThree(void)
45 return 0; 42 return 0;
46 } 43 }
47  44
48- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc; 45- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
49+ xkb = keyboardDev->master->key->xkbInfo->desc; 46+ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
50  47
51 act = XkbKeyActionPtr(xkb, keycode, state); 48 act = XkbKeyActionPtr(xkb, keycode, state);
52 if (act == NULL) 49 if (act == NULL)
53@@ -399,7 +396,7 @@ std::list<KeyCode> InputDevice::releaseL 50@@ -386,7 +386,7 @@ size_t vncReleaseLevelThree(KeyCode *key
54 if (!(state & mask)) 
55 return keys; 
56  51
57- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT); 52 count = 0;
58+ master = keyboardDev->master; 53
 54- master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
 55+ master = vncKeyboardDev->master;
59 xkb = master->key->xkbInfo->desc; 56 xkb = master->key->xkbInfo->desc;
60 for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) { 57 for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
61 XkbAction *act; 58 XkbAction *act;
62@@ -440,7 +437,7 @@ KeyCode InputDevice::keysymToKeycode(Key 59@@ -429,7 +429,7 @@ KeyCode vncKeysymToKeycode(KeySym keysym
63 if (new_state != NULL) 60 if (new_state != NULL)
64 *new_state = state; 61 *new_state = state;
65  62
66- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc; 63- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
67+ xkb = keyboardDev->master->key->xkbInfo->desc; 64+ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
68 for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) { 65 for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
69 unsigned int state_out; 66 unsigned int state_out;
70 KeySym dummy; 67 KeySym dummy;
71@@ -497,7 +494,7 @@ bool InputDevice::isLockModifier(KeyCode 68@@ -486,7 +486,7 @@ int vncIsLockModifier(KeyCode keycode, u
72 XkbDescPtr xkb; 69 XkbDescPtr xkb;
73 XkbAction *act; 70 XkbAction *act;
74  71
75- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc; 72- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
76+ xkb = keyboardDev->master->key->xkbInfo->desc; 73+ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
77  74
78 act = XkbKeyActionPtr(xkb, keycode, state); 75 act = XkbKeyActionPtr(xkb, keycode, state);
79 if (act == NULL) 76 if (act == NULL)
80@@ -535,7 +532,7 @@ bool InputDevice::isAffectedByNumLock(Ke 77@@ -524,7 +524,7 @@ int vncIsAffectedByNumLock(KeyCode keyco
81 if (numlock_keycode == 0) 78 if (numlock_keycode == 0)
82 return false; 79 return 0;
83  80
84- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc; 81- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
85+ xkb = keyboardDev->master->key->xkbInfo->desc; 82+ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
86  83
87 act = XkbKeyActionPtr(xkb, numlock_keycode, state); 84 act = XkbKeyActionPtr(xkb, numlock_keycode, state);
88 if (act == NULL) 85 if (act == NULL)
89@@ -569,7 +566,7 @@ KeyCode InputDevice::addKeysym(KeySym ke 86@@ -558,7 +558,7 @@ KeyCode vncAddKeysym(KeySym keysym, unsi
90 KeySym *syms; 87 KeySym *syms;
91 KeySym upper, lower; 88 KeySym upper, lower;
92  89
93- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT); 90- master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
94+ master = keyboardDev->master; 91+ master = vncKeyboardDev->master;
95 xkb = master->key->xkbInfo->desc; 92 xkb = master->key->xkbInfo->desc;
96 for (key = xkb->max_key_code; key >= xkb->min_key_code; key--) { 93 for (key = xkb->max_key_code; key >= xkb->min_key_code; key--) {
97 if (XkbKeyNumGroups(xkb, key) == 0) 94 if (XkbKeyNumGroups(xkb, key) == 0)
cvs diff -r1.1 -r1.2 pkgsrc/net/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am (expand / switch to unified diff)

--- pkgsrc/net/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am 2015/02/08 19:42:09 1.1
+++ pkgsrc/net/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am 2015/07/21 21:51:39 1.2
@@ -1,21 +1,25 @@ @@ -1,21 +1,25 @@
1$NetBSD: patch-unix_xserver_hw_vnc_Makefile.am,v 1.1 2015/02/08 19:42:09 wiz Exp $ 1$NetBSD: patch-unix_xserver_hw_vnc_Makefile.am,v 1.2 2015/07/21 21:51:39 markd Exp $
2 2
3--- unix/xserver/hw/vnc/Makefile.am.orig 2013-04-09 15:50:50.000000000 +0000 3--- unix/xserver/hw/vnc/Makefile.am.orig 2015-07-11 13:00:36.000000000 +0000
4+++ unix/xserver/hw/vnc/Makefile.am 4+++ unix/xserver/hw/vnc/Makefile.am
5@@ -5,6 +5,7 @@ RFB_LIB=$(LIB_DIR)/rfb/librfb.la 5@@ -5,8 +5,12 @@ RFB_LIB=$(LIB_DIR)/rfb/librfb.la
6 RDR_LIB=$(LIB_DIR)/rdr/librdr.la 6 RDR_LIB=$(LIB_DIR)/rdr/librdr.la
7 NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la 7 NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la
8 XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la 8 XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la
9+OS_LIB=$(LIB_DIR)/os/libos.la 9+OS_LIB=$(LIB_DIR)/os/libos.la
10 COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) 10 COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB)
11  11
 12+# Hack to get the C headers to work when included from C++ code
 13+AM_CXXFLAGS = -fpermissive
 14+
12 noinst_LTLIBRARIES = libvnccommon.la 15 noinst_LTLIBRARIES = libvnccommon.la
13@@ -55,7 +56,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I 
14  16
15 libvnc_la_LDFLAGS = -module -avoid-version 17 HDRS = vncExtInit.h vncHooks.h \
 18@@ -64,6 +68,6 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
 19
 20 libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
16  21
17-libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) 22-libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS)
18+libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB) 23+libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB)
19  24
20 EXTRA_DIST = Xvnc.man 25 EXTRA_DIST = Xvnc.man
21  
File Added: pkgsrc/net/tigervnc/patches/Attic/patch-unix_xserver117.patch
$NetBSD: patch-unix_xserver117.patch,v 1.1 2015/07/21 21:51:39 markd Exp $

--- unix/xserver117.patch.orig	2015-07-11 13:00:36.000000000 +0000
+++ unix/xserver117.patch
@@ -85,7 +85,24 @@ diff -up xorg-server-1.17.1/mi/miinitext
 diff -up xorg-server-1.17.1/os/WaitFor.c.vnc xorg-server-1.17.1/os/WaitFor.c
 --- xorg-server-1.17.1/os/WaitFor.c.vnc	2015-01-26 18:40:30.000000000 +0000
 +++ xorg-server-1.17.1/os/WaitFor.c	2015-02-13 16:14:05.132516837 +0000
-@@ -125,6 +125,9 @@ static void DoTimer(OsTimerPtr timer, CA
+@@ -52,6 +52,8 @@
+  *
+  *****************************************************************/
+ 
++#include <X11/Xpoll.h>
++
+ #ifdef HAVE_DIX_CONFIG_H
+ #include <dix-config.h>
+ #endif
+@@ -66,7 +68,6 @@
+ #include "misc.h"
+ 
+ #include "osdep.h"
+-#include <X11/Xpoll.h>
+ #include "dixstruct.h"
+ #include "opaque.h"
+ #ifdef DPMSExtension
+@@ -125,6 +126,9 @@
  static void CheckAllTimers(void);
  static volatile OsTimerPtr timers = NULL;
  
@@ -135,3 +152,41 @@ diff -up xorg-server-1.17.1/os/WaitFor.c
          if (i <= 0) {           /* An error or timeout occurred */
              if (dispatchException)
                  return 0;
+--- xorg-server-1.17.1/os/connection.c.orig	2015-07-22 08:50:52.000000000 +1200
++++ xorg-server-1.17.1/os/connection.c	2015-07-22 08:54:35.000000000 +1200
+@@ -60,6 +60,8 @@
+  *
+  *****************************************************************/
+ 
++#include <X11/Xpoll.h>
++
+ #ifdef HAVE_DIX_CONFIG_H
+ #include <dix-config.h>
+ #endif
+@@ -103,7 +105,6 @@
+ #endif                          /* WIN32 */
+ #include "misc.h"               /* for typedef of pointer */
+ #include "osdep.h"
+-#include <X11/Xpoll.h>
+ #include "opaque.h"
+ #include "dixstruct.h"
+ #include "xace.h"
+--- xorg-server-1.17.1/os/io.c.orig	2015-07-22 08:50:52.000000000 +1200
++++ xorg-server-1.17.1/os/io.c	2015-07-22 08:55:03.000000000 +1200
+@@ -51,6 +51,8 @@
+  *
+  *****************************************************************/
+ 
++#include <X11/Xpoll.h>
++
+ #ifdef HAVE_DIX_CONFIG_H
+ #include <dix-config.h>
+ #endif
+@@ -74,7 +76,6 @@
+ #include <X11/Xproto.h>
+ #include "os.h"
+ #include "osdep.h"
+-#include <X11/Xpoll.h>
+ #include "opaque.h"
+ #include "dixstruct.h"
+ #include "misc.h"
File Deleted: pkgsrc/net/tigervnc/patches/Attic/patch-unix_xserver_hw_vnc_vncHooks.cc
File Deleted: pkgsrc/net/tigervnc/patches/Attic/patch-unix_xserver_hw_vnc_xorg-version.h