Sun Jan 17 15:18:04 2016 UTC ()
Avoid macro that no longer exists in modular Xorg.


(joerg)
diff -r1.4 -r1.5 pkgsrc/net/tigervnc/distinfo
diff -r1.1 -r1.2 pkgsrc/net/tigervnc/patches/patch-unix_xserver117.patch
cvs diff -r1.4 -r1.5 pkgsrc/net/tigervnc/distinfo (expand / switch to unified diff)

--- pkgsrc/net/tigervnc/distinfo 2015/11/04 00:35:40 1.4
+++ pkgsrc/net/tigervnc/distinfo 2016/01/17 15:18:04 1.5
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1$NetBSD: distinfo,v 1.4 2015/11/04 00:35:40 agc Exp $ 1$NetBSD: distinfo,v 1.5 2016/01/17 15:18:04 joerg Exp $
2 2
3SHA1 (tigervnc-1.5.0.tar.gz) = e03e618c06153b83d1fec756cd817885c371cd0b 3SHA1 (tigervnc-1.5.0.tar.gz) = e03e618c06153b83d1fec756cd817885c371cd0b
4RMD160 (tigervnc-1.5.0.tar.gz) = 57240c4a5db8c0d013dbc12322e48901f5750d90 4RMD160 (tigervnc-1.5.0.tar.gz) = 57240c4a5db8c0d013dbc12322e48901f5750d90
5SHA512 (tigervnc-1.5.0.tar.gz) = 6db7268552d9b7784acb14a2e37b9a1f1a710cc3e55fb4c385dd47ef8767adce6ce032c42c56cbc6180fe444d272e851763db0eb1b0ebd6732132208ef6274f2 5SHA512 (tigervnc-1.5.0.tar.gz) = 6db7268552d9b7784acb14a2e37b9a1f1a710cc3e55fb4c385dd47ef8767adce6ce032c42c56cbc6180fe444d272e851763db0eb1b0ebd6732132208ef6274f2
6Size (tigervnc-1.5.0.tar.gz) = 1268682 bytes 6Size (tigervnc-1.5.0.tar.gz) = 1268682 bytes
7SHA1 (xorg-server-1.17.2.tar.bz2) = 56ac29a82b99bcf4c7ba2fca41a44cfa18748262 7SHA1 (xorg-server-1.17.2.tar.bz2) = 56ac29a82b99bcf4c7ba2fca41a44cfa18748262
8RMD160 (xorg-server-1.17.2.tar.bz2) = bf575a269f1e7b729992a20989be84e09fcc88a2 8RMD160 (xorg-server-1.17.2.tar.bz2) = bf575a269f1e7b729992a20989be84e09fcc88a2
9SHA512 (xorg-server-1.17.2.tar.bz2) = 7e7b7620890cc8db696695758fa22fa879f9d3c33946663611ec0b37f02116e9c6f08779f9eece59907b430d3df93f0c0548939683ea156b3c4cbe02571b7551 9SHA512 (xorg-server-1.17.2.tar.bz2) = 7e7b7620890cc8db696695758fa22fa879f9d3c33946663611ec0b37f02116e9c6f08779f9eece59907b430d3df93f0c0548939683ea156b3c4cbe02571b7551
10Size (xorg-server-1.17.2.tar.bz2) = 5767983 bytes 10Size (xorg-server-1.17.2.tar.bz2) = 5767983 bytes
11SHA1 (patch-CMakeLists.txt) = 8528782142ef7bc95151f8a130bc8626ad9ee93c 11SHA1 (patch-CMakeLists.txt) = 8528782142ef7bc95151f8a130bc8626ad9ee93c
12SHA1 (patch-common_CMakeLists.txt) = d879e36df9db9978adaa5545758f43097d40f10a 12SHA1 (patch-common_CMakeLists.txt) = d879e36df9db9978adaa5545758f43097d40f10a
13SHA1 (patch-media_CMakeLists.txt) = cd50f9b7a9405aa523412ef823a32437a3c19ffa 13SHA1 (patch-media_CMakeLists.txt) = cd50f9b7a9405aa523412ef823a32437a3c19ffa
14SHA1 (patch-unix_vncserver) = 8baacca2d1083f330781caff7da2ac996af91aa4 14SHA1 (patch-unix_vncserver) = 8baacca2d1083f330781caff7da2ac996af91aa4
15SHA1 (patch-unix_xserver117.patch) = 5e5d2a98f0b765ae0d6bb5f200808126b03dcc51 15SHA1 (patch-unix_xserver117.patch) = 5894ec9008a0ee9cae79b49af69e91f8bbdfb676
16SHA1 (patch-unix_xserver_hw_vnc_InputXKB.cc) = 58dfddf27233b534bbb0e05edd4db3392a8a38df 16SHA1 (patch-unix_xserver_hw_vnc_InputXKB.cc) = 58dfddf27233b534bbb0e05edd4db3392a8a38df
17SHA1 (patch-unix_xserver_hw_vnc_Makefile.am) = d2d61050cdc5a54b46a2c41cd8ea394fa0b1a574 17SHA1 (patch-unix_xserver_hw_vnc_Makefile.am) = d2d61050cdc5a54b46a2c41cd8ea394fa0b1a574
 18SHA1 (patch-unix_xserver_hw_vnc_vncModule.c) = 6f6868032bc9d0b45231f73e719464a0de118fb7
