fix for gcc 6

5 files changed, 155 insertions, 3 deletions

diff --git a/x11/efltk/Makefile b/x11/efltk/Makefile
index 7579872bce6..cd83457cb8a 100644
--- a/x11/efltk/Makefile
+++ b/x11/efltk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2018/03/12 11:15:49 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2018/04/20 01:36:00 christos Exp $
 #
 
 DISTNAME=	efltk-2.0.5
-PKGREVISION=	21
+PKGREVISION=	22
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ede/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/efltk/distinfo b/x11/efltk/distinfo
index 9190f143ea6..a2ac7533e73 100644
--- a/x11/efltk/distinfo
+++ b/x11/efltk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2016/12/21 13:40:24 joerg Exp $
+$NetBSD: distinfo,v 1.15 2018/04/20 01:36:00 christos Exp $
 
 SHA1 (efltk-2.0.5.tar.bz2) = 26f7124b384d0bfe3d28a73cbdf0111432b08d99
 RMD160 (efltk-2.0.5.tar.bz2) = 7efa711d0df8a01ee402e1866286265d294778e8
@@ -19,8 +19,11 @@ SHA1 (patch-efltk_Fl__Text__Buffer.h) = 16eb6b48d0f06ac0f2074a0b61a782db7757663e
 SHA1 (patch-efltk_Fl__Widget_h) = a35acb6f3af14bd2fabbe1c67b92e80fe561a366
 SHA1 (patch-efltk_Fl__Window.h) = b97f04435b88e05ec4f642b0615575cf8d279dd7
 SHA1 (patch-efltk_db_Fl__Params_h) = 9bb8574d1558f6ca753e0d9845b6fdaebeac38b4
+SHA1 (patch-src_core_Fl__Boxtype.cpp) = 3b5cabf9bef56a7da453e0d8c35175b734f3132d
 SHA1 (patch-src_core_filename_list.cpp) = 5c4bc4cac3c0d440b493e4da365a925bdf6a49e7
 SHA1 (patch-src_core_fl__draw__pixmap_cpp) = cd31ac6d730b257bb3e76c9525ad92f9ea0fa3aa
+SHA1 (patch-src_core_headers_dingbats__.h) = 95e2e0d37a932631baed7d367f126035562ad60f
+SHA1 (patch-src_core_headers_symbol__.h) = b7587560f17cfbc687ebf9bd4c493d1a5efd42da
 SHA1 (patch-src_images_Fl__Png.cpp) = 0c2d3bf30a5542274048784aaf32256cc5466dea
 SHA1 (patch-src_widgets_Fl__Calendar_cpp) = fb44e30fbed6a48ccd0d07348440df503a7e945e
 SHA1 (patch-src_widgets_Fl__Input_cpp) = d1f30bf63ef2000a6b676d5a6205d93ddf1347f3
