[pkgsrc/trunk]: pkgsrc/x11/wxGTK28 Avoid conflicting definition of BOM_UTF8 f...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/17ed4c6f4e99
branches:  trunk
changeset: 363684:17ed4c6f4e99
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Jun 14 13:21:52 2017 +0000

description:
Avoid conflicting definition of BOM_UTF8 from perl-5.26.  Bump PKGREVISION.

diffstat:

 x11/wxGTK28/Makefile                            |   4 ++--
 x11/wxGTK28/distinfo                            |   3 ++-
 x11/wxGTK28/patches/patch-include_wx_convauto.h |  14 ++++++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r b15f0460c5a1 -r 17ed4c6f4e99 x11/wxGTK28/Makefile
--- a/x11/wxGTK28/Makefile      Wed Jun 14 13:19:35 2017 +0000
+++ b/x11/wxGTK28/Makefile      Wed Jun 14 13:21:52 2017 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.47 2017/02/12 06:24:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.48 2017/06/14 13:21:52 jperkin Exp $
 #
 
 .include "../../x11/wxGTK28/Makefile.common"
 
 PKGNAME=               ${DISTNAME:S/wxGTK/wxGTK28/}
-PKGREVISION=           12
+PKGREVISION=           13
 COMMENT=               GTK-based implementation of the wxWidgets GUI library
 
 BUILD_TARGET=  all
diff -r b15f0460c5a1 -r 17ed4c6f4e99 x11/wxGTK28/distinfo
--- a/x11/wxGTK28/distinfo      Wed Jun 14 13:19:35 2017 +0000
+++ b/x11/wxGTK28/distinfo      Wed Jun 14 13:21:52 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2016/01/19 03:48:06 dbj Exp $
+$NetBSD: distinfo,v 1.20 2017/06/14 13:21:52 jperkin Exp $
 
 SHA1 (wxGTK-2.8.12-libtool.diff.bz2) = f2c9b8a06c08101325ffe09ad77f4800f7aa8730
 RMD160 (wxGTK-2.8.12-libtool.diff.bz2) = 05b763aa44a8e8c8ad565af2a188d7c6437f2133
@@ -11,5 +11,6 @@
 SHA1 (patch-aa) = 2c597a180afe1ca8a27cc816197ae9e5598ca99d
 SHA1 (patch-ab) = 6f6278ec6b92a39abe29ec09053cd7007cd32fef
 SHA1 (patch-ac) = 50cf253797f2dee8b9dab08d138d0070e25e7a8c
+SHA1 (patch-include_wx_convauto.h) = 11f635fa13995daf9815d6e84e936f39206e927a
 SHA1 (patch-include_wx_debug.h) = bc25a486361194d8d70c69bcd833e085fbcbdec3
 SHA1 (patch-setup.h.in) = 4f798bd013dc008644e3f86be89ecb8bf13aef1d
diff -r b15f0460c5a1 -r 17ed4c6f4e99 x11/wxGTK28/patches/patch-include_wx_convauto.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/wxGTK28/patches/patch-include_wx_convauto.h   Wed Jun 14 13:21:52 2017 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-include_wx_convauto.h,v 1.1 2017/06/14 13:21:52 jperkin Exp $
+
+Avoid conflicting definition of BOM_UTF8 from perl-5.26.
+
+--- include/wx/convauto.h.orig 2011-03-22 12:16:45.000000000 +0000
++++ include/wx/convauto.h
+@@ -51,6 +51,7 @@ private:
+         BOM_UTF32LE,
+         BOM_UTF16BE,
+         BOM_UTF16LE,
++#undef BOM_UTF8
+         BOM_UTF8
+     };
+