commit 83be758e9d499d6e8056fc7da083f198da1c9c02 Author: Danny Rawlins <contact@romster.me> Date: Sun Oct 3 15:57:01 2021 +1100 [notify] webkitgtk renamed to webkitgtk-40 to make way for new webkitgtk version diff --git a/webkitgtk/.footprint b/webkitgtk-40/.footprint similarity index 99% rename from webkitgtk/.footprint rename to webkitgtk-40/.footprint index beced9339..c25b2f368 100644 --- a/webkitgtk/.footprint +++ b/webkitgtk-40/.footprint @@ -1,6 +1,6 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/WebKitWebDriver +-rwxr-xr-x root/root usr/bin/WebKitWebDriver-40 drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/webkitgtk-4.0/ drwxr-xr-x root/root usr/include/webkitgtk-4.0/JavaScriptCore/ diff --git a/webkitgtk-40/.signature b/webkitgtk-40/.signature new file mode 100644 index 000000000..389917bef --- /dev/null +++ b/webkitgtk-40/.signature @@ -0,0 +1,5 @@ +untrusted comment: verify with /etc/ports/opt.pub +RWSE3ohX2g5d/cU725Mh2zLyvITbzlMHJwkkn3bjARDVHRp0JBLMgTfblo/fxKjZT1V9l0153LqPrt3RNpRcKeLFyh0rf4x2Kgw= +SHA256 (Pkgfile) = 45d924cf651723fa1049c51ee47c00513d8f1b2bafc14004d47a4180dc2d977b +SHA256 (.footprint) = b9228ccce0d617bc9cea49c1cd030444655d59653c2cf98c02214475b628d499 +SHA256 (webkitgtk-2.32.4.tar.xz) = 00ce2d3f798d7bc5e9039d9059f0c3c974d51de38c8b716f00e94452a177d3fd diff --git a/webkitgtk/Pkgfile b/webkitgtk-40/Pkgfile similarity index 55% rename from webkitgtk/Pkgfile rename to webkitgtk-40/Pkgfile index ab7c8b861..40fba8c2a 100644 --- a/webkitgtk/Pkgfile +++ b/webkitgtk-40/Pkgfile @@ -4,25 +4,25 @@ # Depends on: gst-plugins-base gtk gtk3 icu harfbuzz hyphen libseccomp libsecret libsoup libwebp libxslt ruby woff2 xorg-libxt # Optional: enchant libnotify geoclue openjpeg2 xdg-dbus-proxy bubblewrap wpebackend-fdo libmanette -name=webkitgtk +name=webkitgtk-40 version=2.32.4 release=1 -source=(https://webkitgtk.org/releases/$name-$version.tar.xz) +source=(https://webkitgtk.org/releases/webkitgtk-$version.tar.xz) build() { # Make sure we do not have ccache masquerade directory in PATH. [ -e '/usr/bin/ccache' ] && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')" - prt-get isinst openjpeg2 || PKGMK_WEBKITGTK+=' -DUSE_OPENJPEG=OFF' - prt-get isinst enchant || PKGMK_WEBKITGTK+=' -DENABLE_SPELLCHECK=OFF' - prt-get isinst libnotify && PKGMK_WEBKITGTK+=' -DUSE_LIBNOTIFY=ON' || PKGMK_WEBKITGTK+=' -DUSE_LIBNOTIFY=OFF' - prt-get isinst geoclue && PKGMK_WEBKITGTK+=' -DENABLE_GEOLOCATION=ON' || PKGMK_WEBKITGTK+=' -DENABLE_GEOLOCATION=OFF' - prt-get isinst bubblewrap && prt-get isinst xdg-dbus-proxy && PKGMK_WEBKITGTK+=' -DENABLE_BUBBLEWRAP_SANDBOX=ON' \ - || PKGMK_WEBKITGTK+=' -DENABLE_BUBBLEWRAP_SANDBOX=OFF' - prt-get isinst wpebackend-fdo || PKGMK_WEBKITGTK+=' -DUSE_WPE_RENDERER=OFF' - prt-get isinst libmanette || PKGMK_WEBKITGTK+=' -DENABLE_GAMEPAD=OFF' + prt-get isinst openjpeg2 || PKGMK_WEBKITGTK40+=' -DUSE_OPENJPEG=OFF' + prt-get isinst enchant || PKGMK_WEBKITGTK40+=' -DENABLE_SPELLCHECK=OFF' + prt-get isinst libnotify && PKGMK_WEBKITGTK40+=' -DUSE_LIBNOTIFY=ON' || PKGMK_WEBKITGTK40+=' -DUSE_LIBNOTIFY=OFF' + prt-get isinst geoclue && PKGMK_WEBKITGTK40+=' -DENABLE_GEOLOCATION=ON' || PKGMK_WEBKITGTK40+=' -DENABLE_GEOLOCATION=OFF' + prt-get isinst bubblewrap xdg-dbus-proxy && PKGMK_WEBKITGTK40+=' -DENABLE_BUBBLEWRAP_SANDBOX=ON' \ + || PKGMK_WEBKITGTK40+=' -DENABLE_BUBBLEWRAP_SANDBOX=OFF' + prt-get isinst wpebackend-fdo || PKGMK_WEBKITGTK40+=' -DUSE_WPE_RENDERER=OFF' + prt-get isinst libmanette || PKGMK_WEBKITGTK40+=' -DENABLE_GAMEPAD=OFF' - cmake -S $name-$version -B build -G Ninja ${PKGMK_WEBKITGTK} \ + cmake -S webkitgtk-$version -B build -G Ninja ${PKGMK_WEBKITGTK40} \ -D CMAKE_INSTALL_PREFIX:PATH=/usr \ -D CMAKE_INSTALL_LIBDIR:PATH=/usr/lib \ -D CMAKE_INSTALL_LIBEXECDIR:PATH=/usr/lib \ @@ -39,5 +39,7 @@ build() { cmake --build build DESTDIR=$PKG cmake --install build + mv $PKG/usr/bin/WebKitWebDriver{,-40} + rm -r $PKG/usr/share/locale } diff --git a/webkitgtk/.signature b/webkitgtk/.signature deleted file mode 100644 index 51d8b2514..000000000 --- a/webkitgtk/.signature +++ /dev/null @@ -1,5 +0,0 @@ -untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/WBEwE7e77Zq5Upt/N6eji8Sq75wUXCxKat5cMLRU2rS9GEH9lj0n/hYXI3rUezKfgfOickH4XGTlvEfjMbRMAg= -SHA256 (Pkgfile) = 0b683bbcb2aea1c2e687deeb36b47af8ac90ddcfed8dad830c2ad754fe2ca66b -SHA256 (.footprint) = a0e19f5d6a441e069220e3dfaab7b93cfa042fe8f672447892a7d3b62a29ba85 -SHA256 (webkitgtk-2.32.4.tar.xz) = 00ce2d3f798d7bc5e9039d9059f0c3c974d51de38c8b716f00e94452a177d3fd diff --git a/webkitgtk/bug-218522.patch b/webkitgtk/bug-218522.patch deleted file mode 100644 index 87d719489..000000000 --- a/webkitgtk/bug-218522.patch +++ /dev/null @@ -1,131 +0,0 @@ ---- a/Source/WTF/wtf/text/icu/UTextProvider.h -+++ a/Source/WTF/wtf/text/icu/UTextProvider.h -@@ -79,12 +79,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < std::numeric_limits<int32_t>::max()); - text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(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, int64_t nativeIndex, int - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < std::numeric_limits<int32_t>::max()); - text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex <= 0 && !text->chunkNativeStart) { - text->chunkOffset = 0; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } ---- a/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp -+++ a/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp -@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward) - if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { - // Already inside the buffer. Set the new offset. - uText->chunkOffset = static_cast<int32_t>(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<int32_t>(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<int32_t>(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 index, UBool forward) - - 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(UText* text) - 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, int64_t nativeIndex, UBo - 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) ---- a/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp -+++ a/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp -@@ -126,7 +126,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLength(UText* text) - 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, int64_t nativeIndex, UBoo - 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) ---- a/Source/WebCore/platform/text/TextCodecICU.cpp -+++ a/Source/WebCore/platform/text/TextCodecICU.cpp -@@ -194,7 +194,7 @@ void TextCodecICU::createICUConverter() const - UErrorCode error = U_ZERO_ERROR; - m_converter = ICUConverterPtr { ucnv_open(m_canonicalConverterName, &error), ucnv_close }; - if (m_converter) -- ucnv_setFallback(m_converter.get(), TRUE); -+ ucnv_setFallback(m_converter.get(), true); - } - - int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& error) ---- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp -+++ a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp -@@ -402,7 +402,7 @@ DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::~DrawingMonitor() - int DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::webViewDrawCallback(DrawingAreaProxyCoordinatedGraphics::DrawingMonitor* monitor) - { - monitor->didDraw(); -- return FALSE; -+ return false; - } - - void DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::start(WTF::Function<void(CallbackBase::Error)>&& callback)