diff --git a/dev-qt/qt6-declarative/patches/qt6_declarative-6.2.2.patchset b/dev-qt/qt6-declarative/patches/qt6_declarative-6.3.0.patchset similarity index 62% rename from dev-qt/qt6-declarative/patches/qt6_declarative-6.2.2.patchset rename to dev-qt/qt6-declarative/patches/qt6_declarative-6.3.0.patchset index 5d15621ba..68a56e664 100644 --- a/dev-qt/qt6-declarative/patches/qt6_declarative-6.2.2.patchset +++ b/dev-qt/qt6-declarative/patches/qt6_declarative-6.3.0.patchset @@ -1,13 +1,13 @@ -From 6ba4df1b638c2f673213628c3da6389bd20a26e8 Mon Sep 17 00:00:00 2001 +From 77245c0d2915122b2dcb921afbd4b3dff4203993 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Fri, 1 Oct 2021 14:52:01 +1000 +Date: Thu, 28 Apr 2022 20:38:53 +1000 Subject: Fix for Haiku -diff --git a/qtdeclarative/src/3rdparty/masm/wtf/PageBlock.cpp b/qtdeclarative/src/3rdparty/masm/wtf/PageBlock.cpp -index bc0e8d6..8b62344 100644 ---- a/qtdeclarative/src/3rdparty/masm/wtf/PageBlock.cpp -+++ b/qtdeclarative/src/3rdparty/masm/wtf/PageBlock.cpp +diff --git a/src/3rdparty/masm/wtf/PageBlock.cpp b/src/3rdparty/masm/wtf/PageBlock.cpp +index 28d4239..9559e3b 100644 +--- a/src/3rdparty/masm/wtf/PageBlock.cpp ++++ b/src/3rdparty/masm/wtf/PageBlock.cpp @@ -40,7 +40,14 @@ namespace WTF { static size_t s_pageSize; static size_t s_pageMask; @@ -24,10 +24,10 @@ index bc0e8d6..8b62344 100644 inline size_t systemPageSize() { -diff --git a/qtdeclarative/src/3rdparty/masm/wtf/Platform.h b/qtdeclarative/src/3rdparty/masm/wtf/Platform.h +diff --git a/src/3rdparty/masm/wtf/Platform.h b/src/3rdparty/masm/wtf/Platform.h index 29decfa..1dbd001 100644 ---- a/qtdeclarative/src/3rdparty/masm/wtf/Platform.h -+++ b/qtdeclarative/src/3rdparty/masm/wtf/Platform.h +--- a/src/3rdparty/masm/wtf/Platform.h ++++ b/src/3rdparty/masm/wtf/Platform.h @@ -418,6 +418,11 @@ #define WTF_OS_QNX 1 #endif @@ -48,10 +48,10 @@ index 29decfa..1dbd001 100644 || OS(NETBSD) \ || OS(OPENBSD) \ || OS(QNX) \ -diff --git a/qtdeclarative/src/qml/jit/qv4assemblercommon_p.h b/qtdeclarative/src/qml/jit/qv4assemblercommon_p.h +diff --git a/src/qml/jit/qv4assemblercommon_p.h b/src/qml/jit/qv4assemblercommon_p.h index c91a61a..61c9ffd 100644 ---- a/qtdeclarative/src/qml/jit/qv4assemblercommon_p.h -+++ b/qtdeclarative/src/qml/jit/qv4assemblercommon_p.h +--- a/src/qml/jit/qv4assemblercommon_p.h ++++ b/src/qml/jit/qv4assemblercommon_p.h @@ -66,7 +66,7 @@ namespace QV4 { namespace JIT { diff --git a/dev-qt/qt6-declarative/qt6_declarative-6.2.2.recipe b/dev-qt/qt6-declarative/qt6_declarative-6.3.0.recipe similarity index 92% rename from dev-qt/qt6-declarative/qt6_declarative-6.2.2.recipe rename to dev-qt/qt6-declarative/qt6_declarative-6.3.0.recipe index 05912e189..cbdfbf506 100644 --- a/dev-qt/qt6-declarative/qt6_declarative-6.2.2.recipe +++ b/dev-qt/qt6-declarative/qt6_declarative-6.3.0.recipe @@ -4,13 +4,13 @@ used for developing software with a graphical user interface, and also used \ for developing non-GUI programs such as command-line tools and consoles for \ servers." HOMEPAGE="https://qt.io/" -COPYRIGHT="2015-2021 The Qt Company Ltd." +COPYRIGHT="2015-2022 The Qt Company Ltd." LICENSE="GNU LGPL v2.1 GNU LGPL v3 GNU FDL v1" REVISION="1" SOURCE_URI="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/submodules/qtdeclarative-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256="1a04ef0092b31354e0fded0d8391865719cb58f9ca5dc604da2b1f62c742cf28" +CHECKSUM_SHA256="d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37" SOURCE_DIR="qtdeclarative-everywhere-src-$portVersion" PATCHES="qt6_declarative-$portVersion.patchset" @@ -70,8 +70,8 @@ PROVIDES_devel=" devel:libQt6QmlCompiler$secondaryArchSuffix = $portVersion compat >= 6 devel:libQt6QmlCore$secondaryArchSuffix = $portVersion compat >= 6 devel:libQt6QmlDebug$secondaryArchSuffix = $portVersion compat >= 6 - devel:libQt6QmlDevTools$secondaryArchSuffix = $portVersion compat >= 6 devel:libQt6QmlDom$secondaryArchSuffix = $portVersion compat >= 6 + devel:libQt6QmlLint$secondaryArchSuffix = $portVersion compat >= 6 devel:libQt6QmlLocalStorage$secondaryArchSuffix = $portVersion compat >= 6 devel:libQt6QmlModels$secondaryArchSuffix = $portVersion compat >= 6 devel:libQt6QmlWorkerScript$secondaryArchSuffix = $portVersion compat >= 6 @@ -148,19 +148,23 @@ INSTALL() libQt6QuickDialogs2 libQt6QuickDialogs2QuickImpl libQt6QuickDialogs2Utils \ libQt6QuickLayouts libQt6QuickParticles libQt6QuickShapes libQt6QuickTemplates2 \ libQt6QuickTestUtils libQt6QuickTest libQt6QuickWidgets libQt6PacketProtocol \ - libQt6QmlCompiler libQt6QmlDebug libQt6QmlDevTools libQt6QmlDom + libQt6QmlCompiler libQt6QmlDebug libQt6QmlDom libQt6QmlLint # fix static lib paths sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \ - $libDir/cmake/Qt6QmlDevToolsPrivate/Qt6QmlDevToolsPrivateTargets-release.cmake - sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \ - $libDir/cmake/Qt6QmlDomPrivate/Qt6QmlDomPrivateTargets-release.cmake - sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \ - $libDir/cmake/Qt6QmlDebugPrivate/Qt6QmlDebugPrivateTargets-release.cmake + $libDir/cmake/Qt6PacketProtocolPrivate/Qt6PacketProtocolPrivateTargets-release.cmake sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \ $libDir/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateTargets-release.cmake sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \ - $libDir/cmake/Qt6PacketProtocolPrivate/Qt6PacketProtocolPrivateTargets-release.cmake + $libDir/cmake/Qt6QmlDebugPrivate/Qt6QmlDebugPrivateTargets-release.cmake + sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \ + $libDir/cmake/Qt6QmlDomPrivate/Qt6QmlDomPrivateTargets-release.cmake + sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \ + $libDir/cmake/Qt6QmlLintPrivate/Qt6QmlLintPrivateTargets-release.cmake + sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \ + $libDir/cmake/Qt6QuickControlsTestUtilsPrivate/Qt6QuickControlsTestUtilsPrivateTargets-release.cmake + sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \ + $libDir/cmake/Qt6QuickTestUtilsPrivate/Qt6QuickTestUtilsPrivateTargets-release.cmake cd $libDir for i in lib*.so.6.*;do