CVS commit: pkgsrc/net/tigervnc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Apr 17 11:37:24 UTC 2020

Modified Files:
        pkgsrc/net/tigervnc: Makefile PLIST distinfo
Added Files:
        pkgsrc/net/tigervnc/patches: patch-unix_xserver117.patch

Log Message:
tigervnc: downgrade to 1.9

1.10 is much too unstable for me.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/net/tigervnc/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/tigervnc/PLIST
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/tigervnc/distinfo
cvs rdiff -u -r0 -r1.7 \
    pkgsrc/net/tigervnc/patches/patch-unix_xserver117.patch

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/tigervnc/Makefile
diff -u pkgsrc/net/tigervnc/Makefile:1.32 pkgsrc/net/tigervnc/Makefile:1.33
--- pkgsrc/net/tigervnc/Makefile:1.32   Sun Mar 15 11:54:12 2020
+++ pkgsrc/net/tigervnc/Makefile        Fri Apr 17 11:37:24 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2020/03/15 11:54:12 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2020/04/17 11:37:24 wiz Exp $
 
-DISTNAME=              tigervnc-1.10.1
-PKGREVISION=           2
+DISTNAME=              tigervnc-1.9.0
+PKGREVISION=           4
 CATEGORIES=            net
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=TigerVNC/}
 GITHUB_TAG=            v${PKGVERSION_NOREV}

Index: pkgsrc/net/tigervnc/PLIST
diff -u pkgsrc/net/tigervnc/PLIST:1.6 pkgsrc/net/tigervnc/PLIST:1.7
--- pkgsrc/net/tigervnc/PLIST:1.6       Fri Mar 13 10:18:43 2020
+++ pkgsrc/net/tigervnc/PLIST   Fri Apr 17 11:37:24 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2020/03/13 10:18:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2020/04/17 11:37:24 wiz Exp $
 bin/Xvnc
 bin/vncconfig
 bin/vncpasswd
@@ -34,7 +34,6 @@ share/locale/fur/LC_MESSAGES/tigervnc.mo
 share/locale/hu/LC_MESSAGES/tigervnc.mo
 share/locale/id/LC_MESSAGES/tigervnc.mo
 share/locale/it/LC_MESSAGES/tigervnc.mo
-share/locale/ko/LC_MESSAGES/tigervnc.mo
 share/locale/nl/LC_MESSAGES/tigervnc.mo
 share/locale/pl/LC_MESSAGES/tigervnc.mo
 share/locale/pt_BR/LC_MESSAGES/tigervnc.mo
@@ -46,4 +45,3 @@ share/locale/tr/LC_MESSAGES/tigervnc.mo
 share/locale/uk/LC_MESSAGES/tigervnc.mo
 share/locale/vi/LC_MESSAGES/tigervnc.mo
 share/locale/zh_CN/LC_MESSAGES/tigervnc.mo
-share/locale/zh_TW/LC_MESSAGES/tigervnc.mo

Index: pkgsrc/net/tigervnc/distinfo
diff -u pkgsrc/net/tigervnc/distinfo:1.16 pkgsrc/net/tigervnc/distinfo:1.17
--- pkgsrc/net/tigervnc/distinfo:1.16   Sun Mar 15 11:54:12 2020
+++ pkgsrc/net/tigervnc/distinfo        Fri Apr 17 11:37:24 2020
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.16 2020/03/15 11:54:12 wiz Exp $
+$NetBSD: distinfo,v 1.17 2020/04/17 11:37:24 wiz Exp $
 
-SHA1 (tigervnc-1.10.1.tar.gz) = 34efc6e2e67be672dca38c10ce064bcb08adee9f
-RMD160 (tigervnc-1.10.1.tar.gz) = 42e17e14d2780e1d6bc2c7a4f89145e50f630706
-SHA512 (tigervnc-1.10.1.tar.gz) = 3486ff772d39217feb8c075860cae58e1021bdb8095443d8b5c383929cc6c622b57ea61c31d06ff0bd48c7e6889db4b6a99d0742bdd60edf323fb2a3ad328705
-Size (tigervnc-1.10.1.tar.gz) = 1408105 bytes
+SHA1 (tigervnc-1.9.0.tar.gz) = c56656c596fb863bb2c4b67fb62b4165011d181f
+RMD160 (tigervnc-1.9.0.tar.gz) = 990e872addf459432584c176b3565504e994899e
+SHA512 (tigervnc-1.9.0.tar.gz) = 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
+Size (tigervnc-1.9.0.tar.gz) = 1506520 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
@@ -11,5 +11,6 @@ Size (xorg-server-1.17.2.tar.bz2) = 5767
 SHA1 (patch-CMakeLists.txt) = 42a364f898784a9c4da46bea8ef6bc37838815b9
 SHA1 (patch-media_CMakeLists.txt) = cd50f9b7a9405aa523412ef823a32437a3c19ffa
 SHA1 (patch-unix_vncserver) = 9c71ad02c6657f537bcb2abaa116a831b555d7c0
+SHA1 (patch-unix_xserver117.patch) = 5e5d2a98f0b765ae0d6bb5f200808126b03dcc51
 SHA1 (patch-unix_xserver_hw_vnc_Makefile.am) = 29b33e6d94a070bb0a55a264cd1c4e120c9b1b3c
 SHA1 (patch-unix_xserver_hw_vnc_vncModule.c) = 77aff6c2bb19e6936302c783b72d581e7d6388f5

Added files:

Index: pkgsrc/net/tigervnc/patches/patch-unix_xserver117.patch
diff -u /dev/null pkgsrc/net/tigervnc/patches/patch-unix_xserver117.patch:1.7
--- /dev/null   Fri Apr 17 11:37:24 2020
+++ pkgsrc/net/tigervnc/patches/patch-unix_xserver117.patch     Fri Apr 17 11:37:24 2020
@@ -0,0 +1,72 @@
+$NetBSD: patch-unix_xserver117.patch,v 1.7 2020/04/17 11:37:24 wiz 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"