diff --git a/dev-qt/qtwebkit/patches/qtwebkit-5.212.0~pre20180120.patchset b/dev-qt/qtwebkit/patches/qtwebkit-5.212.0~pre20180120.patchset index f1a891072..8d89f1132 100644 --- a/dev-qt/qtwebkit/patches/qtwebkit-5.212.0~pre20180120.patchset +++ b/dev-qt/qtwebkit/patches/qtwebkit-5.212.0~pre20180120.patchset @@ -4,6 +4,55 @@ Date: Mon, 30 Jul 2018 20:43:21 +1000 Subject: Fix build for Haiku +diff --git a/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp b/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp +index 8e93a7e..0d4c02d 100644 +--- a/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp ++++ b/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp +@@ -4397,7 +4397,7 @@ bool ByteCodeParser::parseBlock(unsigned limit) + nodeType = GetGlobalVar; + else + nodeType = GetGlobalLexicalVariable; +- Node* value = addToGraph(nodeType, OpInfo(operand), OpInfo(prediction)); ++ Node* value = addToGraph(nodeType, OpInfo((void*)operand), OpInfo(prediction)); + if (resolveType == GlobalLexicalVar || resolveType == GlobalLexicalVarWithVarInjectionChecks) + addToGraph(CheckNotEmpty, value); + set(VirtualRegister(dst), value); +@@ -4427,7 +4427,7 @@ bool ByteCodeParser::parseBlock(unsigned limit) + } + SpeculatedType prediction = getPrediction(); + set(VirtualRegister(dst), +- addToGraph(GetClosureVar, OpInfo(operand), OpInfo(prediction), scopeNode)); ++ addToGraph(GetClosureVar, OpInfo((void*)operand), OpInfo(prediction), scopeNode)); + break; + } + case UnresolvedProperty: +@@ -4500,7 +4500,7 @@ bool ByteCodeParser::parseBlock(unsigned limit) + case GlobalVarWithVarInjectionChecks: { + if (getPutInfo.initializationMode() != Initialization && (resolveType == GlobalLexicalVar || resolveType == GlobalLexicalVarWithVarInjectionChecks)) { + SpeculatedType prediction = SpecEmpty; +- Node* value = addToGraph(GetGlobalLexicalVariable, OpInfo(operand), OpInfo(prediction)); ++ Node* value = addToGraph(GetGlobalLexicalVariable, OpInfo((void*)operand), OpInfo(prediction)); + addToGraph(CheckNotEmpty, value); + } + +@@ -4510,7 +4510,7 @@ bool ByteCodeParser::parseBlock(unsigned limit) + ASSERT_UNUSED(entry, watchpoints == entry.watchpointSet()); + } + Node* valueNode = get(VirtualRegister(value)); +- addToGraph(PutGlobalVariable, OpInfo(operand), weakJSConstant(scopeObject), valueNode); ++ addToGraph(PutGlobalVariable, OpInfo((void*)operand), weakJSConstant(scopeObject), valueNode); + if (watchpoints && watchpoints->state() != IsInvalidated) { + // Must happen after the store. See comment for GetGlobalVar. + addToGraph(NotifyWrite, OpInfo(watchpoints)); +@@ -4525,7 +4525,7 @@ bool ByteCodeParser::parseBlock(unsigned limit) + Node* scopeNode = get(VirtualRegister(scope)); + Node* valueNode = get(VirtualRegister(value)); + +- addToGraph(PutClosureVar, OpInfo(operand), scopeNode, valueNode); ++ addToGraph(PutClosureVar, OpInfo((void*)operand), scopeNode, valueNode); + + if (watchpoints && watchpoints->state() != IsInvalidated) { + // Must happen after the store. See comment for GetGlobalVar. diff --git a/Source/JavaScriptCore/heap/HeapStatistics.cpp b/Source/JavaScriptCore/heap/HeapStatistics.cpp index 12d12ce..15ed177 100644 --- a/Source/JavaScriptCore/heap/HeapStatistics.cpp diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0~pre20180120.recipe b/dev-qt/qtwebkit/qtwebkit-5.212.0~pre20180120.recipe index f72401d8d..65d5f6ec5 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0~pre20180120.recipe +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0~pre20180120.recipe @@ -9,7 +9,7 @@ HOMEPAGE="https://www.qt.io" COPYRIGHT="2015-2018 The Qt Company Ltd." LICENSE="BSD (3-clause) GNU LGPL v2.1" -REVISION="4" +REVISION="5" srcGitRev="72cfbd7664f21fcc0e62b869a6b01bf73eb5e7da" SOURCE_URI="https://github.com/qt/qtwebkit/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="2e393e7429387437cbfef56ec839329663e9b136ea68997d1e1cdd2f4d9d3ae0" @@ -36,37 +36,11 @@ REQUIRES=" lib:libglib_2.0$secondaryArchSuffix lib:libglu$secondaryArchSuffix lib:libgnutls$secondaryArchSuffix - lib:libgstadaptivedemux_1.0$secondaryArchSuffix - lib:libgstallocators_1.0$secondaryArchSuffix - lib:libgstapp_1.0$secondaryArchSuffix - lib:libgstaudio_1.0$secondaryArchSuffix - lib:libgstbadaudio_1.0$secondaryArchSuffix - lib:libgstbadvideo_1.0$secondaryArchSuffix - lib:libgstbase_1.0$secondaryArchSuffix - lib:libgstbasecamerabinsrc_1.0$secondaryArchSuffix - lib:libgstcodecparsers_1.0$secondaryArchSuffix - lib:libgstcontroller_1.0$secondaryArchSuffix - lib:libgstfft_1.0$secondaryArchSuffix - lib:libgstinsertbin_1.0$secondaryArchSuffix - lib:libgstmpegts_1.0$secondaryArchSuffix - lib:libgstnet_1.0$secondaryArchSuffix - lib:libgstpbutils_1.0$secondaryArchSuffix - lib:libgstphotography_1.0$secondaryArchSuffix - lib:libgstplayer_1.0$secondaryArchSuffix - lib:libgstreamer_1.0$secondaryArchSuffix - lib:libgstriff_1.0$secondaryArchSuffix - lib:libgstrtp_1.0$secondaryArchSuffix - lib:libgstrtsp_1.0$secondaryArchSuffix - lib:libgstsdp_1.0$secondaryArchSuffix - lib:libgsttag_1.0$secondaryArchSuffix - lib:libgsturidownloader_1.0$secondaryArchSuffix - lib:libgstvideo_1.0$secondaryArchSuffix lib:libhyphen$secondaryArchSuffix lib:libicudata$secondaryArchSuffix lib:libicui18n$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix - lib:liborc_0.4$secondaryArchSuffix lib:libpng16$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix @@ -114,17 +88,10 @@ BUILD_REQUIRES=" devel:libglib_2.0$secondaryArchSuffix devel:libglu$secondaryArchSuffix devel:libgnutls$secondaryArchSuffix >= 30 - devel:libgstapp_1.0$secondaryArchSuffix - devel:libgstaudio_1.0$secondaryArchSuffix - devel:libgstbadaudio_1.0$secondaryArchSuffix - devel:libgstbadvideo_1.0$secondaryArchSuffix - devel:libgstreamer_1.0$secondaryArchSuffix - devel:libgstvideo_1.0$secondaryArchSuffix devel:libhyphen$secondaryArchSuffix devel:libicuuc$secondaryArchSuffix devel:libintl$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix - devel:liborc_0.4$secondaryArchSuffix devel:libpcre2_16$secondaryArchSuffix devel:libpng$secondaryArchSuffix devel:libQt5Core$secondaryArchSuffix @@ -190,9 +157,9 @@ BUILD() -DENABLE_SUBTLE_CRYPTO=ON \ -DENABLE_FULLSCREEN_API=ON \ -DENABLE_SHADOW_DOM=ON \ - -DUSE_GSTREAMER=ON \ + -DUSE_GSTREAMER=OFF \ -DUSE_LIBHYPHEN=ON \ - -DUSE_QT_MULTIMEDIA=OFF \ + -DUSE_QT_MULTIMEDIA=ON \ -DUSE_SYSTEM_MALLOC=ON make $jobArgs }