From dfef6dd6e99001b869806f1b2e045a2404b3601e Mon Sep 17 00:00:00 2001
From: christos <christos@pkgsrc.org>
Date: Wed, 18 Apr 2018 20:48:19 +0000
Subject: upgrade to latest and fix for gcc-6

---
 net/vncviewer/Makefile                      |  8 ++++----
 net/vncviewer/distinfo                      | 11 ++++++-----
 net/vncviewer/patches/patch-tx_TXWindow.cxx | 18 ++++++++++++++++++
 3 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 net/vncviewer/patches/patch-tx_TXWindow.cxx

(limited to 'net')

diff --git a/net/vncviewer/Makefile b/net/vncviewer/Makefile
index 1f93e94d2b6..099b6e07333 100644
--- a/net/vncviewer/Makefile
+++ b/net/vncviewer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2018/03/07 11:57:31 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2018/04/18 20:48:19 christos Exp $
 
-DISTNAME=		vnc-4_1_2-unixsrc
-PKGNAME=		vncviewer-4.1.2
-PKGREVISION=		3
+DISTNAME=		vnc-4_1_3-unixsrc
+PKGNAME=		vncviewer-4.1.3
+#PKGREVISION=		3
 CATEGORIES=		net x11
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
diff --git a/net/vncviewer/distinfo b/net/vncviewer/distinfo
index 91533912618..9c295efaf88 100644
--- a/net/vncviewer/distinfo
+++ b/net/vncviewer/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.13 2015/11/04 00:35:43 agc Exp $
+$NetBSD: distinfo,v 1.14 2018/04/18 20:48:19 christos Exp $
 
-SHA1 (vnc-4_1_2-unixsrc.tar.gz) = 9d8d8d93f4120b2e60c0ec0fce7e81ea302614e7
-RMD160 (vnc-4_1_2-unixsrc.tar.gz) = 2a2d615825e6ac74aca5f0c29d025e576b725dc3
-SHA512 (vnc-4_1_2-unixsrc.tar.gz) = 110ed71320d8b8224380b076c8041acaf13a06a33e0842763e3d9ec5599d8bb8d75b19c488c2a8fddf8cb2a4f5f53acc9111c97f07cbcb14a4f6a55b86e51555
-Size (vnc-4_1_2-unixsrc.tar.gz) = 537713 bytes
+SHA1 (vnc-4_1_3-unixsrc.tar.gz) = fd4ebf2bf8945b5a419ab69059a98fe3bc6698ef
+RMD160 (vnc-4_1_3-unixsrc.tar.gz) = 9ef5a3b6f13d1227e5b9399c4d56884639cf9686
+SHA512 (vnc-4_1_3-unixsrc.tar.gz) = 3fdc91c1054a7a8767f3f0d007e28d973699f8cb1d2f628389e8735f6eabee612f750fc722f80a296c03af17aad10ebb1cf1cab4d6f0795b3d567656e41c78a0
+Size (vnc-4_1_3-unixsrc.tar.gz) = 550870 bytes
 SHA1 (patch-aa) = a05aba67ef7a1fd61307d0e31d9fd90b9219b106
 SHA1 (patch-ab) = dc0c2db92e8d9c09b45bc82b2a61c316ba69cda5
 SHA1 (patch-ac) = 2e59341580ab98c1b245201c5a2b26df1cfa4c0b
 SHA1 (patch-common_network_TcpSocket.cxx) = 334e4101c2869c0bc2ed5e519c3d3407050adb75
 SHA1 (patch-tx_TXImage.cxx) = 7e4068e2a0b4e9c9dde18b25317d05d09bc45431
+SHA1 (patch-tx_TXWindow.cxx) = 52c220c5613a6d104f3f7992e09749655c1d8a8e
 SHA1 (patch-x0vncserver_Image.cxx) = e5e321e1a6c3d09e390bcc4ed20859fae492ff86
diff --git a/net/vncviewer/patches/patch-tx_TXWindow.cxx b/net/vncviewer/patches/patch-tx_TXWindow.cxx
new file mode 100644
index 00000000000..b8e63d163c3
--- /dev/null
+++ b/net/vncviewer/patches/patch-tx_TXWindow.cxx
@@ -0,0 +1,18 @@
+$NetBSD: patch-tx_TXWindow.cxx,v 1.1 2018/04/18 20:48:19 christos Exp $
+
+Handle gcc widening warnings
+
+--- tx/TXWindow.cxx.orig	2006-05-15 12:56:20.000000000 -0400
++++ tx/TXWindow.cxx	2018-04-18 16:43:55.686069773 -0400
+@@ -90,8 +90,9 @@
+   static char dotBits[] = { 0x06, 0x0f, 0x0f, 0x06};
+   dot = XCreateBitmapFromData(dpy, DefaultRootWindow(dpy), dotBits,
+                               dotSize, dotSize);
+-  static char tickBits[] = { 0x80, 0xc0, 0xe2, 0x76, 0x3e, 0x1c, 0x08, 0x00};
+-  tick = XCreateBitmapFromData(dpy, DefaultRootWindow(dpy), tickBits,
++  static unsigned char tickBits[] = {
++      0x80, 0xc0, 0xe2, 0x76, 0x3e, 0x1c, 0x08, 0x00};
++  tick = XCreateBitmapFromData(dpy, DefaultRootWindow(dpy), (char *)tickBits,
+                                tickSize, tickSize);
+   defaultWindowClass = rfb::strDup(defaultWindowClass_);
+ }
-- 
cgit v1.2.3