head 1.5; access; symbols pkgsrc-2025Q1:1.4.0.4 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.2 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.2.0.12 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.10 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.8 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.6 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.4 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.2 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.1.0.4 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.2 pkgsrc-2022Q4-base:1.1; locks; strict; comment @// @; 1.5 date 2025.05.09.05.56.19; author adam; state dead; branches; next 1.4; commitid Lydqku2xzOkD7cUF; 1.4 date 2024.11.30.17.47.50; author nros; state Exp; branches; next 1.3; commitid MHACtTrNd9WJcHzF; 1.3 date 2024.11.30.17.08.17; author nros; state Exp; branches; next 1.2; commitid IdCQj4udiAoaZGzF; 1.2 date 2023.05.11.13.30.17; author nikita; state Exp; branches; next 1.1; commitid oFgDAN6NG9bh4yoE; 1.1 date 2022.12.07.16.32.55; author wiz; state Exp; branches; next ; commitid lAPde8ZihdIS3E4E; desc @@ 1.5 log @qtcreator: updated to 16.0.0 Qt Creator 16 comes with many performance improvements, especially for the startup performance. We improved the performance of the detection of the Qt ABI. Since Qt 6 we can retrieve the ABI from a configuration file instead of guessing it from the content of the libraries, which is now done asynchronously while collecting other information about the registered Qt versions. @ text @$NetBSD: patch-src_plugins_clangformat_clangformatutils.cpp,v 1.4 2024/11/30 17:47:50 nros Exp $ Fix build with llvm 16. https://github.com/qt-creator/qt-creator/commit/b97c9494af2d4d6e53bcc87b588f21a4f445ef6f and newer Fix build with LLVM 17 https://github.com/qt-creator/qt-creator/commit/9ad9e49ccf6e0d7f4ba5765cff3af63fbbed60e8 Fix warnings with LLVM 18 https://github.com/qt-creator/qt-creator/commit/7457b623125f4bcdb7941769a385cfbfc0dcbf2b Fix build with LLVM 19 https://github.com/qt-creator/qt-creator/commit/f175ec933f1c5c5d7a345edbaacc8ff90202aee2 --- src/plugins/clangformat/clangformatutils.cpp.orig 2021-11-03 10:14:14.000000000 +0000 +++ src/plugins/clangformat/clangformatutils.cpp @@@@ -51,7 +51,13 @@@@ static clang::format::FormatStyle qtcSty style.Language = FormatStyle::LK_Cpp; style.AccessModifierOffset = -4; style.AlignAfterOpenBracket = FormatStyle::BAS_Align; -#if LLVM_VERSION_MAJOR >= 12 +#if LLVM_VERSION_MAJOR >= 18 + style.AlignConsecutiveAssignments = {false, false, false, false, false, false}; + style.AlignConsecutiveDeclarations = {false, false, false, false, false, false}; +#elif LLVM_VERSION_MAJOR >= 15 + style.AlignConsecutiveAssignments = {false, false, false, false, false}; + style.AlignConsecutiveDeclarations = {false, false, false, false, false}; +#elif LLVM_VERSION_MAJOR >= 12 style.AlignConsecutiveAssignments = FormatStyle::ACS_None; style.AlignConsecutiveDeclarations = FormatStyle::ACS_None; #else @@@@ -64,7 +70,11 @@@@ static clang::format::FormatStyle qtcSty #else style.AlignOperands = true; #endif +#if LLVM_VERSION_MAJOR >= 16 + style.AlignTrailingComments = {FormatStyle::TCAS_Always, 0}; +#else style.AlignTrailingComments = true; +#endif style.AllowAllParametersOfDeclarationOnNextLine = true; #if LLVM_VERSION_MAJOR >= 10 style.AllowShortBlocksOnASingleLine = FormatStyle::SBS_Never; @@@@ -111,7 +121,11 @@@@ static clang::format::FormatStyle qtcSty style.ColumnLimit = 100; style.CommentPragmas = "^ IWYU pragma:"; style.CompactNamespaces = false; +#if LLVM_VERSION_MAJOR >= 15 + style.PackConstructorInitializers = FormatStyle::PCIS_BinPack; +#else style.ConstructorInitializerAllOnOneLineOrOnePerLine = false; +#endif style.ConstructorInitializerIndentWidth = 4; style.ContinuationIndentWidth = 4; style.Cpp11BracedListStyle = true; @@@@ -131,7 +145,11 @@@@ static clang::format::FormatStyle qtcSty 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 = ""; @@@@ -154,12 +172,18 @@@@ static clang::format::FormatStyle qtcSty #else style.SortIncludes = true; #endif +#if LLVM_VERSION_MAJOR >= 16 + style.SortUsingDeclarations = FormatStyle::SUD_Lexicographic; +#else style.SortUsingDeclarations = true; +#endif style.SpaceAfterCStyleCast = true; style.SpaceAfterTemplateKeyword = false; style.SpaceBeforeAssignmentOperators = true; style.SpaceBeforeParens = FormatStyle::SBPO_ControlStatements; +#if LLVM_VERSION_MAJOR < 17 style.SpaceInEmptyParentheses = false; +#endif style.SpacesBeforeTrailingComments = 1; #if LLVM_VERSION_MAJOR >= 13 style.SpacesInAngles = FormatStyle::SIAS_Never; @@@@ -167,8 +191,12 @@@@ static clang::format::FormatStyle qtcSty style.SpacesInAngles = false; #endif style.SpacesInContainerLiterals = false; +#if LLVM_VERSION_MAJOR >= 17 + style.SpacesInParens = FormatStyle::SIPO_Never; +#else style.SpacesInCStyleCastParentheses = false; style.SpacesInParentheses = false; +#endif style.SpacesInSquareBrackets = false; style.StatementMacros.emplace_back("Q_OBJECT"); style.StatementMacros.emplace_back("QT_BEGIN_NAMESPACE"); @ 1.4 log @editors/qtcreator: add comments about llvm fixes, fix pkglint errors @ text @d1 1 a1 1 $NetBSD: patch-src_plugins_clangformat_clangformatutils.cpp,v 1.3 2024/11/30 17:08:17 nros Exp $ @ 1.3 log @editors/qtcreator: fix build with llvm 17 and 19 @ text @d1 1 a1 1 $NetBSD: patch-src_plugins_clangformat_clangformatutils.cpp,v 1.2 2023/05/11 13:30:17 nikita Exp $ d7 9 @ 1.2 log @qtcreator: fix build with llvm 16 @ text @d1 1 a1 1 $NetBSD: patch-src_plugins_clangformat_clangformatutils.cpp,v 1.1 2022/12/07 16:32:55 wiz Exp $ d7 3 a9 3 --- src/plugins/clangformat/clangformatutils.cpp.orig 2021-11-03 11:14:14.000000000 +0100 +++ src/plugins/clangformat/clangformatutils.cpp 2023-05-11 15:20:21.554698126 +0200 @@@@ -51,7 +51,10 @@@@ d14 4 a17 1 +#if LLVM_VERSION_MAJOR >= 15 d24 1 a24 1 @@@@ -64,7 +67,11 @@@@ d36 1 a36 1 @@@@ -111,7 +118,11 @@@@ d48 13 a60 1 @@@@ -154,7 +165,11 @@@@ d72 20 @ 1.1 log @qtcreator: fix build with llvm 15 @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 Fix build with llvm 15. d7 3 a9 3 --- src/plugins/clangformat/clangformatutils.cpp.orig 2021-11-03 11:14:14.000000000 +0000 +++ src/plugins/clangformat/clangformatutils.cpp @@@@ -51,7 +51,10 @@@@ static clang::format::FormatStyle qtcSty d21 13 a33 1 @@@@ -111,7 +114,11 @@@@ static clang::format::FormatStyle qtcSty d45 12 @