[pkgsrc/trunk]: pkgsrc/x11/wxGTK28 wxGTK28: Backport narrowing conversion fix...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7cb098753a6d
branches:  trunk
changeset: 374802:7cb098753a6d
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Mon Jan 29 15:12:54 2018 +0000

description:
wxGTK28: Backport narrowing conversion fixes from wxGTK30.

diffstat:

 x11/wxGTK28/distinfo                           |  10 +++++++++-
 x11/wxGTK28/patches/patch-include_wx_wxchar.h  |  14 ++++++++++++++
 x11/wxGTK28/patches/patch-src_gtk_bdiag.xbm    |  14 ++++++++++++++
 x11/wxGTK28/patches/patch-src_gtk_cdiag.xbm    |  14 ++++++++++++++
 x11/wxGTK28/patches/patch-src_gtk_cross.xbm    |  14 ++++++++++++++
 x11/wxGTK28/patches/patch-src_gtk_dcclient.cpp |  25 +++++++++++++++++++++++++
 x11/wxGTK28/patches/patch-src_gtk_fdiag.xbm    |  14 ++++++++++++++
 x11/wxGTK28/patches/patch-src_gtk_horiz.xbm    |  14 ++++++++++++++
 x11/wxGTK28/patches/patch-src_gtk_verti.xbm    |  14 ++++++++++++++
 9 files changed, 132 insertions(+), 1 deletions(-)

diffs (177 lines):

diff -r f997e41d3b44 -r 7cb098753a6d x11/wxGTK28/distinfo
--- a/x11/wxGTK28/distinfo      Mon Jan 29 15:00:48 2018 +0000
+++ b/x11/wxGTK28/distinfo      Mon Jan 29 15:12:54 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2017/06/14 13:21:52 jperkin Exp $
+$NetBSD: distinfo,v 1.21 2018/01/29 15:12:54 jperkin Exp $
 
 SHA1 (wxGTK-2.8.12-libtool.diff.bz2) = f2c9b8a06c08101325ffe09ad77f4800f7aa8730
 RMD160 (wxGTK-2.8.12-libtool.diff.bz2) = 05b763aa44a8e8c8ad565af2a188d7c6437f2133
@@ -13,4 +13,12 @@
 SHA1 (patch-ac) = 50cf253797f2dee8b9dab08d138d0070e25e7a8c
 SHA1 (patch-include_wx_convauto.h) = 11f635fa13995daf9815d6e84e936f39206e927a
 SHA1 (patch-include_wx_debug.h) = bc25a486361194d8d70c69bcd833e085fbcbdec3
+SHA1 (patch-include_wx_wxchar.h) = 6ea42fb4dc3745b424d4aee1099628d896605e8c
 SHA1 (patch-setup.h.in) = 4f798bd013dc008644e3f86be89ecb8bf13aef1d
