Index: head/www/webkit2-gtk3/Makefile =================================================================== --- head/www/webkit2-gtk3/Makefile +++ head/www/webkit2-gtk3/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= webkit -PORTVERSION= 2.30.2 +PORTVERSION= 2.30.4 CATEGORIES= www MASTER_SITES= https://webkitgtk.org/releases/ PKGNAMESUFFIX= 2-gtk3 Index: head/www/webkit2-gtk3/distinfo =================================================================== --- head/www/webkit2-gtk3/distinfo +++ head/www/webkit2-gtk3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1606253027 -SHA256 (gnome/webkitgtk-2.30.2.tar.xz) = c467e0bc2bc610c2570928e3fd63cedaadc4719cbf9b04aa99f79dd71ad5682a -SIZE (gnome/webkitgtk-2.30.2.tar.xz) = 22308908 +TIMESTAMP = 1611353391 +SHA256 (gnome/webkitgtk-2.30.4.tar.xz) = d595a37c5001ff787266b155e303a5f2e5b48a6d466f2714c2f30c11392f7b24 +SIZE (gnome/webkitgtk-2.30.4.tar.xz) = 22310784 Index: head/www/webkit2-gtk3/files/patch-icu68 =================================================================== --- head/www/webkit2-gtk3/files/patch-icu68 +++ head/www/webkit2-gtk3/files/patch-icu68 @@ -1,173 +0,0 @@ -Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 - -In file included from Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:30: -Source/WTF/wtf/text/icu/UTextProvider.h:82:28: error: use of undeclared identifier 'TRUE' - isAccessible = TRUE; - ^ -Source/WTF/wtf/text/icu/UTextProvider.h:87:28: error: use of undeclared identifier 'FALSE' - isAccessible = FALSE; - ^ -Source/WTF/wtf/text/icu/UTextProvider.h:96:28: error: use of undeclared identifier 'TRUE' - isAccessible = TRUE; - ^ -Source/WTF/wtf/text/icu/UTextProvider.h:101:28: error: use of undeclared identifier 'FALSE' - isAccessible = FALSE; - ^ -Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ -Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE' - return FALSE; - ^ -Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ -Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE' - return FALSE; - ^ -Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ -Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:340:16: error: use of undeclared identifier 'FALSE' - return FALSE; - ^ -Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:360:12: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ -Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp:129:16: error: use of undeclared identifier 'FALSE' - return FALSE; - ^ -Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp:149:12: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ -Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ -Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE' - return FALSE; - ^ -Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ -Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE' - return FALSE; - ^ -Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ -Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:340:16: error: use of undeclared identifier 'FALSE' - return FALSE; - ^ -Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:360:12: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ - ---- Source/WTF/wtf/text/icu/UTextProvider.h.orig 2020-08-12 09:17:54 UTC -+++ Source/WTF/wtf/text/icu/UTextProvider.h -@@ -79,12 +79,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < std::numeric_limits::max()); - text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { - text->chunkOffset = text->chunkLength; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } else { -@@ -93,12 +93,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < std::numeric_limits::max()); - text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex <= 0 && !text->chunkNativeStart) { - text->chunkOffset = 0; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } ---- Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp.orig 2020-08-12 09:17:54 UTC -+++ Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp -@@ -126,7 +126,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng - static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) - { - if (!text->context) -- return FALSE; -+ return false; - int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); - UBool isAccessible; - if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -146,7 +146,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, - ASSERT(newContext == UTextProviderContext::PriorContext); - textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); - } -- return TRUE; -+ return true; - } - - static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) ---- Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp.orig 2020-08-12 09:17:54 UTC -+++ Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp -@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i - if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { - // Already inside the buffer. Set the new offset. - uText->chunkOffset = static_cast(index - uText->chunkNativeStart); -- return TRUE; -+ return true; - } - if (index >= length && uText->chunkNativeLimit == length) { - // Off the end of the buffer, but we can't get it. - uText->chunkOffset = static_cast(index - uText->chunkNativeStart); -- return FALSE; -+ return false; - } - } else { - if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { - // Already inside the buffer. Set the new offset. - uText->chunkOffset = static_cast(index - uText->chunkNativeStart); -- return TRUE; -+ return true; - } - if (!index && !uText->chunkNativeStart) { - // Already at the beginning; can't go any farther. - uText->chunkOffset = 0; -- return FALSE; -+ return false; - } - } - -@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i - - uText->nativeIndexingLimit = uText->chunkLength; - -- return TRUE; -+ return true; - } - - static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) -@@ -337,7 +337,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe - static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) - { - if (!text->context) -- return FALSE; -+ return false; - int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); - UBool isAccessible; - if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -357,7 +357,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text - ASSERT(newContext == UTextProviderContext::PriorContext); - textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); - } -- return TRUE; -+ return true; - } - - static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) Index: head/www/webkit2-gtk3/pkg-plist =================================================================== --- head/www/webkit2-gtk3/pkg-plist +++ head/www/webkit2-gtk3/pkg-plist @@ -219,10 +219,10 @@ 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.17.10 +lib/libjavascriptcoregtk-4.0.so.18.17.12 lib/libwebkit2gtk-4.0.so lib/libwebkit2gtk-4.0.so.37 -lib/libwebkit2gtk-4.0.so.37.49.6 +lib/libwebkit2gtk-4.0.so.37.49.8 lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so libdata/pkgconfig/javascriptcoregtk-4.0.pc libdata/pkgconfig/webkit2gtk-4.0.pc