svn commit: r505805 - branches/2019Q2/www/webkit2-gtk3/files
Jan Beich
jbeich at FreeBSD.org
Wed Jul 3 23:50:23 UTC 2019
Author: jbeich
Date: Wed Jul 3 23:50:22 2019
New Revision: 505805
URL: https://svnweb.freebsd.org/changeset/ports/505805
Log:
MFH: r505799
www/webkit2-gtk3: unbreak on aarch64, armv6, armv7
PR: 237440
Reported by: pkg-fallout
Submitted by: Greg V <greg at unrelenting.technology>
Tested by: Charlie Li <ml+freebsd at vishwin.info>
Approved by: maintainer timeout (2 months), portmgr blanket
Obtained from: upstream
Approved by: ports-secteam blanket
Added:
branches/2019Q2/www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_DFACombiner.cpp
- copied unchanged from r505799, head/www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_DFACombiner.cpp
branches/2019Q2/www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_NFAToDFA.cpp
- copied unchanged from r505799, head/www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_NFAToDFA.cpp
Modified:
Directory Properties:
branches/2019Q2/ (props changed)
Copied: branches/2019Q2/www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_DFACombiner.cpp (from r505799, head/www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_DFACombiner.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2019Q2/www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_DFACombiner.cpp Wed Jul 3 23:50:22 2019 (r505805, copy of r505799, head/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,
Copied: branches/2019Q2/www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_NFAToDFA.cpp (from r505799, head/www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_NFAToDFA.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2019Q2/www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_NFAToDFA.cpp Wed Jul 3 23:50:22 2019 (r505805, copy of r505799, head/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;
+
More information about the svn-ports-branches
mailing list