diff options
Diffstat (limited to 'www/webkit2-gtk3')
| -rw-r--r-- | www/webkit2-gtk3/Makefile | 1 | ||||
| -rw-r--r-- | www/webkit2-gtk3/files/patch-Source_WTF_wtf_URLHelpers.cpp | 24 | ||||
| -rw-r--r-- | www/webkit2-gtk3/files/patch-Source_WebCore_dom_Document.cpp | 42 |
3 files changed, 67 insertions, 0 deletions
diff --git a/www/webkit2-gtk3/Makefile b/www/webkit2-gtk3/Makefile index c1d887cd413b..8ac5d8ab5242 100644 --- a/www/webkit2-gtk3/Makefile +++ b/www/webkit2-gtk3/Makefile @@ -3,6 +3,7 @@ PORTNAME= webkit PORTVERSION= 2.24.4 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://webkitgtk.org/releases/ PKGNAMESUFFIX= 2-gtk3 diff --git a/www/webkit2-gtk3/files/patch-Source_WTF_wtf_URLHelpers.cpp b/www/webkit2-gtk3/files/patch-Source_WTF_wtf_URLHelpers.cpp new file mode 100644 index 000000000000..ae3e8ffa3d1d --- /dev/null +++ b/www/webkit2-gtk3/files/patch-Source_WTF_wtf_URLHelpers.cpp @@ -0,0 +1,24 @@ +Regressed by https://github.com/unicode-org/icu/commit/480bec3ea652 + +Source/WTF/wtf/URLHelpers.cpp:301:39: error: expected ';' after do/while statement + U16_NEXT(buffer, i, length, c) + ^ + ; +Source/WTF/wtf/URLHelpers.cpp:303:52: error: use of undeclared identifier 'error' + UScriptCode script = uscript_getScript(c, &error); + ^ +Source/WTF/wtf/URLHelpers.cpp:304:13: error: use of undeclared identifier 'error' + if (error != U_ZERO_ERROR) { + ^ + +--- Source/WTF/wtf/URLHelpers.cpp.orig 2019-08-26 14:55:44 UTC ++++ Source/WTF/wtf/URLHelpers.cpp +@@ -298,7 +298,7 @@ static bool allCharactersInIDNScriptWhiteList(const UC + Optional<UChar32> previousCodePoint; + while (i < length) { + UChar32 c; +- U16_NEXT(buffer, i, length, c) ++ U16_NEXT(buffer, i, length, c); + UErrorCode error = U_ZERO_ERROR; + UScriptCode script = uscript_getScript(c, &error); + if (error != U_ZERO_ERROR) { diff --git a/www/webkit2-gtk3/files/patch-Source_WebCore_dom_Document.cpp b/www/webkit2-gtk3/files/patch-Source_WebCore_dom_Document.cpp new file mode 100644 index 000000000000..a2748f3053dd --- /dev/null +++ b/www/webkit2-gtk3/files/patch-Source_WebCore_dom_Document.cpp @@ -0,0 +1,42 @@ +Regressed by https://github.com/unicode-org/icu/commit/480bec3ea652 + +In file included from DerivedSources/WebCore/unified-sources/UnifiedSource-be65d27a-6.cpp:4: +Source/WebCore/dom/Document.cpp:5075:39: error: expected ';' after do/while statement + U16_NEXT(characters, i, length, c) + ^ + ; +Source/WebCore/dom/Document.cpp:5080:43: error: expected ';' after do/while statement + U16_NEXT(characters, i, length, c) + ^ + ; +Source/WebCore/dom/Document.cpp:5140:46: error: expected ';' after do/while statement + U16_NEXT(qualifiedName, i, length, c) + ^ + ; + +--- Source/WebCore/dom/Document.cpp.orig 2019-08-26 14:55:45 UTC ++++ Source/WebCore/dom/Document.cpp +@@ -5072,12 +5072,12 @@ static bool isValidNameNonASCII(const UChar* character + unsigned i = 0; + + UChar32 c; +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!isValidNameStart(c)) + return false; + + while (i < length) { +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!isValidNamePart(c)) + return false; + } +@@ -5137,7 +5137,7 @@ ExceptionOr<std::pair<AtomicString, AtomicString>> Doc + + for (unsigned i = 0; i < length; ) { + UChar32 c; +- U16_NEXT(qualifiedName, i, length, c) ++ U16_NEXT(qualifiedName, i, length, c); + if (c == ':') { + if (sawColon) + return Exception { InvalidCharacterError }; |