haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-20 10:40:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt5: fix QSharedMemory, switch to llvm12

Browse Source
This commit is contained in:
Gerasim Troeglazov
2022-06-07 22:02:40 +10:00
parent 8524808a03
commit 85a95ff1b8
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev-qt/qt5/patches/qtbase-5.15.2.patchset
View File

@@ -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) {

15
dev-qt/qt5/qt5-5.15.2.recipe
View File

@@ -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