diff --git a/dev-qt/qtwebkit/patches/qtwebkit-5.212.0~pre20200414.patchset b/dev-qt/qtwebkit/patches/qtwebkit-5.212.0~pre20200915.patchset similarity index 95% rename from dev-qt/qtwebkit/patches/qtwebkit-5.212.0~pre20200414.patchset rename to dev-qt/qtwebkit/patches/qtwebkit-5.212.0~pre20200915.patchset index 27f433717..748706621 100644 --- a/dev-qt/qtwebkit/patches/qtwebkit-5.212.0~pre20200414.patchset +++ b/dev-qt/qtwebkit/patches/qtwebkit-5.212.0~pre20200915.patchset @@ -1,6 +1,6 @@ -From d39fe82000e57ce4db57d215bfe6ec6b33ca5e29 Mon Sep 17 00:00:00 2001 +From 1c69b331947d4c1ea52189746e095aca04fbe040 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Thu, 13 Jun 2019 00:00:43 +1000 +Date: Fri, 19 Jun 2020 21:33:30 +1000 Subject: Add Haiku support @@ -67,73 +67,43 @@ index 12d12ce..15ed177 100644 void HeapStatistics::initialize() { diff --git a/Source/JavaScriptCore/heap/MachineStackMarker.cpp b/Source/JavaScriptCore/heap/MachineStackMarker.cpp -index 883914f..0a554d8 100644 +index 883914f..63fdb56 100644 --- a/Source/JavaScriptCore/heap/MachineStackMarker.cpp +++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp -@@ -58,6 +58,10 @@ - #include +@@ -62,6 +62,12 @@ + #include #endif +#if OS(HAIKU) -+#include ++extern "C" { ++ int pthread_attr_get_np(pthread_t thread, pthread_attr_t *_attr); ++} +#endif + - #if HAVE(PTHREAD_NP_H) - #include - #endif -@@ -481,6 +485,10 @@ size_t MachineThreads::Thread::getRegisters(Thread::Registers& registers) - regs.ContextFlags = CONTEXT_INTEGER | CONTEXT_CONTROL; - GetThreadContext(platformThreadHandle, ®s); + #if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN) + #include + +@@ -483,7 +489,7 @@ size_t MachineThreads::Thread::getRegisters(Thread::Registers& registers) return sizeof(CONTEXT); -+#elif OS(HAIKU) -+ thread_id haikuThread = get_pthread_thread_id(platformThread); -+ get_thread_info(haikuThread, ®s); -+ return sizeof(thread_info); #elif USE(PTHREADS) pthread_attr_init(®s.attribute); - #if HAVE(PTHREAD_NP_H) || OS(NETBSD) -@@ -534,6 +542,8 @@ void* MachineThreads::Thread::Registers::stackPointer() const - #endif // __DARWIN_UNIX03 - - // end OS(DARWIN) -+#elif OS(HAIKU) -+ return reinterpret_cast(regs.stack_base); - #elif OS(WINDOWS) - - #if CPU(ARM) -@@ -864,7 +874,7 @@ void* MachineThreads::Thread::Registers::llintPC() const - void MachineThreads::Thread::freeRegisters(Thread::Registers& registers) - { - Thread::Registers::PlatformRegisters& regs = registers.regs; --#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN) -+#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN) && !OS(HAIKU) - pthread_attr_destroy(®s.attribute); - #else - UNUSED_PARAM(regs); +-#if HAVE(PTHREAD_NP_H) || OS(NETBSD) ++#if HAVE(PTHREAD_NP_H) || OS(NETBSD) || OS(HAIKU) + #if !OS(OPENBSD) + // e.g. on FreeBSD 5.4, neundorf@kde.org + pthread_attr_get_np(platformThread, ®s.attribute); diff --git a/Source/JavaScriptCore/heap/MachineStackMarker.h b/Source/JavaScriptCore/heap/MachineStackMarker.h -index a16f0da..9c48fb1 100644 +index a16f0da..1591989 100644 --- a/Source/JavaScriptCore/heap/MachineStackMarker.h +++ b/Source/JavaScriptCore/heap/MachineStackMarker.h -@@ -31,6 +31,10 @@ +@@ -31,6 +31,7 @@ #include #endif -+#if OS(HAIKU) -+#include -+#endif + #if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN) #include #include -@@ -106,6 +110,8 @@ public: - - #elif OS(WINDOWS) - typedef CONTEXT PlatformRegisters; -+#elif OS(HAIKU) -+ typedef thread_info PlatformRegisters; - #elif USE(PTHREADS) - struct PlatformRegisters { - pthread_attr_t attribute; diff --git a/Source/ThirdParty/ANGLE/src/common/platform.h b/Source/ThirdParty/ANGLE/src/common/platform.h index 56db297..c98bfdd 100644 --- a/Source/ThirdParty/ANGLE/src/common/platform.h @@ -231,56 +201,33 @@ index f84716e..ca7c266 100644 } diff --git a/Source/WTF/wtf/StackBounds.cpp b/Source/WTF/wtf/StackBounds.cpp -index f308ac1..f33a676 100644 +index f308ac1..2cde905 100644 --- a/Source/WTF/wtf/StackBounds.cpp +++ b/Source/WTF/wtf/StackBounds.cpp -@@ -31,6 +31,10 @@ - - #include - -+#elif OS(HAIKU) -+ -+#include -+ - #elif OS(SOLARIS) - - #include -@@ -46,6 +50,16 @@ - - namespace WTF { +@@ -42,6 +42,12 @@ + #include + #endif +#if OS(HAIKU) -+ -+static const ptrdiff_t estimateStackSize = 128 * sizeof(void*) *1024; -+static void* estimateStackBound(void *origin) -+{ -+ return static_cast(origin) - estimateStackSize; ++extern "C" { ++ int pthread_attr_get_np(pthread_t thread, pthread_attr_t *_attr); +} -+ +#endif + - #if OS(DARWIN) - - void StackBounds::initialize() -@@ -90,6 +104,16 @@ void StackBounds::initialize() #endif - } -+#elif OS(HAIKU) -+ -+void StackBounds::initialize() -+{ -+ thread_info threadInfo; -+ get_thread_info(find_thread(NULL), &threadInfo); -+ m_origin = threadInfo.stack_end; -+ m_bound = estimateStackBound(m_origin); -+} -+ - #elif OS(UNIX) - - void StackBounds::initialize() + namespace WTF { +@@ -100,7 +106,7 @@ void StackBounds::initialize() + pthread_t thread = pthread_self(); + pthread_attr_t sattr; + pthread_attr_init(&sattr); +-#if HAVE(PTHREAD_NP_H) || OS(NETBSD) ++#if HAVE(PTHREAD_NP_H) || OS(NETBSD) || OS(HAIKU) + // e.g. on FreeBSD 5.4, neundorf@kde.org + pthread_attr_get_np(thread, &sattr); + #else diff --git a/Source/WebCore/PlatformQt.cmake b/Source/WebCore/PlatformQt.cmake -index cd2e79d..501636a 100644 +index 99c625d..2e235f4 100644 --- a/Source/WebCore/PlatformQt.cmake +++ b/Source/WebCore/PlatformQt.cmake @@ -79,7 +79,8 @@ list(APPEND WebCore_SOURCES @@ -1508,10 +1455,10 @@ index f53fe51..9f69a31 100644 }; diff --git a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp -index df28e9f..b9abc0b 100644 +index 841d054..1fef346 100644 --- a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp +++ b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp -@@ -964,6 +964,9 @@ void QWebFrameAdapter::setViewportSize(const QSize& size) +@@ -965,6 +965,9 @@ void QWebFrameAdapter::setViewportSize(const QSize& size) if (view->needsLayout()) view->layout(); view->adjustViewSize(); @@ -1552,10 +1499,10 @@ index 694a759..aa701e8 100644 #endif RefPtr protector(this); diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake -index ac1065d..3b9790d 100644 +index 39fb23b..855d5c3 100644 --- a/Source/cmake/OptionsQt.cmake +++ b/Source/cmake/OptionsQt.cmake -@@ -717,6 +717,13 @@ if (ENABLE_X11_TARGET) +@@ -760,6 +760,13 @@ if (ENABLE_X11_TARGET) endif () endif () @@ -1570,5 +1517,5 @@ index ac1065d..3b9790d 100644 set(USE_MEDIA_FOUNDATION OFF) set(USE_QT_MULTIMEDIA OFF) -- -2.21.0 +2.26.0 diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0~pre20200414.recipe b/dev-qt/qtwebkit/qtwebkit-5.212.0~pre20200915.recipe similarity index 88% rename from dev-qt/qtwebkit/qtwebkit-5.212.0~pre20200414.recipe rename to dev-qt/qtwebkit/qtwebkit-5.212.0~pre20200915.recipe index ecfec6116..30896dd63 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0~pre20200414.recipe +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0~pre20200915.recipe @@ -9,8 +9,8 @@ HOMEPAGE="https://www.qt.io" COPYRIGHT="2015-2020 The Qt Company Ltd." LICENSE="BSD (3-clause) GNU LGPL v2.1" -REVISION="3" -srcGitRev="10cd6a106e1c461c774ca166a67b8c835c755ef7" +REVISION="1" +srcGitRev="08eaf858c99ad6be4eaa0d97509a3400eb5186f2" SOURCE_URI="https://github.com/qt/qtwebkit/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="62987f4b5b08b8fa409dc38387da261e5447880aaa884843a97e77cb2248ed9d" SOURCE_DIR="qtwebkit-$srcGitRev" @@ -29,6 +29,7 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix + lib:libenchant_2$secondaryArchSuffix lib:libfontconfig$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libgcrypt$secondaryArchSuffix @@ -37,9 +38,9 @@ REQUIRES=" lib:libglu$secondaryArchSuffix lib:libgnutls$secondaryArchSuffix lib:libhyphen$secondaryArchSuffix - lib:libicudata$secondaryArchSuffix >= 66 - lib:libicui18n$secondaryArchSuffix >= 66 - lib:libicuuc$secondaryArchSuffix >= 66 + lib:libicudata$secondaryArchSuffix + lib:libicui18n$secondaryArchSuffix + lib:libicuuc$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng16$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix @@ -80,6 +81,7 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libcrypto$secondaryArchSuffix devel:libegl$secondaryArchSuffix + devel:libenchant_2$secondaryArchSuffix devel:libfontconfig$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libgcc$secondaryArchSuffix @@ -89,7 +91,7 @@ BUILD_REQUIRES=" devel:libglu$secondaryArchSuffix devel:libgnutls$secondaryArchSuffix >= 30 devel:libhyphen$secondaryArchSuffix - devel:libicuuc$secondaryArchSuffix >= 66 + devel:libicuuc$secondaryArchSuffix devel:libintl$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpcre2_16$secondaryArchSuffix @@ -157,7 +159,21 @@ BUILD() -DENABLE_SUBTLE_CRYPTO=ON \ -DENABLE_FULLSCREEN_API=ON \ -DENABLE_SHADOW_DOM=ON \ - -DENABLE_DFG_JIT=OFF \ + -DENABLE_JIT=ON \ + -DENABLE_DFG_JIT=ON \ + -DENABLE_SPELLCHECK=ON \ + -DENABLE_INDEXED_DATABASE=ON \ + -DENABLE_INPUT_TYPE_DATE=ON \ + -DENABLE_INPUT_TYPE_TIME=ON \ + -DENABLE_INPUT_TYPE_MONTH=ON \ + -DENABLE_INPUT_TYPE_WEEK=ON \ + -DENABLE_INPUT_TYPE_DATETIMELOCAL=ON \ + -DENABLE_INPUT_TYPE_COLOR=ON \ + -DENABLE_CUSTOM_ELEMENTS=ON \ + -DENABLE_WEB_ANIMATIONS=ON \ + -DENABLE_FETCH_API=ON \ + -DENABLE_PDFKIT_PLUGIN=ON \ + -DENABLE_WEBGL=ON \ -DUSE_GSTREAMER=OFF \ -DUSE_LIBHYPHEN=ON \ -DUSE_QT_MULTIMEDIA=ON \