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
This commit is contained in:
Jan Beich 2019-07-03 23:50:22 +00:00
parent 4839ca8378
commit de77098743
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2019Q2/; revision=505805
2 changed files with 30 additions and 0 deletions

View File

@ -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,

View File

@ -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;