From 463058faa60d2e7c5ac82c7c2f073def408d09c8 Mon Sep 17 00:00:00 2001 From: psykose Date: Thu, 21 Jul 2022 15:29:56 +0000 Subject: [PATCH] testing/qt-creator: upgrade to 8.0.0 --- testing/qt-creator/APKBUILD | 11 ++++++----- testing/qt-creator/llvm-include.patch | 21 ++++++++++++--------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/testing/qt-creator/APKBUILD b/testing/qt-creator/APKBUILD index 7f67d9f62da..4671f1d1432 100644 --- a/testing/qt-creator/APKBUILD +++ b/testing/qt-creator/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Alexey Minnekhanov # Maintainer: Natanael Copa pkgname=qt-creator -pkgver=7.0.2 -pkgrel=1 +pkgver=8.0.0 +pkgrel=0 pkgdesc="Lightweight and cross-platform C++ IDE" url="https://qt-project.org/wiki/Category:Tools::QtCreator" arch="x86_64 aarch64" # qt6-qtwebengine @@ -46,7 +46,8 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_QBS=OFF \ - -DBUILD_PLUGIN_CLANGFORMAT=ON + -DBUILD_PLUGIN_CLANGFORMAT=ON \ + -DCLANGTOOLING_LINK_CLANG_DYLIB=ON cmake --build build } @@ -55,8 +56,8 @@ package() { } sha512sums=" -d3aa34b01a7cb2bd9def6b1eeaaaf280bc157f0e65f6b073cd8790cc275579958085514b244ea185d7215696b678f80c98650f063b1d24580bf35fe959bfbab8 qt-creator-opensource-src-7.0.2.tar.xz +46da4449d225cd9e9a253b5292216e4d2baf8c83c3cca6b93f95fa285534e81a15070af4426f88caeb7f012ba16748cd61f34de9ed29b0c5d7c61116fd40e05c qt-creator-opensource-src-8.0.0.tar.xz 702f014fc99bfba2576aa7459890afaad430638b2461059793884a3a527a05c73b58b649447e1f46b45c564f777aa7117581066b559dac896d082381057ef1b0 fix-execinfo.patch 4fbb9ad60622983c3ffb5600d374e76c2e21d1d8e1f0da255932c9c2e828c14ccc61c4065dd8cceff74088565a08f39685b29b9e2f767fc09773ac1ae89c4b60 fix-malloc-trim.patch -35f35c344e808589bdd8506bc95ba9ea2b98203d927f6cae491a1aee47ca0ab1440ffca2c4c4571803ac3038e522c0f2263e8cb046f200c80ae81a8ed70ac035 llvm-include.patch +c02a11c00ce00a69006598aababacaf9e8cc6b7b95801e705a3176312073dbd0dfc44c47a14986bcd25823da1416c8d68e77dca33a43f994270384dee3a4b28b llvm-include.patch " diff --git a/testing/qt-creator/llvm-include.patch b/testing/qt-creator/llvm-include.patch index e434963385a..528b64c1793 100644 --- a/testing/qt-creator/llvm-include.patch +++ b/testing/qt-creator/llvm-include.patch @@ -1,13 +1,16 @@ --- a/src/plugins/clangformat/CMakeLists.txt +++ b/src/plugins/clangformat/CMakeLists.txt -@@ -1,7 +1,9 @@ -+find_package(LLVM CONFIG) -+ +@@ -1,3 +1,4 @@ ++find_package(LLVM CONFIG REQUIRED) add_qtc_plugin(ClangFormat - CONDITION TARGET libclang AND LLVM_PACKAGE_VERSION VERSION_GREATER_EQUAL 10.0.0 AND (QTC_CLANG_BUILDMODE_MATCH OR CLANGTOOLING_LINK_CLANG_DYLIB) + CONDITION TARGET ${CLANG_FORMAT_LIB} AND LLVM_PACKAGE_VERSION VERSION_GREATER_EQUAL 10.0.0 AND (QTC_CLANG_BUILDMODE_MATCH OR CLANGTOOLING_LINK_CLANG_DYLIB) DEPENDS Utils Qt5::Widgets ${CLANG_FORMAT_LIB} -- INCLUDES "${CLANG_INCLUDE_DIRS}" -+ INCLUDES ${CLANG_INCLUDE_DIRS} INCLUDES ${LLVM_INCLUDE_DIRS} - PLUGIN_DEPENDS Core TextEditor CppEditor ProjectExplorer - SOURCES - clangformatbaseindenter.cpp clangformatbaseindenter.h +@@ -16,7 +17,7 @@ + + if(TARGET ClangFormat) + # "system" includes, so warnings are ignored +- target_include_directories(ClangFormat SYSTEM PRIVATE "${CLANG_INCLUDE_DIRS}") ++ target_include_directories(ClangFormat SYSTEM PRIVATE "${CLANG_INCLUDE_DIRS}" PRIVATE "${LLVM_INCLUDE_DIRS}") + endif() + + if(MSVC AND TARGET ClangFormat) -- GitLab