Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 33D957A1B1 for ; Tue, 20 Sep 2016 08:12:16 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id A1B9E85E87; Tue, 20 Sep 2016 08:12:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 30EF485E80 for ; Tue, 20 Sep 2016 08:12:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id ZA4hTW8z25uH for ; Tue, 20 Sep 2016 08:12:14 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7C1FA85E13 for ; Tue, 20 Sep 2016 08:12:14 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 773EEFBD1; Tue, 20 Sep 2016 08:12:14 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_147435913446150" MIME-Version: 1.0 Date: Tue, 20 Sep 2016 08:12:14 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/net/tigervnc To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20160920081214.773EEFBD1@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_147435913446150 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Tue Sep 20 08:12:14 UTC 2016 Modified Files: pkgsrc/net/tigervnc: Makefile distinfo Added Files: pkgsrc/net/tigervnc/patches: patch-unix_xserver117.patch Removed Files: pkgsrc/net/tigervnc/patches: patch-unix_xserver118.patch Log Message: Updated tigervnc to 1.7.0nb3. Add missing mcookie dependency. Switch back to xorg-server-1.17 since 1.18 made Xnvc dump core on startup. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/tigervnc/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/tigervnc/distinfo cvs rdiff -u -r0 -r1.4 \ pkgsrc/net/tigervnc/patches/patch-unix_xserver117.patch cvs rdiff -u -r1.1 -r0 \ pkgsrc/net/tigervnc/patches/patch-unix_xserver118.patch Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_147435913446150 Content-Disposition: inline Content-Length: 6444 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/tigervnc/Makefile diff -u pkgsrc/net/tigervnc/Makefile:1.13 pkgsrc/net/tigervnc/Makefile:1.14 --- pkgsrc/net/tigervnc/Makefile:1.13 Mon Sep 19 13:04:26 2016 +++ pkgsrc/net/tigervnc/Makefile Tue Sep 20 08:12:14 2016 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.13 2016/09/19 13:04:26 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2016/09/20 08:12:14 wiz Exp $ DISTNAME= tigervnc-1.7.0 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GITHUB:=TigerVNC/} GITHUB_TAG= v${PKGVERSION_NOREV} -XORG_SERVER_FILE= xorg-server-1.18.4 +XORG_SERVER_FILE= xorg-server-1.17.2 SITES.${XORG_SERVER_FILE}.tar.bz2= ${MASTER_SITE_XORG:=xserver/} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.bz2 @@ -18,6 +18,8 @@ BUILD_DEPENDS+= xorg-util-macros-[0-9]*: BUILD_DEPENDS+= font-util-[0-9]*:../../fonts/font-util BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp +DEPENDS+= mcookie-[0-9]*:../../x11/mcookie + USE_CMAKE= yes USE_LIBTOOL= yes USE_LANGUAGES= c c++ @@ -45,7 +47,7 @@ post-extract: cp -r ${WRKDIR}/${XORG_SERVER_FILE}/* ${WRKSRC}/unix/xserver post-patch: - cd ${WRKSRC}/unix/xserver && ${PATCH} --batch -p1 <../xserver118.patch + cd ${WRKSRC}/unix/xserver && ${PATCH} --batch -p1 <../xserver117.patch XORG_CONFIGURE_ARGS+= --prefix=${PREFIX} --mandir=${PREFIX}/${PKGMANDIR} XORG_CONFIGURE_ARGS+= --disable-xwayland --disable-kdrive --disable-xephyr Index: pkgsrc/net/tigervnc/distinfo diff -u pkgsrc/net/tigervnc/distinfo:1.9 pkgsrc/net/tigervnc/distinfo:1.10 --- pkgsrc/net/tigervnc/distinfo:1.9 Mon Sep 19 09:37:06 2016 +++ pkgsrc/net/tigervnc/distinfo Tue Sep 20 08:12:14 2016 @@ -1,17 +1,17 @@ -$NetBSD: distinfo,v 1.9 2016/09/19 09:37:06 wiz Exp $ +$NetBSD: distinfo,v 1.10 2016/09/20 08:12:14 wiz Exp $ SHA1 (tigervnc-1.7.0.tar.gz) = cd152c1b633fcb13e7e6479583195d57462ea227 RMD160 (tigervnc-1.7.0.tar.gz) = 0f5e8a9caa7d10f4cbe8f736fbb3999c24f3527b SHA512 (tigervnc-1.7.0.tar.gz) = 2e673603065ef5cef33fd0e1ab916f5758d29e75ab5fdb18d1cbfacc61f59b85a00c64699d09a91e81de51ccf4006921516d5ea863319bd557fbd378c17ba004 Size (tigervnc-1.7.0.tar.gz) = 1405952 bytes -SHA1 (xorg-server-1.18.4.tar.bz2) = ff088ee29dee46a2d68925c8df3f0515ef15ec52 -RMD160 (xorg-server-1.18.4.tar.bz2) = 6f58d84d3bbc59a773e6a2e1eafc208827a5923f -SHA512 (xorg-server-1.18.4.tar.bz2) = 2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b -Size (xorg-server-1.18.4.tar.bz2) = 6009508 bytes +SHA1 (xorg-server-1.17.2.tar.bz2) = 56ac29a82b99bcf4c7ba2fca41a44cfa18748262 +RMD160 (xorg-server-1.17.2.tar.bz2) = bf575a269f1e7b729992a20989be84e09fcc88a2 +SHA512 (xorg-server-1.17.2.tar.bz2) = 7e7b7620890cc8db696695758fa22fa879f9d3c33946663611ec0b37f02116e9c6f08779f9eece59907b430d3df93f0c0548939683ea156b3c4cbe02571b7551 +Size (xorg-server-1.17.2.tar.bz2) = 5767983 bytes SHA1 (patch-CMakeLists.txt) = 42a364f898784a9c4da46bea8ef6bc37838815b9 SHA1 (patch-media_CMakeLists.txt) = cd50f9b7a9405aa523412ef823a32437a3c19ffa SHA1 (patch-unix_vncserver) = 9c71ad02c6657f537bcb2abaa116a831b555d7c0 -SHA1 (patch-unix_xserver118.patch) = 83eba1c87bf8a9f40708eb1856c8ac3c66d44cc5 +SHA1 (patch-unix_xserver117.patch) = 5894ec9008a0ee9cae79b49af69e91f8bbdfb676 SHA1 (patch-unix_xserver_hw_vnc_InputXKB.cc) = 58dfddf27233b534bbb0e05edd4db3392a8a38df SHA1 (patch-unix_xserver_hw_vnc_Makefile.am) = d2d61050cdc5a54b46a2c41cd8ea394fa0b1a574 SHA1 (patch-unix_xserver_hw_vnc_vncModule.c) = 6f6868032bc9d0b45231f73e719464a0de118fb7 Added files: Index: pkgsrc/net/tigervnc/patches/patch-unix_xserver117.patch diff -u /dev/null pkgsrc/net/tigervnc/patches/patch-unix_xserver117.patch:1.4 --- /dev/null Tue Sep 20 08:12:14 2016 +++ pkgsrc/net/tigervnc/patches/patch-unix_xserver117.patch Tue Sep 20 08:12:14 2016 @@ -0,0 +1,81 @@ +$NetBSD: patch-unix_xserver117.patch,v 1.4 2016/09/20 08:12:14 wiz Exp $ + +--- unix/xserver117.patch.orig 2015-07-11 13:00:36.000000000 +0000 ++++ unix/xserver117.patch +@@ -66,7 +66,7 @@ diff -up xorg-server-1.17.1/mi/miinitext + #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 +@@ -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 +++ ++ #ifdef HAVE_DIX_CONFIG_H ++ #include ++ #endif ++@@ -66,7 +68,6 @@ ++ #include "misc.h" ++ ++ #include "osdep.h" ++-#include ++ #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 +++ ++ #ifdef HAVE_DIX_CONFIG_H ++ #include ++ #endif ++@@ -103,7 +105,6 @@ ++ #endif /* WIN32 */ ++ #include "misc.h" /* for typedef of pointer */ ++ #include "osdep.h" ++-#include ++ #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 +++ ++ #ifdef HAVE_DIX_CONFIG_H ++ #include ++ #endif ++@@ -74,7 +76,6 @@ ++ #include ++ #include "os.h" ++ #include "osdep.h" ++-#include ++ #include "opaque.h" ++ #include "dixstruct.h" ++ #include "misc.h" --_----------=_147435913446150--