From efd4553bb1b2cd7d1b83c5aa73f8c9c2473b7315 Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Fri, 13 Dec 2024 10:31:17 +0100 Subject: [PATCH] automatic version update by autodist [release 15.0.0-1mamba;Wed Dec 11 2024] --- qt-creator-14.0.2-clang-19.patch | 15 --------------- qt-creator.spec | 22 +++++++++++++++++----- 2 files changed, 17 insertions(+), 20 deletions(-) delete mode 100644 qt-creator-14.0.2-clang-19.patch diff --git a/qt-creator-14.0.2-clang-19.patch b/qt-creator-14.0.2-clang-19.patch deleted file mode 100644 index 8027797..0000000 --- a/qt-creator-14.0.2-clang-19.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -rupN --no-dereference qt-creator-opensource-src-14.0.2/src/plugins/clangformat/clangformatutils.cpp qt-creator-opensource-src-14.0.2-new/src/plugins/clangformat/clangformatutils.cpp ---- qt-creator-opensource-src-14.0.2/src/plugins/clangformat/clangformatutils.cpp 2024-09-27 03:17:48.000000000 +0200 -+++ qt-creator-opensource-src-14.0.2-new/src/plugins/clangformat/clangformatutils.cpp 2024-10-04 11:43:19.140491504 +0200 -@@ -117,7 +117,11 @@ clang::format::FormatStyle calculateQtcS - style.IndentWrappedFunctionNames = false; - style.JavaScriptQuotes = FormatStyle::JSQS_Leave; - style.JavaScriptWrapImports = true; -+#if LLVM_VERSION_MAJOR >= 19 -+ style.KeepEmptyLines = {false, false, false}; -+#else - style.KeepEmptyLinesAtTheStartOfBlocks = false; -+#endif - // Do not add QT_BEGIN_NAMESPACE/QT_END_NAMESPACE as this will indent lines in between. - style.MacroBlockBegin = ""; - style.MacroBlockEnd = ""; diff --git a/qt-creator.spec b/qt-creator.spec index 78a6b41..98897d5 100644 --- a/qt-creator.spec +++ b/qt-creator.spec @@ -1,7 +1,7 @@ %define majver %(echo %version | cut -d. -f1-2) %define pkgver %(echo %version | tr _ -) Name: qt-creator -Version: 14.0.2 +Version: 15.0.0 Release: 1mamba Summary: An integrated development environment (IDE) tailored to the needs of Qt developers Group: Development/Tools @@ -12,11 +12,23 @@ URL: https://www.qt.io/product/development-tools Source: http://download.qt.io/official_releases/qtcreator/%{majver}/%{version}/qt-creator-opensource-src-%{version}.tar.xz Source1: qtcreator.desktop Source2: qtcreator-wrapper -Patch1: qt-creator-14.0.2-clang-19.patch License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: libQt6Concurrent +BuildRequires: libQt6Core +BuildRequires: libQt6DBus +BuildRequires: libQt6Designer +BuildRequires: libQt6Gui +BuildRequires: libQt6Help +BuildRequires: libQt6Network +BuildRequires: libQt6OpenGL +BuildRequires: libQt6PrintSupport BuildRequires: libQt6SerialPort-devel +BuildRequires: libQt6Sql +BuildRequires: libQt6Test +BuildRequires: libQt6Widgets +BuildRequires: libQt6Xml BuildRequires: libclang-devel BuildRequires: libdw-devel BuildRequires: libelf-devel @@ -30,14 +42,12 @@ BuildRequires: libxkbcommon-devel BuildRequires: libyaml-cpp-devel BuildRequires: libzstd-devel BuildRequires: qt6-qt5compat-devel -BuildRequires: qt6-qtbase-devel BuildRequires: qt6-qtcharts-devel BuildRequires: qt6-qtdeclarative-devel BuildRequires: qt6-qtpositioning-devel BuildRequires: qt6-qtquick3d-devel BuildRequires: qt6-qtshadertools-devel BuildRequires: qt6-qtsvg-devel -BuildRequires: qt6-qttools-devel BuildRequires: qt6-qtwebchannel-devel BuildRequires: qt6-qtwebengine-devel ## AUTOBUILDREQ-END @@ -67,7 +77,6 @@ It includes: %setup -q -n %{name}-opensource-src-%{pkgver} #-D -T #:<< _EOF -%patch 1 -p1 -b .clang-19 %build %cmake -d build \ @@ -110,6 +119,9 @@ sed -i 's|/qtcreator"|/qtcreator.bin"|' %{buildroot}%{_bindir}/qtcreator %doc LICENSE.GPL3-EXCEPT %changelog +* Wed Dec 11 2024 Automatic Build System 15.0.0-1mamba +- automatic version update by autodist + * Sat Oct 05 2024 Automatic Build System 14.0.2-1mamba - automatic version update by autodist