MFH: r524226

Update webkit-gtk3 to 2.26.3.

* Fix issues while trying to play a video on NextCloud.
* Make sure the GL video sink uses a valid WebKit shared GL context.
* Fix vertical alignment of text containing arabic diacritics.
* Fix build with icu 65.1.
* Fix page loading errors with websites using HSTS.
* Fix web process crash when displaying a KaTeX formula.
* Fix several crashes and rendering issues.

This release also fixes 3 CVE's.

Security:	dc8cff4c-4063-11ea-8a94-3497f6939fdd

Approved by:	ports-secteam@ (miwi@)
This commit is contained in:
Koop Mast 2020-02-09 17:51:48 +00:00
parent f724eefbf1
commit 009633e564
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2020Q1/; revision=525667
5 changed files with 6 additions and 72 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= webkit
PORTVERSION= 2.26.2
PORTVERSION= 2.26.3
CATEGORIES= www
MASTER_SITES= https://webkitgtk.org/releases/
PKGNAMESUFFIX= 2-gtk3

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1574792040
SHA256 (gnome/webkitgtk-2.26.2.tar.xz) = 6b80f0637a80818559ac8fd50db3b394f41cb61904fb9b3ed65fa51635806512
SIZE (gnome/webkitgtk-2.26.2.tar.xz) = 19330000
TIMESTAMP = 1579976981
SHA256 (gnome/webkitgtk-2.26.3.tar.xz) = add51153943cc11d90a7038d0ea5f6332281e6c0be0640f802a211b035f0e611
SIZE (gnome/webkitgtk-2.26.3.tar.xz) = 19331900

View File

@ -1,24 +0,0 @@
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) {

View File

@ -1,42 +0,0 @@
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 };

View File

@ -214,10 +214,10 @@ lib/girepository-1.0/WebKit2-4.0.typelib
lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
lib/libjavascriptcoregtk-4.0.so
lib/libjavascriptcoregtk-4.0.so.18
lib/libjavascriptcoregtk-4.0.so.18.14.7
lib/libjavascriptcoregtk-4.0.so.18.14.8
lib/libwebkit2gtk-4.0.so
lib/libwebkit2gtk-4.0.so.37
lib/libwebkit2gtk-4.0.so.37.39.3
lib/libwebkit2gtk-4.0.so.37.39.4
lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
libdata/pkgconfig/javascriptcoregtk-4.0.pc
libdata/pkgconfig/webkit2gtk-4.0.pc