+SHA1 (patch-src_gtk_bdiag.xbm) = 652b15e01a26d06af331d4f8c5dc961fdfdafd64
+SHA1 (patch-src_gtk_cdiag.xbm) = d109106885ab8df5619aafbecf73403d0a5b5d41
+SHA1 (patch-src_gtk_cross.xbm) = 6b23a262e629a1beb751e73ad2e776e8410dd3d5
+SHA1 (patch-src_gtk_dcclient.cpp) = 23d377facda6a1d160f377ac515f175c1cffa570
+SHA1 (patch-src_gtk_fdiag.xbm) = e18acdd76dd6864e5cfcf15b650228e101ec35f9
+SHA1 (patch-src_gtk_horiz.xbm) = e28fe772e50315efb90f09898373906ac557892e
+SHA1 (patch-src_gtk_verti.xbm) = 99fab07759349dfd0f992c8825071b29ca380a49
diff -r f997e41d3b44 -r 7cb098753a6d x11/wxGTK28/patches/patch-include_wx_wxchar.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/wxGTK28/patches/patch-include_wx_wxchar.h     Mon Jan 29 15:12:54 2018 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-include_wx_wxchar.h,v 1.1 2018/01/29 15:12:54 jperkin Exp $
+
+Don't forward declare struct tm.
+
+--- include/wx/wxchar.h.orig   2011-03-22 12:16:51.000000000 +0000
++++ include/wx/wxchar.h
+@@ -1276,7 +1276,6 @@ WXDLLIMPEXP_BASE int      wxSystem(const
+     #include <time.h>
+ #endif
+     /*silent gabby compilers*/
+-    struct tm;
+     WXDLLIMPEXP_BASE size_t wxStrftime(wxChar *s, size_t max,
+                                   const wxChar *fmt, const struct tm *tm);
+ #endif /* wxNEED_WX_TIME_H */
diff -r f997e41d3b44 -r 7cb098753a6d x11/wxGTK28/patches/patch-src_gtk_bdiag.xbm
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/wxGTK28/patches/patch-src_gtk_bdiag.xbm       Mon Jan 29 15:12:54 2018 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_gtk_bdiag.xbm,v 1.1 2018/01/29 15:12:54 jperkin Exp $
+
+Backport narrowing conversion fix from wxGTK30.
+
+--- src/gtk/bdiag.xbm.orig     2011-03-22 12:19:01.000000000 +0000
++++ src/gtk/bdiag.xbm
+@@ -1,6 +1,6 @@
+ #define bdiag_width 16
+ #define bdiag_height 16
+-static char bdiag_bits[] = {
++static unsigned char bdiag_bits[] = {
+    0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x04,
+    0x02, 0x02, 0x01, 0x01, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10,
+    0x08, 0x08, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01};
diff -r f997e41d3b44 -r 7cb098753a6d x11/wxGTK28/patches/patch-src_gtk_cdiag.xbm
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/wxGTK28/patches/patch-src_gtk_cdiag.xbm       Mon Jan 29 15:12:54 2018 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_gtk_cdiag.xbm,v 1.1 2018/01/29 15:12:54 jperkin Exp $
+
+Backport narrowing conversion fix from wxGTK30.
+
+--- src/gtk/cdiag.xbm.orig     2011-03-22 12:19:01.000000000 +0000
++++ src/gtk/cdiag.xbm
+@@ -1,6 +1,6 @@
+ #define cdiag_width 16
+ #define cdiag_height 16
+-static char cdiag_bits[] = {
++static unsigned char cdiag_bits[] = {
+    0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, 0x18, 0x18, 0x24, 0x24,
+    0x42, 0x42, 0x81, 0x81, 0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18,
+    0x18, 0x18, 0x24, 0x24, 0x42, 0x42, 0x81, 0x81};
diff -r f997e41d3b44 -r 7cb098753a6d x11/wxGTK28/patches/patch-src_gtk_cross.xbm
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/wxGTK28/patches/patch-src_gtk_cross.xbm       Mon Jan 29 15:12:54 2018 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_gtk_cross.xbm,v 1.1 2018/01/29 15:12:54 jperkin Exp $
+
+Backport narrowing conversion fix from wxGTK30.
+
+--- src/gtk/cross.xbm.orig     2011-03-22 12:19:01.000000000 +0000
++++ src/gtk/cross.xbm
+@@ -1,6 +1,6 @@
+ #define cross_width 15
+ #define cross_height 15
+-static char cross_bits[] = {
++static unsigned char cross_bits[] = {
+    0x84, 0x10, 0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+    0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+    0xff, 0x7f, 0x84, 0x10, 0x84, 0x10};
diff -r f997e41d3b44 -r 7cb098753a6d x11/wxGTK28/patches/patch-src_gtk_dcclient.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/wxGTK28/patches/patch-src_gtk_dcclient.cpp    Mon Jan 29 15:12:54 2018 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_gtk_dcclient.cpp,v 1.1 2018/01/29 15:12:54 jperkin Exp $
+
+Backport narrowing conversion fix from wxGTK30.
+
+--- src/gtk/dcclient.cpp.orig  2011-03-22 12:18:57.000000000 +0000
++++ src/gtk/dcclient.cpp
+@@ -428,12 +428,12 @@ void wxWindowDC::SetUpDC()
+     if (!hatch_bitmap)
+     {
+         hatch_bitmap    = hatches;
+-        hatch_bitmap[0] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, bdiag_bits, bdiag_width, bdiag_height );
+-        hatch_bitmap[1] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, cdiag_bits, cdiag_width, cdiag_height );
+-        hatch_bitmap[2] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, fdiag_bits, fdiag_width, fdiag_height );
+-        hatch_bitmap[3] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, cross_bits, cross_width, cross_height );
+-        hatch_bitmap[4] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, horiz_bits, horiz_width, horiz_height );
+-        hatch_bitmap[5] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, verti_bits, verti_width, verti_height );
++        hatch_bitmap[0] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, reinterpret_cast<const char*>(bdiag_bits), bdiag_width, bdiag_height );
++        hatch_bitmap[1] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, reinterpret_cast<const char*>(cdiag_bits), cdiag_width, cdiag_height );
++        hatch_bitmap[2] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, reinterpret_cast<const char*>(fdiag_bits), fdiag_width, fdiag_height );
++        hatch_bitmap[3] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, reinterpret_cast<const char*>(cross_bits), cross_width, cross_height );
++        hatch_bitmap[4] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, reinterpret_cast<const char*>(horiz_bits), horiz_width, horiz_height );
++        hatch_bitmap[5] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, reinterpret_cast<const char*>(verti_bits), verti_width, verti_height );
+     }
+ }
+ 
diff -r f997e41d3b44 -r 7cb098753a6d x11/wxGTK28/patches/patch-src_gtk_fdiag.xbm
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/wxGTK28/patches/patch-src_gtk_fdiag.xbm       Mon Jan 29 15:12:54 2018 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_gtk_fdiag.xbm,v 1.1 2018/01/29 15:12:54 jperkin Exp $
+
+Backport narrowing conversion fix from wxGTK30.
+
+--- src/gtk/fdiag.xbm.orig     2011-03-22 12:19:01.000000000 +0000
++++ src/gtk/fdiag.xbm
+@@ -1,6 +1,6 @@
+ #define fdiag_width 16
+ #define fdiag_height 16
+-static char fdiag_bits[] = {
++static unsigned char fdiag_bits[] = {
+    0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20,
+    0x40, 0x40, 0x80, 0x80, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08,
+    0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80};
diff -r f997e41d3b44 -r 7cb098753a6d x11/wxGTK28/patches/patch-src_gtk_horiz.xbm
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/wxGTK28/patches/patch-src_gtk_horiz.xbm       Mon Jan 29 15:12:54 2018 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_gtk_horiz.xbm,v 1.1 2018/01/29 15:12:54 jperkin Exp $
+
+Backport narrowing conversion fix from wxGTK30.
+
+--- src/gtk/horiz.xbm.orig     2011-03-22 12:19:01.000000000 +0000
++++ src/gtk/horiz.xbm
+@@ -1,6 +1,6 @@
+ #define horiz_width 15
+ #define horiz_height 15
+-static char horiz_bits[] = {
++static unsigned char horiz_bits[] = {
+    0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0x7f, 0x00, 0x00, 0x00, 0x00};
diff -r f997e41d3b44 -r 7cb098753a6d x11/wxGTK28/patches/patch-src_gtk_verti.xbm
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/wxGTK28/patches/patch-src_gtk_verti.xbm       Mon Jan 29 15:12:54 2018 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_gtk_verti.xbm,v 1.1 2018/01/29 15:12:54 jperkin Exp $
+
+Backport narrowing conversion fix from wxGTK30.
+
+--- src/gtk/verti.xbm.orig     2011-03-22 12:19:02.000000000 +0000
++++ src/gtk/verti.xbm
+@@ -1,6 +1,6 @@
+ #define verti_width 15
+ #define verti_height 15
+-static char verti_bits[] = {
++static unsigned char verti_bits[] = {
+    0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+    0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+    0x84, 0x10, 0x84, 0x10, 0x84, 0x10};