Date: Tuesday, November 5, 2019 @ 17:26:32
Author: arojas
Revision: 366798
archrelease: copy trunk to extra-x86_64
Added:
qtcreator/repos/extra-x86_64/PKGBUILD
(from rev 366797, qtcreator/trunk/PKGBUILD)
qtcreator/repos/extra-x86_64/qtcreator-preload-plugins.patch
(from rev 366797, qtcreator/trunk/qtcreator-preload-plugins.patch)
Deleted:
qtcreator/repos/extra-x86_64/PKGBUILD
qtcreator/repos/extra-x86_64/qtcreator-clang-9.patch
qtcreator/repos/extra-x86_64/qtcreator-preload-plugins.patch
---------------------------------+
PKGBUILD | 150 ++++++++++++++++++--------------------
qtcreator-clang-9.patch | 12 ---
qtcreator-preload-plugins.patch | 42 +++++-----
3 files changed, 94 insertions(+), 110 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-11-05 17:26:11 UTC (rev 366797)
+++ PKGBUILD 2019-11-05 17:26:32 UTC (rev 366798)
@@ -1,77 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com>
-# Maintainer: Antonio Rojas <aro...@archlinux.org>
-# Contributor: Imanol Celaya <ornitorrin...@archlinux-es.org>
-# Contributor: Lukas Jirkovsky <l.jirkov...@gmail.com>
-# Contributor: Dan Vratil <prog...@progdansoft.com>
-# Contributor: thotypous <matiasΘarchlinux-br·org>
-# Contributor: delor <bartekpiech gmail com>
-
-pkgname=qtcreator
-pkgver=4.10.1
-_clangver=9.0.0
-pkgrel=2
-pkgdesc='Lightweight, cross-platform integrated development environment'
-arch=(x86_64)
-url='https://www.qt.io'
-license=(LGPL)
-depends=(qt5-tools qt5-quickcontrols qt5-quickcontrols2 qt5-webengine
clang=$_clangver qbs clazy syntax-highlighting desktop-file-utils)
-makedepends=(llvm python patchelf)
-options=(docs)
-optdepends=('qt5-doc: integrated Qt documentation'
- 'qt5-examples: welcome page examples'
- 'qt5-translations: for other languages'
- 'gdb: debugger'
- 'cmake: cmake project support'
- 'x11-ssh-askpass: ssh support'
- 'git: git support'
- 'mercurial: mercurial support'
- 'bzr: bazaar support'
- 'valgrind: analyze support'
- 'perf: performer analyzer')
-source=("https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz";
- qtcreator-preload-plugins.patch
- qtcreator-clang-9.patch)
-sha256sums=('5098d87027bec3296bd93a7e112588759ccb0511fbfdc5558c1a1e83dff8d2a9'
- '150c444e76ec969fc8765774b648984037829623300d0ce9d41a915b2afa792d'
- '1d66eb008e84459f6570e6e72acedcf80d2f0bb82650df3b733f7ca0a3f08a3d')
-
-prepare() {
- mkdir -p build
-
- cd qt-creator-opensource-src-$pkgver
- # fix hardcoded libexec path
- sed -e 's|libexec\/qtcreator|lib\/qtcreator|g' -i qtcreator.pri
- sed -e 's|libexec|lib|g' -i src/tools/tools.pro
- # use system qbs
- rm -r src/shared/qbs
- # Preload analyzer plugins, since upstream clang doesn't link to all plugins
- # see
http://code.qt.io/cgit/clang/clang.git/commit/?id=7f349701d3ea0c47be3a43e265699dddd3fd55cf
- # and https://bugs.archlinux.org/task/59492
- patch -p1 -i ../qtcreator-preload-plugins.patch
- # Fix build with clang 9 (Fedora)
- patch -p1 -i ../qtcreator-clang-9.patch
-}
-
-build() {
- cd build
-
- qmake LLVM_INSTALL_DIR=/usr QBS_INSTALL_DIR=/usr \
- KSYNTAXHIGHLIGHTING_LIB_DIR=/usr/lib
KSYNTAXHIGHLIGHTING_INCLUDE_DIR=/usr/include/KF5/KSyntaxHighlighting \
- CONFIG+=journald QMAKE_CFLAGS_ISYSTEM=-I \
- DEFINES+=QBS_ENABLE_PROJECT_FILE_UPDATES \
- "$srcdir"/qt-creator-opensource-src-$pkgver/qtcreator.pro
- make
- make docs
-}
-
-package() {
- cd build
-
- make INSTALL_ROOT="$pkgdir/usr/" install
- make INSTALL_ROOT="$pkgdir/usr/" install_docs
-
- install -Dm644
"$srcdir"/qt-creator-opensource-src-$pkgver/LICENSE.GPL3-EXCEPT
"$pkgdir"/usr/share/licenses/qtcreator/LICENSE.GPL3-EXCEPT
-
-# Link clazy plugin explicitely
- patchelf --add-needed ClazyPlugin.so "$pkgdir"/usr/lib/qtcreator/clangbackend
-}
Copied: qtcreator/repos/extra-x86_64/PKGBUILD (from rev 366797,
qtcreator/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-11-05 17:26:32 UTC (rev 366798)
@@ -0,0 +1,73 @@
+# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com>
+# Maintainer: Antonio Rojas <aro...@archlinux.org>
+# Contributor: Imanol Celaya <ornitorrin...@archlinux-es.org>
+# Contributor: Lukas Jirkovsky <l.jirkov...@gmail.com>
+# Contributor: Dan Vratil <prog...@progdansoft.com>
+# Contributor: thotypous <matiasΘarchlinux-br·org>
+# Contributor: delor <bartekpiech gmail com>
+
+pkgname=qtcreator
+pkgver=4.10.2
+_clangver=9.0.0
+pkgrel=1
+pkgdesc='Lightweight, cross-platform integrated development environment'
+arch=(x86_64)
+url='https://www.qt.io'
+license=(LGPL)
+depends=(qt5-tools qt5-quickcontrols qt5-quickcontrols2 qt5-webengine
clang=$_clangver qbs clazy syntax-highlighting desktop-file-utils)
+makedepends=(llvm python patchelf)
+options=(docs)
+optdepends=('qt5-doc: integrated Qt documentation'
+ 'qt5-examples: welcome page examples'
+ 'qt5-translations: for other languages'
+ 'gdb: debugger'
+ 'cmake: cmake project support'
+ 'x11-ssh-askpass: ssh support'
+ 'git: git support'
+ 'mercurial: mercurial support'
+ 'bzr: bazaar support'
+ 'valgrind: analyze support'
+ 'perf: performer analyzer')
+source=("https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz";
+ qtcreator-preload-plugins.patch)
+sha256sums=('9add6bdddfe5726bb02535409c2ed788b1afeee082121f54f887281d0e3c449a'
+ '150c444e76ec969fc8765774b648984037829623300d0ce9d41a915b2afa792d')
+
+prepare() {
+ mkdir -p build
+
+ cd qt-creator-opensource-src-$pkgver
+ # fix hardcoded libexec path
+ sed -e 's|libexec\/qtcreator|lib\/qtcreator|g' -i qtcreator.pri
+ sed -e 's|libexec|lib|g' -i src/tools/tools.pro
+ # use system qbs
+ rm -r src/shared/qbs
+ # Preload analyzer plugins, since upstream clang doesn't link to all plugins
+ # see
http://code.qt.io/cgit/clang/clang.git/commit/?id=7f349701d3ea0c47be3a43e265699dddd3fd55cf
+ # and https://bugs.archlinux.org/task/59492
+ patch -p1 -i ../qtcreator-preload-plugins.patch
+}
+
+build() {
+ cd build
+
+ qmake LLVM_INSTALL_DIR=/usr QBS_INSTALL_DIR=/usr \
+ KSYNTAXHIGHLIGHTING_LIB_DIR=/usr/lib
KSYNTAXHIGHLIGHTING_INCLUDE_DIR=/usr/include/KF5/KSyntaxHighlighting \
+ CONFIG+=journald QMAKE_CFLAGS_ISYSTEM=-I \
+ DEFINES+=QBS_ENABLE_PROJECT_FILE_UPDATES \
+ "$srcdir"/qt-creator-opensource-src-$pkgver/qtcreator.pro
+ make
+ make docs
+}
+
+package() {
+ cd build
+
+ make INSTALL_ROOT="$pkgdir/usr/" install
+ make INSTALL_ROOT="$pkgdir/usr/" install_docs
+
+ install -Dm644
"$srcdir"/qt-creator-opensource-src-$pkgver/LICENSE.GPL3-EXCEPT
"$pkgdir"/usr/share/licenses/qtcreator/LICENSE.GPL3-EXCEPT
+
+# Link clazy plugin explicitely
+ patchelf --add-needed ClazyPlugin.so "$pkgdir"/usr/lib/qtcreator/clangbackend
+}
Deleted: qtcreator-clang-9.patch
===================================================================
--- qtcreator-clang-9.patch 2019-11-05 17:26:11 UTC (rev 366797)
+++ qtcreator-clang-9.patch 2019-11-05 17:26:32 UTC (rev 366798)
@@ -1,12 +0,0 @@
-diff -rupN
qt-creator-opensource-src-4.10.0/src/plugins/clangformat/clangformatutils.cpp
qt-creator-opensource-src-4.10.0-new/src/plugins/clangformat/clangformatutils.cpp
----
qt-creator-opensource-src-4.10.0/src/plugins/clangformat/clangformatutils.cpp
2019-09-03 16:36:38.000000000 +0200
-+++
qt-creator-opensource-src-4.10.0-new/src/plugins/clangformat/clangformatutils.cpp
2019-09-25 13:33:27.230835047 +0200
-@@ -60,7 +60,7 @@ static clang::format::FormatStyle qtcSty
- 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;
Deleted: qtcreator-preload-plugins.patch
===================================================================
--- qtcreator-preload-plugins.patch 2019-11-05 17:26:11 UTC (rev 366797)
+++ qtcreator-preload-plugins.patch 2019-11-05 17:26:32 UTC (rev 366798)
@@ -1,21 +0,0 @@
-diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp
b/src/plugins/clangtools/clangtidyclazyrunner.cpp
-index a580704243..7a8740a5cc 100644
---- a/src/plugins/clangtools/clangtidyclazyrunner.cpp
-+++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp
-@@ -76,6 +76,7 @@ QStringList
ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis
-
- const ClangDiagnosticConfig::TidyMode tidyMode =
m_diagnosticConfig.clangTidyMode();
- if (tidyMode != ClangDiagnosticConfig::TidyMode::Disabled) {
-+ arguments << XclangArgs({"-load", "libclangTidyPlugin.so"});
- arguments << XclangArgs({"-add-plugin", "clang-tidy"});
- if (tidyMode != ClangDiagnosticConfig::TidyMode::File) {
- const QString tidyChecks = m_diagnosticConfig.clangTidyChecks();
-@@ -85,7 +86,7 @@ QStringList
ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis
-
- const QString clazyChecks = m_diagnosticConfig.clazyChecks();
- if (!clazyChecks.isEmpty()) {
-- arguments << XclangArgs({"-add-plugin",
-+ arguments << XclangArgs({"-load", "ClazyPlugin.so", "-add-plugin",
- "clazy",
- "-plugin-arg-clazy",
- "enable-all-fixits",
Copied: qtcreator/repos/extra-x86_64/qtcreator-preload-plugins.patch (from rev
366797, qtcreator/trunk/qtcreator-preload-plugins.patch)
===================================================================
--- qtcreator-preload-plugins.patch (rev 0)
+++ qtcreator-preload-plugins.patch 2019-11-05 17:26:32 UTC (rev 366798)
@@ -0,0 +1,21 @@
+diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp
b/src/plugins/clangtools/clangtidyclazyrunner.cpp
+index a580704243..7a8740a5cc 100644
+--- a/src/plugins/clangtools/clangtidyclazyrunner.cpp
++++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp
+@@ -76,6 +76,7 @@ QStringList
ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis
+
+ const ClangDiagnosticConfig::TidyMode tidyMode =
m_diagnosticConfig.clangTidyMode();
+ if (tidyMode != ClangDiagnosticConfig::TidyMode::Disabled) {
++ arguments << XclangArgs({"-load", "libclangTidyPlugin.so"});
+ arguments << XclangArgs({"-add-plugin", "clang-tidy"});
+ if (tidyMode != ClangDiagnosticConfig::TidyMode::File) {
+ const QString tidyChecks = m_diagnosticConfig.clangTidyChecks();
+@@ -85,7 +86,7 @@ QStringList
ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis
+
+ const QString clazyChecks = m_diagnosticConfig.clazyChecks();
+ if (!clazyChecks.isEmpty()) {
+- arguments << XclangArgs({"-add-plugin",
++ arguments << XclangArgs({"-load", "ClazyPlugin.so", "-add-plugin",
+ "clazy",
+ "-plugin-arg-clazy",
+ "enable-all-fixits",
