From feb06fff9dc469cd3c3034d83faa17569f1ced1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Fri, 5 Apr 2024 09:57:28 +0100 Subject: [PATCH] qt-creator: update to 13.0.0 --- mingw-w64-qt-creator/003-link-against-clang-cpp.patch | 2 +- mingw-w64-qt-creator/PKGBUILD | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mingw-w64-qt-creator/003-link-against-clang-cpp.patch b/mingw-w64-qt-creator/003-link-against-clang-cpp.patch index 0bb110a4fa..b4b35a72d1 100644 --- a/mingw-w64-qt-creator/003-link-against-clang-cpp.patch +++ b/mingw-w64-qt-creator/003-link-against-clang-cpp.patch @@ -2,7 +2,7 @@ +++ b/src/plugins/clangformat/CMakeLists.txt @@ -1,6 +1,6 @@ add_qtc_plugin(ClangFormat - 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) + CONDITION TARGET ${CLANG_FORMAT_LIB} AND LLVM_PACKAGE_VERSION VERSION_GREATER_EQUAL 14.0.0 AND (QTC_CLANG_BUILDMODE_MATCH OR CLANGTOOLING_LINK_CLANG_DYLIB) - DEPENDS Utils Qt::Widgets ${CLANG_FORMAT_LIB} + DEPENDS Utils Qt::Widgets ${CLANG_FORMAT_LIB} LLVM PLUGIN_DEPENDS Core TextEditor CppEditor ProjectExplorer diff --git a/mingw-w64-qt-creator/PKGBUILD b/mingw-w64-qt-creator/PKGBUILD index da1ec3d8cd..e5e3665319 100644 --- a/mingw-w64-qt-creator/PKGBUILD +++ b/mingw-w64-qt-creator/PKGBUILD @@ -6,9 +6,9 @@ pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-docs" "${MINGW_PACKAGE_PREFIX}-${_realname}-devel") -_base_ver=12.0.2 +_base_ver=13.0.0 pkgver=${_base_ver/-/} -pkgrel=3 +pkgrel=1 pkgdesc='Lightweight, cross-platform integrated development environment (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -23,6 +23,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-clang" "${MINGW_PACKAGE_PREFIX}-clang-tools-extra" + "${MINGW_PACKAGE_PREFIX}-litehtml" "${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-qt6-declarative" "${MINGW_PACKAGE_PREFIX}-qt6-tools" @@ -40,10 +41,10 @@ source=(https://download.qt.io/official_releases/qtcreator/${_base_ver%.*}/${_ba qt-creator-3.2.0-Allow-iOS-plugin-on-any-platform.patch qt-creator-5.0.1-fix-library-archive-path.patch 003-link-against-clang-cpp.patch) -sha256sums=('ace811ac3aee9bfbd1a55eb6cb49479a4823ead6f39f203571e9d77648450381' +sha256sums=('ec14f05f270714455a2f0d40b8aab02ed9241d4fa4f03ea539bfec5819e9e036' 'd53c00ab39d0fd16c03a1031fdb4e96f817ef120575866f4f03b307e521438bd' '29d67f88f071abe7a4b589182767b8a697fe4e516d70707bfca88f035883718f' - 'c4a8294a5e73772a5168ffcfe6def6edcafa4420687d239e6655865c3cbe3459') + '5d6c0b626ef29ce39372eb180527d64e11af2bf39a1a3e84e709464a20d2433b') apply_patch_with_msg() { for _patch in "$@" @@ -98,6 +99,7 @@ package_qt-creator() { "${MINGW_PACKAGE_PREFIX}-qt6-serialport" "${MINGW_PACKAGE_PREFIX}-qt6-translations" "${MINGW_PACKAGE_PREFIX}-qt6-5compat" + "${MINGW_PACKAGE_PREFIX}-litehtml" "${MINGW_PACKAGE_PREFIX}-yaml-cpp" "${MINGW_PACKAGE_PREFIX}-zstd") optdepends=("${MINGW_PACKAGE_PREFIX}-gdb: for the debugger"