CVS commit: pkgsrc/x11/wxGTK28

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Jun 14 13:21:53 UTC 2017

Modified Files:
        pkgsrc/x11/wxGTK28: Makefile distinfo
Added Files:
        pkgsrc/x11/wxGTK28/patches: patch-include_wx_convauto.h

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


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/x11/wxGTK28/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/wxGTK28/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/wxGTK28/patches/patch-include_wx_convauto.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/wxGTK28/Makefile
diff -u pkgsrc/x11/wxGTK28/Makefile:1.47 pkgsrc/x11/wxGTK28/Makefile:1.48
--- pkgsrc/x11/wxGTK28/Makefile:1.47    Sun Feb 12 06:24:59 2017
+++ pkgsrc/x11/wxGTK28/Makefile Wed Jun 14 13:21:52 2017
@@ -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

Index: pkgsrc/x11/wxGTK28/distinfo
diff -u pkgsrc/x11/wxGTK28/distinfo:1.19 pkgsrc/x11/wxGTK28/distinfo:1.20
--- pkgsrc/x11/wxGTK28/distinfo:1.19    Tue Jan 19 03:48:06 2016
+++ pkgsrc/x11/wxGTK28/distinfo Wed Jun 14 13:21:52 2017
@@ -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 @@ Size (wxGTK-2.8.12.tar.bz2) = 9292767 by
 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

Added files:

Index: pkgsrc/x11/wxGTK28/patches/patch-include_wx_convauto.h
diff -u /dev/null pkgsrc/x11/wxGTK28/patches/patch-include_wx_convauto.h:1.1
--- /dev/null   Wed Jun 14 13:21:53 2017
+++ pkgsrc/x11/wxGTK28/patches/patch-include_wx_convauto.h      Wed Jun 14 13:21:52 2017
@@ -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
+     };
+