[pkgsrc/trunk]: pkgsrc/x11/qt5-qtdeclarative/patches ...and a new patch

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/44fbe4b68b67
branches:  trunk
changeset: 389036:44fbe4b68b67
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Dec 18 09:57:59 2018 +0000

description:
...and a new patch

diffstat:

 x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_yarr_YarrCanonicalize.h |  16 ++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diffs (20 lines):

diff -r 6d79468e165d -r 44fbe4b68b67 x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_yarr_YarrCanonicalize.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_yarr_YarrCanonicalize.h     Tue Dec 18 09:57:59 2018 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_3rdparty_masm_yarr_YarrCanonicalize.h,v 1.1 2018/12/18 09:57:59 adam Exp $
+
+Void conflict with textproc/icu:
+src/3rdparty/masm/stubs/wtf/unicode/utypes.h only includes Unicode.h.
+
+--- src/3rdparty/masm/yarr/YarrCanonicalize.h.orig     2018-12-16 16:58:47.000000000 +0000
++++ src/3rdparty/masm/yarr/YarrCanonicalize.h
+@@ -26,7 +26,7 @@
+ #pragma once
+ 
+ #include <stdint.h>
+-#include <unicode/utypes.h>
++#include "unicode/Unicode.h"
+ 
+ namespace JSC { namespace Yarr {
+