From a8cbaa51ee8c91a9ffc848787d7847cb4934e945 Mon Sep 17 00:00:00 2001 From: q66 Date: Mon, 23 Sep 2019 19:23:42 +0200 Subject: [PATCH] qtcreator: patch and rebuild for clang-9.0.0 [ci skip] --- srcpkgs/qtcreator/patches/clang9.patch | 11 +++++++++++ srcpkgs/qtcreator/template | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/qtcreator/patches/clang9.patch diff --git a/srcpkgs/qtcreator/patches/clang9.patch b/srcpkgs/qtcreator/patches/clang9.patch new file mode 100644 index 00000000000..25a1a861746 --- /dev/null +++ b/srcpkgs/qtcreator/patches/clang9.patch @@ -0,0 +1,11 @@ +--- src/plugins/clangformat/clangformatutils.cpp ++++ src/plugins/clangformat/clangformatutils.cpp +@@ -60,7 +60,7 @@ static clang::format::FormatStyle qtcStyle() + style.AllowShortBlocksOnASingleLine = false; + style.AllowShortCaseLabelsOnASingleLine = false; + style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline; +- style.AllowShortIfStatementsOnASingleLine = false; ++ style.AllowShortIfStatementsOnASingleLine = FormatStyle::SIS_Never; + style.AllowShortLoopsOnASingleLine = false; + style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_None; + style.AlwaysBreakBeforeMultilineStrings = false; diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template index 8240353ee61..efa09bbf07e 100644 --- a/srcpkgs/qtcreator/template +++ b/srcpkgs/qtcreator/template @@ -1,7 +1,7 @@ # Template file for 'qtcreator' pkgname=qtcreator version=4.9.2 -revision=3 +revision=4 wrksrc="qt-creator-opensource-src-${version}" build_style=qmake make_install_args="INSTALL_ROOT=\${DESTDIR}/usr"