qt_creator, bump to 16.0.2, wich to LLVM20 (#12424)

This commit is contained in:
Schrijvers Luc
2025-05-26 15:56:41 +02:00
committed by GitHub
parent 0c40675c10
commit d57904fc73
2 changed files with 17 additions and 12 deletions

View File

@@ -1,4 +1,4 @@
From 62e424d9b854ab8512a206a4b0f3e342f6f19b38 Mon Sep 17 00:00:00 2001
From ee9f25819c72d9a1e5f4ed74eab8c7d54e9a285f Mon Sep 17 00:00:00 2001
From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
Date: Fri, 29 Sep 2023 16:03:27 +0000
Subject: Port 6.0.3 changes to 11.0.03
@@ -253,7 +253,7 @@ index 0d3f4bb..08eca93 100644
2.48.1
From 8d244c33676c96af3e8a00b2b5d52373bb3fc526 Mon Sep 17 00:00:00 2001
From fb84058d43745763f870c6d78b829e3bec749079 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 15 Apr 2024 21:42:18 +1000
Subject: nanotrace: haiku support
@@ -291,7 +291,7 @@ index 0006227..75436ad 100644
2.48.1
From a8895e69efe22ca0dd35969ddff23e67fe6999c0 Mon Sep 17 00:00:00 2001
From 7cd4aae5e9c94dc2bf40c82c4fd40e6611e920b5 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 20 Aug 2024 22:53:45 +1000
Subject: Implement ProcessInfo for Haiku
@@ -356,7 +356,7 @@ index 8139eba..565f58c 100644
2.48.1
From c91c68f6010be487647c66c741c91d8ec3090433 Mon Sep 17 00:00:00 2001
From d4772dd26bb7dc73fdd84a03a2f61f17a7b8d478 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 5 Sep 2024 17:25:10 +1000
Subject: Add Haiku provider for AppStatisticsMonitor plugin

View File

@@ -8,7 +8,7 @@ COPYRIGHT="2025 The Qt Company Ltd"
LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="https://download.qt.io/official_releases/qtcreator/${portVersion%.*}/$portVersion/qt-creator-opensource-src-$portVersion.tar.xz"
CHECKSUM_SHA256="125cf5ddf0ce2bd9fb313104ec4772f628aba66d68eb2385081fb226d898312c"
CHECKSUM_SHA256="516cb164ae17ccbf12a9491fa8d53e71bdb63fd8c4c639fa4642d5d44b37d982"
SOURCE_DIR="qt-creator-opensource-src-$portVersion"
PATCHES="qt_creator-$portVersion.patchset"
ADDITIONAL_FILES="qt_creator.rdef.in"
@@ -16,6 +16,8 @@ ADDITIONAL_FILES="qt_creator.rdef.in"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
clangVer="20"
PROVIDES="
qt_creator$secondaryArchSuffix = $portVersion
app:QtCreator$secondaryArchSuffix = $portVersion
@@ -26,7 +28,7 @@ REQUIRES="
lib:libclang_cpp$secondaryArchSuffix
lib:libexecinfo$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libLLVM$secondaryArchSuffix >= 18
lib:libLLVM$secondaryArchSuffix
lib:libQt6Charts$secondaryArchSuffix
lib:libQt6Concurrent$secondaryArchSuffix
lib:libQt6Core$secondaryArchSuffix
@@ -54,11 +56,11 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
qt6_tools${secondaryArchSuffix}_devel
devel:libclang$secondaryArchSuffix >= 18
devel:libclang_cpp$secondaryArchSuffix >= 18
devel:libclang$secondaryArchSuffix >= $clangVer
devel:libclang_cpp$secondaryArchSuffix >= $clangVer
devel:libexecinfo$secondaryArchSuffix
devel:libGL$secondaryArchSuffix
devel:libLLVM_18$secondaryArchSuffix
devel:libLLVM_$clangVer$secondaryArchSuffix
devel:libQt6Charts$secondaryArchSuffix
devel:libQt6Concurrent$secondaryArchSuffix
devel:libQt6Core$secondaryArchSuffix
@@ -68,6 +70,7 @@ BUILD_REQUIRES="
devel:libQt6Gui$secondaryArchSuffix
devel:libQt6Help$secondaryArchSuffix
devel:libQt6Network$secondaryArchSuffix
devel:libomp$secondaryArchSuffix
devel:libQt6OpenGL$secondaryArchSuffix
devel:libQt6PrintSupport$secondaryArchSuffix
devel:libQt6Qml$secondaryArchSuffix
@@ -96,7 +99,9 @@ BUILD_PREREQUIRES="
BUILD()
{
cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -Wno-dev
cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_AUTOGEN_PARALLEL=1 \
-Wno-dev
cmake --build build $jobArgs
}
@@ -105,8 +110,8 @@ INSTALL()
cmake --install build --prefix $appsDir/QtCreator
# Create symlink to libclang
ln -s /system/$relativeDevelopLibDir/libclang.so.18 $appsDir/QtCreator/lib/qtcreator/
ln -s /system/$relativeDevelopLibDir/libclang.so.18 $appsDir/QtCreator/libexec/qtcreator/
ln -s /system/$relativeDevelopLibDir/libclang.so.$clangVer $appsDir/QtCreator/lib/qtcreator/
ln -s /system/$relativeDevelopLibDir/libclang.so.$clangVer $appsDir/QtCreator/libexec/qtcreator/
local APP_SIGNATURE="application/x-vnd.qt6-qtcreator"
local MAJOR="`echo "$portVersion" | cut -d. -f1`"