From 19310cf234c1a0a68682a68620b58d084afa0ad8 Mon Sep 17 00:00:00 2001
From: ovf <ovf@mm.st>
Date: Thu, 6 Feb 2025 21:20:12 +0000
Subject: [PATCH] testing/qt-creator: upgrade to 15.0.1
---
testing/qt-creator/APKBUILD | 15 +++++++++------
testing/qt-creator/fix-execinfo.patch | 4 ++--
testing/qt-creator/fix-malloc-trim.patch | 6 +++---
3 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/testing/qt-creator/APKBUILD b/testing/qt-creator/APKBUILD
index d5b2d3f4621e..d7d650f07d36 100644
--- a/testing/qt-creator/APKBUILD
+++ b/testing/qt-creator/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Alexey Minnekhanov <alexeymin@postmarketos.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=qt-creator
-pkgver=14.0.1
+pkgver=15.0.1
pkgrel=0
pkgdesc="Lightweight and cross-platform C++ IDE"
url="https://qt-project.org/wiki/Category:Tools::QtCreator"
@@ -12,18 +12,20 @@ depends="
qt6-qtbase-dev
qt6-qttools-dev
"
-_llvmver=18
+_llvmver=19
makedepends="
clang$_llvmver-dev
clang$_llvmver-static
cmake
elfutils-dev
+ libsecret-dev
lld
llvm$_llvmver-dev
llvm$_llvmver-gtest
llvm$_llvmver-static
qt6-qt5compat-dev
qt6-qtdeclarative-dev
+ qt6-qtdeclarative-private-dev
qt6-qtquick3d-dev
qt6-qtserialport-dev
qt6-qtshadertools-dev
@@ -64,7 +66,8 @@ build() {
-DBUILD_PLUGIN_CLANGFORMAT=OFF \
-DBUILD_PLUGIN_COPILOT=OFF \
-DBUILD_WITH_PCH=OFF \
- -DCLANGTOOLING_LINK_CLANG_DYLIB=ON
+ -DCLANGTOOLING_LINK_CLANG_DYLIB=ON \
+ -DQTC_CLANG_BUILDMODE_MATCH=ON
cmake --build build
}
@@ -73,7 +76,7 @@ package() {
}
sha512sums="
-5ceacce80cd5cdef99606ca371134e5e8a5897b67ff1a52d202449e74e817bce22ee31b029b6f8643e19700742ddd8e616a48f005aae0720f200c3b03f8eab9a qt-creator-opensource-src-14.0.1.tar.xz
-43d73c9cd272ee849a5d85490d351c71b786d7ce6b5b46c6ec13642329c14bacc84a122f0bfbb445841aedef8d1cc9fe2485c0c8db24080b5a9dd4380e36c58d fix-execinfo.patch
-efb137318e7005beb4c01cb27dcfc49d63b5c6faa66b0a6d6989bb6533ca94875e34880c482ce36f699dadf920b55a3de43eeed4fa5cf98d1b56405ee2ff0aa5 fix-malloc-trim.patch
+fb3d75187607c57438beb9ec65c932e3abfd15566d8d11d612b7aa087b9df44d12d18138fbd61ece61ebc29be6d14d1ded3cd1deb1d946bd7d96f2ef2060f853 qt-creator-opensource-src-15.0.1.tar.xz
+4771f6ea03ba03406cb6287ec24a6036c246e8b8af71af8befaf8c65ee99b56dd24937f044e32c451bcd4b0905164dfd08982b9bb03c8106bd994c39818100b8 fix-execinfo.patch
+e629a306c9d40583e059155b9cfc460434c9b2e29ce82e3b453f92a04c3897b57cf452150d14204cad6baca1f5a905a3b39b3f99691564c0d525257c3bb21aec fix-malloc-trim.patch
"
diff --git a/testing/qt-creator/fix-execinfo.patch b/testing/qt-creator/fix-execinfo.patch
index c4577ed644ee..b4f406494477 100644
--- a/testing/qt-creator/fix-execinfo.patch
+++ b/testing/qt-creator/fix-execinfo.patch
@@ -23,8 +23,8 @@ index d371b6f6..1db95aad 100644
char **lines = backtrace_symbols(bt, size);
diff --git a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp
index ba8afd56..4040dc6a 100644
---- a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp
-+++ b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp
+--- a/src/plugins/qmldesigner/libs/designercore/exceptions/exception.cpp
++++ b/src/plugins/qmldesigner/libs/designercore/exceptions/exception.cpp
@@ -4,7 +4,9 @@
#include "exception.h"
diff --git a/testing/qt-creator/fix-malloc-trim.patch b/testing/qt-creator/fix-malloc-trim.patch
index 2261b0519d99..4b60f880d5f9 100644
--- a/testing/qt-creator/fix-malloc-trim.patch
+++ b/testing/qt-creator/fix-malloc-trim.patch
@@ -1,8 +1,8 @@
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
-@@ -1274,7 +1274,7 @@
- m_trimTimer.setSingleShot(true);
- m_trimTimer.setInterval(60000);
+@@ -1414,7 +1414,7 @@
+ using namespace std::chrono_literals;
+ m_trimTimer.setInterval(60s);
// glibc may not actually free memory in free().
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) && defined(__GLIBC__)
--
GitLab