From 85a95ff1b8302ccd75bbbe5f64e89aed321da604 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 7 Jun 2022 22:02:40 +1000 Subject: [PATCH] qt5: fix QSharedMemory, switch to llvm12 --- dev-qt/qt5/patches/qtbase-5.15.2.patchset | 2 +- dev-qt/qt5/qt5-5.15.2.recipe | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dev-qt/qt5/patches/qtbase-5.15.2.patchset b/dev-qt/qt5/patches/qtbase-5.15.2.patchset index 5a6cf3d36..b95a40062 100644 --- a/dev-qt/qt5/patches/qtbase-5.15.2.patchset +++ b/dev-qt/qt5/patches/qtbase-5.15.2.patchset @@ -1034,7 +1034,7 @@ index 0000000..afc24ed + } + + hand = create_area(areaName.toUtf8().constData(), &memory, B_ANY_ADDRESS, size, -+ B_NO_LOCK, B_READ_AREA | B_WRITE_AREA); ++ B_NO_LOCK, B_READ_AREA | B_WRITE_AREA | B_CLONEABLE_AREA); + + if (hand <= B_ERROR) { + switch (hand) { diff --git a/dev-qt/qt5/qt5-5.15.2.recipe b/dev-qt/qt5/qt5-5.15.2.recipe index ecfb29190..74ef3165c 100644 --- a/dev-qt/qt5/qt5-5.15.2.recipe +++ b/dev-qt/qt5/qt5-5.15.2.recipe @@ -8,8 +8,9 @@ COPYRIGHT="2015-2020 The Qt Company Ltd." LICENSE="GNU LGPL v2.1 GNU LGPL v3 FDL" -REVISION="8" -baseURL="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/submodules" +REVISION="9" +#baseURL="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/submodules" +baseURL="http://qt-mirror.dannhauer.de/official_releases/qt/${portVersion%.*}/$portVersion/submodules/" SOURCE_URI="https://github.com/qt/qt5/archive/$portVersion.tar.gz" CHECKSUM_SHA256="b404979e3ec79afc6484c527246ec919cd0a5b3927d172b321b4598e1de52d69" SOURCE_DIR="qt5-$portVersion" @@ -524,15 +525,15 @@ REQUIRES_tools=" qt5$secondaryArchSuffix == $portVersion base haiku$secondaryArchSuffix lib:libgl$secondaryArchSuffix - lib:libLLVM_9$secondaryArchSuffix + lib:libLLVM_12$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libassimp$secondaryArchSuffix - devel:libclang$secondaryArchSuffix >= 9 - devel:libclanganalysis$secondaryArchSuffix >= 9 - devel:libLLVM_9$secondaryArchSuffix + devel:libclang$secondaryArchSuffix >= 12 + devel:libclanganalysis$secondaryArchSuffix >= 12 + devel:libLLVM_12$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix devel:libdouble_conversion$secondaryArchSuffix >= 3 devel:libegl$secondaryArchSuffix @@ -835,7 +836,7 @@ INSTALL() ln -s $appsDir/Qt5/Linguist $binDir/linguist mv $binDir/qdoc $appsDir/Qt5/qdoc ln -s $appsDir/Qt5/qdoc $binDir/qdoc - cp -f $LLVM_INSTALL_DIR/$relativeDevelopLibDir/libclang.so.9 $appsDir/Qt5/lib + cp -f $LLVM_INSTALL_DIR/$relativeDevelopLibDir/libclang.so.12 $appsDir/Qt5/lib strip $appsDir/Qt5/lib/libclang* toolsCommands="assistant designer lconvert linguist lprodump lrelease lrelease-pro