cvs diff -r1.1 -r1.2 pkgsrc/net/tigervnc/patches/Attic/patch-unix_xserver117.patch (expand / switch to unified diff)

--- pkgsrc/net/tigervnc/patches/Attic/patch-unix_xserver117.patch 2015/07/21 21:51:39 1.1
+++ pkgsrc/net/tigervnc/patches/Attic/patch-unix_xserver117.patch 2016/01/17 15:18:04 1.2
@@ -1,17 +1,26 @@ @@ -1,17 +1,26 @@
1$NetBSD: patch-unix_xserver117.patch,v 1.1 2015/07/21 21:51:39 markd Exp $ 1$NetBSD: patch-unix_xserver117.patch,v 1.2 2016/01/17 15:18:04 joerg Exp $
2 2
3--- unix/xserver117.patch.orig 2015-07-11 13:00:36.000000000 +0000 3--- unix/xserver117.patch.orig 2015-07-11 13:00:36.000000000 +0000
4+++ unix/xserver117.patch 4+++ unix/xserver117.patch
 5@@ -66,7 +66,7 @@ diff -up xorg-server-1.17.1/mi/miinitext
 6 #include "globals.h"
 7
 8 +#ifdef TIGERVNC
 9-+extern void vncExtensionInit(INITARGS);
 10++extern void vncExtensionInit(void);
 11 +#endif
 12 +
 13 /* The following is only a small first step towards run-time
5@@ -85,7 +85,24 @@ diff -up xorg-server-1.17.1/mi/miinitext 14@@ -85,7 +85,24 @@ diff -up xorg-server-1.17.1/mi/miinitext
6 diff -up xorg-server-1.17.1/os/WaitFor.c.vnc xorg-server-1.17.1/os/WaitFor.c 15 diff -up xorg-server-1.17.1/os/WaitFor.c.vnc xorg-server-1.17.1/os/WaitFor.c
7 --- xorg-server-1.17.1/os/WaitFor.c.vnc 2015-01-26 18:40:30.000000000 +0000 16 --- xorg-server-1.17.1/os/WaitFor.c.vnc 2015-01-26 18:40:30.000000000 +0000
8 +++ xorg-server-1.17.1/os/WaitFor.c 2015-02-13 16:14:05.132516837 +0000 17 +++ xorg-server-1.17.1/os/WaitFor.c 2015-02-13 16:14:05.132516837 +0000
9-@@ -125,6 +125,9 @@ static void DoTimer(OsTimerPtr timer, CA 18-@@ -125,6 +125,9 @@ static void DoTimer(OsTimerPtr timer, CA
10+@@ -52,6 +52,8 @@ 19+@@ -52,6 +52,8 @@
11+ * 20+ *
12+ *****************************************************************/ 21+ *****************************************************************/
13+  22+
14++#include <X11/Xpoll.h> 23++#include <X11/Xpoll.h>
15++ 24++
16+ #ifdef HAVE_DIX_CONFIG_H 25+ #ifdef HAVE_DIX_CONFIG_H
17+ #include <dix-config.h> 26+ #include <dix-config.h>