diff --git a/x11/efltk/patches/patch-src_core_Fl__Boxtype.cpp b/x11/efltk/patches/patch-src_core_Fl__Boxtype.cpp
new file mode 100644
index 00000000000..f34354e3d8d
--- /dev/null
+++ b/x11/efltk/patches/patch-src_core_Fl__Boxtype.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_core_Fl__Boxtype.cpp,v 1.1 2018/04/20 01:36:00 christos Exp $
+
+Avoid gcc-6 narrowing warnings
+
+--- src/core/Fl_Boxtype.cpp.orig	2003-04-24 09:58:36.000000000 -0400
++++ src/core/Fl_Boxtype.cpp	2018-04-19 21:28:39.973007945 -0400
+@@ -49,14 +49,14 @@
+ #ifndef _WIN32
+     // X version uses stipple pattern because there seem to be too many
+     // servers with bugs when drawing dotted lines:
+-    static const char pattern[] = {0xAA,0x55,0xAA,0x55,0xAA,0x55,0xAA,0x55,0xAA};
++    static const unsigned char pattern[] = {0xAA,0x55,0xAA,0x55,0xAA,0x55,0xAA,0x55,0xAA};
+     static Pixmap evenstipple, oddstipple;
+     if (!evenstipple)
+     {
+ 		// Init stipple bitmaps
+         Window root = RootWindow(fl_display, fl_screen);
+-        evenstipple = XCreateBitmapFromData(fl_display, root, pattern, 8, 8);
+-        oddstipple  = XCreateBitmapFromData(fl_display, root, pattern+1, 8, 8);
++        evenstipple = XCreateBitmapFromData(fl_display, root, (const char *)pattern, 8, 8);
++        oddstipple  = XCreateBitmapFromData(fl_display, root, (const char *)pattern+1, 8, 8);
+     }
+     int xx = x; int yy = y; fl_transform(xx,yy);
+     XSetStipple(fl_display, fl_gc, (xx+yy-x-y)&1 ? oddstipple : evenstipple);
diff --git a/x11/efltk/patches/patch-src_core_headers_dingbats__.h b/x11/efltk/patches/patch-src_core_headers_dingbats__.h
new file mode 100644
index 00000000000..8e11bc0526b
--- /dev/null
+++ b/x11/efltk/patches/patch-src_core_headers_dingbats__.h
@@ -0,0 +1,58 @@
+$NetBSD: patch-src_core_headers_dingbats__.h,v 1.1 2018/04/20 01:36:00 christos Exp $
+
+Avoid gcc-6 narrowing warnings
+
+--- src/core/headers/dingbats_.h.orig	2003-01-01 21:37:15.000000000 -0500
++++ src/core/headers/dingbats_.h	2018-04-19 21:26:44.519960223 -0400
+@@ -1,6 +1,6 @@
+ /* dingbats */
+ 
+-static const char unicode_to_dingbats_1b_0020[] = {
++static const unsigned char unicode_to_dingbats_1b_0020[] = {
+ /* U+0020 */ 0x20,
+ 0x00,
+ 0x00,
+@@ -132,14 +132,14 @@
+ /* U+00A0 */ 0x20,
+ };
+ 
+-static const char unicode_to_dingbats_1b_2192[] = {
++static const unsigned char unicode_to_dingbats_1b_2192[] = {
+ /* U+2192 */ 0xD5,
+ 0x00,
+ /* U+2194 */ 0xD6,
+ /* U+2195 */ 0xD7,
+ };
+ 
+-static const char unicode_to_dingbats_1b_2460[] = {
++static const unsigned char unicode_to_dingbats_1b_2460[] = {
+ /* U+2460 */ 0xAC,
+ /* U+2461 */ 0xAD,
+ /* U+2462 */ 0xAE,
+@@ -152,7 +152,7 @@
+ /* U+2469 */ 0xB5,
+ };
+ 
+-static const char unicode_to_dingbats_1b_25A0[] = {
++static const unsigned char unicode_to_dingbats_1b_25A0[] = {
+ /* U+25A0 */ 0x6E,
+ 0x00,
+ 0x00,
+@@ -354,7 +354,7 @@
+ /* U+2666 */ 0xA9,
+ };
+ 
+-static const char unicode_to_dingbats_1b_2701[] = {
++static const unsigned char unicode_to_dingbats_1b_2701[] = {
+ /* U+2701 */ 0x21,
+ /* U+2702 */ 0x22,
+ /* U+2703 */ 0x23,
+@@ -547,7 +547,7 @@
+ /* U+27BE */ 0xFE,
+ };
+ 
+-static const char unicode_to_dingbats_1b_F8D7[] = {
++static const unsigned char unicode_to_dingbats_1b_F8D7[] = {
+ /* U+F8D7 */ 0x80,
+ /* U+F8D8 */ 0x81,
+ /* U+F8D9 */ 0x82,
diff --git a/x11/efltk/patches/patch-src_core_headers_symbol__.h b/x11/efltk/patches/patch-src_core_headers_symbol__.h
new file mode 100644
index 00000000000..e716caf8aac
--- /dev/null
+++ b/x11/efltk/patches/patch-src_core_headers_symbol__.h
@@ -0,0 +1,67 @@
+$NetBSD: patch-src_core_headers_symbol__.h,v 1.1 2018/04/20 01:36:00 christos Exp $
+
+Avoid gcc-6 narrowing warnings
+
+--- src/core/headers/symbol_.h.orig	2003-01-01 21:37:15.000000000 -0500
++++ src/core/headers/symbol_.h	2018-04-19 21:27:17.409980104 -0400
+@@ -1,6 +1,6 @@
+ /* symbol */
+ 
+-static const char unicode_to_symbol_1b_0020[] = {
++static const unsigned char unicode_to_symbol_1b_0020[] = {
+ /* U+0020 */ 0x20,
+ /* U+0021 */ 0x21,
+ 0x00,
+@@ -219,11 +219,11 @@
+ /* U+00F7 */ 0xB8,
+ };
+ 
+-static const char unicode_to_symbol_1b_0192[] = {
++static const unsigned char unicode_to_symbol_1b_0192[] = {
+ /* U+0192 */ 0xA6,
+ };
+ 
+-static const char unicode_to_symbol_1b_0391[] = {
++static const unsigned char unicode_to_symbol_1b_0391[] = {
+ /* U+0391 */ 0x41,
+ /* U+0392 */ 0x42,
+ /* U+0393 */ 0x47,
+@@ -296,7 +296,7 @@
+ /* U+03D6 */ 0x76,
+ };
+ 
+-static const char unicode_to_symbol_1b_2022[] = {
++static const unsigned char unicode_to_symbol_1b_2022[] = {
+ /* U+2022 */ 0xB7,
+ 0x00,
+ 0x00,
+@@ -1076,11 +1076,11 @@
+ /* U+232A */ 0xF1,
+ };
+ 
+-static const char unicode_to_symbol_1b_25CA[] = {
++static const unsigned char unicode_to_symbol_1b_25CA[] = {
+ /* U+25CA */ 0xE0,
+ };
+ 
+-static const char unicode_to_symbol_1b_2660[] = {
++static const unsigned char unicode_to_symbol_1b_2660[] = {
+ /* U+2660 */ 0xAA,
+ 0x00,
+ 0x00,
+@@ -1090,13 +1090,13 @@
+ /* U+2666 */ 0xA8,
+ };
+ 
+-static const char unicode_to_symbol_1b_F6D9[] = {
++static const unsigned char unicode_to_symbol_1b_F6D9[] = {
+ /* U+F6D9 */ 0xD3,
+ /* U+F6DA */ 0xD2,
+ /* U+F6DB */ 0xD4,
+ };
+ 
+-static const char unicode_to_symbol_1b_F8E5[] = {
++static const unsigned char unicode_to_symbol_1b_F8E5[] = {
+ /* U+F8E5 */ 0x60,
+ /* U+F8E6 */ 0xBD,
+ /* U+F8E7 */ 0xBE,