From b59cc4c7748a583f8f353b8ccdce30254b49ba30 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 1 Nov 2021 18:15:44 +0100 Subject: [PATCH] HaikuWebKit: new version. --- ...-1.8.2.recipe => haikuwebkit-1.8.3.recipe} | 7 +- .../patches/haikuwebkit-1.8.2.patchset | 138 ------------------ 2 files changed, 4 insertions(+), 141 deletions(-) rename haiku-libs/haikuwebkit/{haikuwebkit-1.8.2.recipe => haikuwebkit-1.8.3.recipe} (94%) delete mode 100644 haiku-libs/haikuwebkit/patches/haikuwebkit-1.8.2.patchset diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.8.2.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.8.3.recipe similarity index 94% rename from haiku-libs/haikuwebkit/haikuwebkit-1.8.2.recipe rename to haiku-libs/haikuwebkit/haikuwebkit-1.8.3.recipe index 1ddc8f7c5..b57822f71 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.8.2.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.8.3.recipe @@ -9,12 +9,11 @@ COPYRIGHT="1998-2021 Apple Inc., Google Inc., et al" LICENSE="GNU LGPL v2 GNU LGPL v2.1 MIT" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/haiku/haikuwebkit/archive/HaikuWebKit-$portVersion.tar.gz" SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz" SOURCE_DIR="haikuwebkit-HaikuWebKit-$portVersion" -CHECKSUM_SHA256="d21f4f6c34862ee25ccdf8f75a66304453a24689c59a9e4ab56cb201dc24f3ec" -PATCHES="haikuwebkit-1.8.2.patchset" +CHECKSUM_SHA256="82e583267441eea1bdfc640cd680c3d63b945a78b6dbb5d1b3fcfc4e8c444ac3" ARCHITECTURES="all !x86_gcc2 ?x86" SECONDARY_ARCHITECTURES="x86" @@ -31,6 +30,7 @@ REQUIRES=" lib:libgcrypt$secondaryArchSuffix lib:libgl$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix >= 66 + lib:libgpg_error$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng16$secondaryArchSuffix lib:libsqlite3$secondaryArchSuffix @@ -88,6 +88,7 @@ BUILD_PREREQUIRES=" BUILD() { export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig" + export DISABLE_ASLR=1 Tools/Scripts/build-webkit --haiku --no-webkit2 \ --cmakeargs="-DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_BUILD_TYPE=Release -DSHOULD_INSTALL_JS_SHELL=ON" } diff --git a/haiku-libs/haikuwebkit/patches/haikuwebkit-1.8.2.patchset b/haiku-libs/haikuwebkit/patches/haikuwebkit-1.8.2.patchset deleted file mode 100644 index a9eeaefb4..000000000 --- a/haiku-libs/haikuwebkit/patches/haikuwebkit-1.8.2.patchset +++ /dev/null @@ -1,138 +0,0 @@ -From 6697a67df8732d632161fefdab4ba1523c7d567e Mon Sep 17 00:00:00 2001 -From: madmax -Date: Wed, 21 Jul 2021 20:22:05 +0000 -Subject: [PATCH 3/3] haikuwebkit: Fix font disappearing issue - ---- - Source/WebCore/rendering/TextPainter.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Source/WebCore/rendering/TextPainter.h b/Source/WebCore/rendering/TextPainter.h -index e4534cbfbf..155cc8ad97 100644 ---- a/Source/WebCore/rendering/TextPainter.h -+++ b/Source/WebCore/rendering/TextPainter.h -@@ -64,10 +64,10 @@ public: - template - void setGlyphDisplayListIfNeeded(const LayoutRun& run, const PaintInfo& paintInfo, const FontCascade& font, GraphicsContext& context, const TextRun& textRun) - { -- if (!TextPainter::shouldUseGlyphDisplayList(paintInfo)) -+ //if (!TextPainter::shouldUseGlyphDisplayList(paintInfo)) - TextPainter::removeGlyphDisplayList(run); -- else -- m_glyphDisplayList = GlyphDisplayListCache::singleton().get(run, font, context, textRun); -+ //else -+ // m_glyphDisplayList = GlyphDisplayListCache::singleton().get(run, font, context, textRun); - } - - template --- -2.30.2 - -From cdc3353930344f26b6c356d749011d884d5255c9 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Tue, 20 Jul 2021 21:55:51 +0200 -Subject: [PATCH] Fix downloads not ending. - -Fixes #17087. ---- - Source/WebKitLegacy/haiku/API/WebDownloadPrivate.cpp | 5 +++++ - Source/WebKitLegacy/haiku/API/WebDownloadPrivate.h | 1 + - 2 files changed, 6 insertions(+) - -diff --git a/Source/WebKitLegacy/haiku/API/WebDownloadPrivate.cpp b/Source/WebKitLegacy/haiku/API/WebDownloadPrivate.cpp -index 84af616428..6624918f75 100644 ---- a/Source/WebKitLegacy/haiku/API/WebDownloadPrivate.cpp -+++ b/Source/WebKitLegacy/haiku/API/WebDownloadPrivate.cpp -@@ -134,6 +134,11 @@ void WebDownloadPrivate::didReceiveData(ResourceHandle*, const uint8_t* data, un - m_progressListener.SendMessage(&message); - } - -+void WebDownloadPrivate::didFinishLoading(ResourceHandle* handle, const WebCore::NetworkLoadMetrics&) -+{ -+ handleFinished(handle, B_DOWNLOAD_FINISHED); -+} -+ - void WebDownloadPrivate::didFail(ResourceHandle* handle, const ResourceError& /*error*/) - { - handleFinished(handle, B_DOWNLOAD_FAILED); -diff --git a/Source/WebKitLegacy/haiku/API/WebDownloadPrivate.h b/Source/WebKitLegacy/haiku/API/WebDownloadPrivate.h -index bc130966d3..ce881dcbf2 100644 ---- a/Source/WebKitLegacy/haiku/API/WebDownloadPrivate.h -+++ b/Source/WebKitLegacy/haiku/API/WebDownloadPrivate.h -@@ -62,6 +62,7 @@ public: - // ResourceHandleClient implementation - virtual void didReceiveResponseAsync(ResourceHandle*, ResourceResponse&&, WTF::CompletionHandler&&) override; - virtual void didReceiveData(ResourceHandle*, const uint8_t*, unsigned, int) override; -+ virtual void didFinishLoading(ResourceHandle*, const WebCore::NetworkLoadMetrics&) override; - virtual void didFail(ResourceHandle*, const ResourceError&) override; - virtual void wasBlocked(ResourceHandle*) override; - virtual void cannotShowURL(ResourceHandle*) override; --- -2.30.2 - -From 2aea0ad0c51a4c8dd3234c614d66b7392fd80fec Mon Sep 17 00:00:00 2001 -From: Pascal Abresch -Date: Mon, 19 Jul 2021 16:05:53 +0200 -Subject: [PATCH] Add dark mode support to directoy view template - ---- - .../resources/Directory Listing Template.html | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/Source/WebCore/platform/haiku/resources/Directory Listing Template.html b/Source/WebCore/platform/haiku/resources/Directory Listing Template.html -index e77fcb000d19..b93cdeb2c592 100644 ---- a/Source/WebCore/platform/haiku/resources/Directory Listing Template.html -+++ b/Source/WebCore/platform/haiku/resources/Directory Listing Template.html -@@ -1,8 +1,20 @@ - - -