CVS commit: pkgsrc/x11/qt5-qtdeclarative/patches

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Dec 18 09:57:59 UTC 2018

Added Files:
        pkgsrc/x11/qt5-qtdeclarative/patches:
            patch-src_3rdparty_masm_yarr_YarrCanonicalize.h

Log Message:
...and a new patch


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_yarr_YarrCanonicalize.h

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

Added files:

Index: pkgsrc/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_yarr_YarrCanonicalize.h
diff -u /dev/null pkgsrc/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_yarr_YarrCanonicalize.h:1.1
--- /dev/null   Tue Dec 18 09:57:59 2018
+++ pkgsrc/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_yarr_YarrCanonicalize.h        Tue Dec 18 09:57:59 2018
@@ -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 {
+