Received: by mail.netbsd.org (Postfix, from userid 605) id 70A4E84D5B; Mon, 29 Jan 2018 15:12:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id EFCA584D4A for ; Mon, 29 Jan 2018 15:12:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id LRlq5tmES5Wo for ; Mon, 29 Jan 2018 15:12:55 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 037E084CE4 for ; Mon, 29 Jan 2018 15:12:55 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id F317CFBDE; Mon, 29 Jan 2018 15:12:54 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1517238774218300" MIME-Version: 1.0 Date: Mon, 29 Jan 2018 15:12:54 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/x11/wxGTK28 To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20180129151254.F317CFBDE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1517238774218300 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Mon Jan 29 15:12:54 UTC 2018 Modified Files: pkgsrc/x11/wxGTK28: distinfo Added Files: pkgsrc/x11/wxGTK28/patches: patch-include_wx_wxchar.h patch-src_gtk_bdiag.xbm patch-src_gtk_cdiag.xbm patch-src_gtk_cross.xbm patch-src_gtk_dcclient.cpp patch-src_gtk_fdiag.xbm patch-src_gtk_horiz.xbm patch-src_gtk_verti.xbm Log Message: wxGTK28: Backport narrowing conversion fixes from wxGTK30. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/wxGTK28/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/x11/wxGTK28/patches/patch-include_wx_wxchar.h \ pkgsrc/x11/wxGTK28/patches/patch-src_gtk_bdiag.xbm \ pkgsrc/x11/wxGTK28/patches/patch-src_gtk_cdiag.xbm \ pkgsrc/x11/wxGTK28/patches/patch-src_gtk_cross.xbm \ pkgsrc/x11/wxGTK28/patches/patch-src_gtk_dcclient.cpp \ pkgsrc/x11/wxGTK28/patches/patch-src_gtk_fdiag.xbm \ pkgsrc/x11/wxGTK28/patches/patch-src_gtk_horiz.xbm \ pkgsrc/x11/wxGTK28/patches/patch-src_gtk_verti.xbm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1517238774218300 Content-Disposition: inline Content-Length: 9477 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/wxGTK28/distinfo diff -u pkgsrc/x11/wxGTK28/distinfo:1.20 pkgsrc/x11/wxGTK28/distinfo:1.21 --- pkgsrc/x11/wxGTK28/distinfo:1.20 Wed Jun 14 13:21:52 2017 +++ pkgsrc/x11/wxGTK28/distinfo Mon Jan 29 15:12:54 2018 @@ -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-ab) = 6f6278ec6b92a39abe29ec 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 Added files: Index: pkgsrc/x11/wxGTK28/patches/patch-include_wx_wxchar.h diff -u /dev/null pkgsrc/x11/wxGTK28/patches/patch-include_wx_wxchar.h:1.1 --- /dev/null Mon Jan 29 15:12:54 2018 +++ pkgsrc/x11/wxGTK28/patches/patch-include_wx_wxchar.h Mon Jan 29 15:12:54 2018 @@ -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 + #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 */ Index: pkgsrc/x11/wxGTK28/patches/patch-src_gtk_bdiag.xbm diff -u /dev/null pkgsrc/x11/wxGTK28/patches/patch-src_gtk_bdiag.xbm:1.1 --- /dev/null Mon Jan 29 15:12:54 2018 +++ pkgsrc/x11/wxGTK28/patches/patch-src_gtk_bdiag.xbm Mon Jan 29 15:12:54 2018 @@ -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}; Index: pkgsrc/x11/wxGTK28/patches/patch-src_gtk_cdiag.xbm diff -u /dev/null pkgsrc/x11/wxGTK28/patches/patch-src_gtk_cdiag.xbm:1.1 --- /dev/null Mon Jan 29 15:12:54 2018 +++ pkgsrc/x11/wxGTK28/patches/patch-src_gtk_cdiag.xbm Mon Jan 29 15:12:54 2018 @@ -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}; Index: pkgsrc/x11/wxGTK28/patches/patch-src_gtk_cross.xbm diff -u /dev/null pkgsrc/x11/wxGTK28/patches/patch-src_gtk_cross.xbm:1.1 --- /dev/null Mon Jan 29 15:12:54 2018 +++ pkgsrc/x11/wxGTK28/patches/patch-src_gtk_cross.xbm Mon Jan 29 15:12:54 2018 @@ -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}; Index: pkgsrc/x11/wxGTK28/patches/patch-src_gtk_dcclient.cpp diff -u /dev/null pkgsrc/x11/wxGTK28/patches/patch-src_gtk_dcclient.cpp:1.1 --- /dev/null Mon Jan 29 15:12:54 2018 +++ pkgsrc/x11/wxGTK28/patches/patch-src_gtk_dcclient.cpp Mon Jan 29 15:12:54 2018 @@ -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(bdiag_bits), bdiag_width, bdiag_height ); ++ hatch_bitmap[1] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, reinterpret_cast(cdiag_bits), cdiag_width, cdiag_height ); ++ hatch_bitmap[2] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, reinterpret_cast(fdiag_bits), fdiag_width, fdiag_height ); ++ hatch_bitmap[3] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, reinterpret_cast(cross_bits), cross_width, cross_height ); ++ hatch_bitmap[4] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, reinterpret_cast(horiz_bits), horiz_width, horiz_height ); ++ hatch_bitmap[5] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, reinterpret_cast(verti_bits), verti_width, verti_height ); + } + } + Index: pkgsrc/x11/wxGTK28/patches/patch-src_gtk_fdiag.xbm diff -u /dev/null pkgsrc/x11/wxGTK28/patches/patch-src_gtk_fdiag.xbm:1.1 --- /dev/null Mon Jan 29 15:12:54 2018 +++ pkgsrc/x11/wxGTK28/patches/patch-src_gtk_fdiag.xbm Mon Jan 29 15:12:54 2018 @@ -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}; Index: pkgsrc/x11/wxGTK28/patches/patch-src_gtk_horiz.xbm diff -u /dev/null pkgsrc/x11/wxGTK28/patches/patch-src_gtk_horiz.xbm:1.1 --- /dev/null Mon Jan 29 15:12:54 2018 +++ pkgsrc/x11/wxGTK28/patches/patch-src_gtk_horiz.xbm Mon Jan 29 15:12:54 2018 @@ -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}; Index: pkgsrc/x11/wxGTK28/patches/patch-src_gtk_verti.xbm diff -u /dev/null pkgsrc/x11/wxGTK28/patches/patch-src_gtk_verti.xbm:1.1 --- /dev/null Mon Jan 29 15:12:54 2018 +++ pkgsrc/x11/wxGTK28/patches/patch-src_gtk_verti.xbm Mon Jan 29 15:12:54 2018 @@ -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}; --_----------=_1517238774218300--