diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2019-07-03 23:50:22 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2019-07-03 23:50:22 +0000 |
| commit | de770987439f37cc8d16a6f71977f8fd6038e771 (patch) | |
| tree | a7b0ce46e32948a4d6fa161eef1e3830a482c01b | |
| parent | 4839ca8378165230069ada4fb7405660242afbe6 (diff) | |
| download | ports-de770987439f37cc8d16a6f71977f8fd6038e771.tar.gz ports-de770987439f37cc8d16a6f71977f8fd6038e771.zip | |
MFH: r505799
www/webkit2-gtk3: unbreak on aarch64, armv6, armv7
PR: 237440
Reported by: pkg-fallout
Submitted by: Greg V <greg@unrelenting.technology>
Tested by: Charlie Li <ml+freebsd@vishwin.info>
Approved by: maintainer timeout (2 months), portmgr blanket
Obtained from: upstream
Approved by: ports-secteam blanket
Notes
Notes:
svn path=/branches/2019Q2/; revision=505805
| -rw-r--r-- | www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_DFACombiner.cpp | 13 | ||||
| -rw-r--r-- | www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_NFAToDFA.cpp | 17 |
2 files changed, 30 insertions, 0 deletions
diff --git a/www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_DFACombiner.cpp b/www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_DFACombiner.cpp new file mode 100644 index 000000000000..6dbd88961f63 --- /dev/null +++ b/www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_DFACombiner.cpp @@ -0,0 +1,13 @@ +https://trac.webkit.org/changeset/244591 + +--- Source/WebCore/contentextensions/DFACombiner.cpp.orig 2019-02-12 11:21:18 UTC ++++ Source/WebCore/contentextensions/DFACombiner.cpp +@@ -37,7 +37,7 @@ namespace WebCore { + namespace ContentExtensions { + + class DFAMerger { +- typedef MutableRangeList<char, uint64_t, 128> CombinedTransitionsMutableRangeList; ++ typedef MutableRangeList<signed char, uint64_t, 128> CombinedTransitionsMutableRangeList; + + enum class WhichDFA { + A, diff --git a/www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_NFAToDFA.cpp b/www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_NFAToDFA.cpp new file mode 100644 index 000000000000..7460f54c8dea --- /dev/null +++ b/www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_NFAToDFA.cpp @@ -0,0 +1,17 @@ +https://trac.webkit.org/changeset/244591 + +--- Source/WebCore/contentextensions/NFAToDFA.cpp.orig 2019-02-12 11:21:18 UTC ++++ Source/WebCore/contentextensions/NFAToDFA.cpp +@@ -41,9 +41,9 @@ namespace WebCore { + + namespace ContentExtensions { + +-typedef MutableRange<char, NFANodeIndexSet> NFANodeRange; +-typedef MutableRangeList<char, NFANodeIndexSet> NFANodeRangeList; +-typedef MutableRangeList<char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList; ++typedef MutableRange<signed char, NFANodeIndexSet> NFANodeRange; ++typedef MutableRangeList<signed char, NFANodeIndexSet> NFANodeRangeList; ++typedef MutableRangeList<signed char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList; + typedef Vector<uint32_t, 0, ContentExtensionsOverflowHandler> UniqueNodeList; + typedef Vector<UniqueNodeList, 0, ContentExtensionsOverflowHandler> NFANodeClosures; + |