Date: Wednesday, December 11, 2019 @ 20:19:25 Author: arojas Revision: 370683
archrelease: copy trunk to extra-x86_64 Added: qtcreator/repos/extra-x86_64/PKGBUILD (from rev 370682, qtcreator/trunk/PKGBUILD) qtcreator/repos/extra-x86_64/qtcreator-preload-plugins.patch (from rev 370682, qtcreator/trunk/qtcreator-preload-plugins.patch) Deleted: qtcreator/repos/extra-x86_64/PKGBUILD qtcreator/repos/extra-x86_64/qtcreator-preload-plugins.patch ---------------------------------+ PKGBUILD | 146 +++++++++++++++++++------------------- qtcreator-preload-plugins.patch | 34 +++----- 2 files changed, 86 insertions(+), 94 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-12-11 20:19:02 UTC (rev 370682) +++ PKGBUILD 2019-12-11 20:19:25 UTC (rev 370683) @@ -1,73 +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.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 -} Copied: qtcreator/repos/extra-x86_64/PKGBUILD (from rev 370682, qtcreator/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-12-11 20:19:25 UTC (rev 370683) @@ -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.11.0 +_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=('efebaa1c52526bf9c07b35c43071735c5d0b83b6cd08daab35a21e7ed53a7645' + 'd6f979c820e2294653f4f1853af96942bf25ff9fe9450657d45ff1c7f02bbca7') + +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-preload-plugins.patch =================================================================== --- qtcreator-preload-plugins.patch 2019-12-11 20:19:02 UTC (rev 370682) +++ qtcreator-preload-plugins.patch 2019-12-11 20:19:25 UTC (rev 370683) @@ -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 370682, qtcreator/trunk/qtcreator-preload-plugins.patch) =================================================================== --- qtcreator-preload-plugins.patch (rev 0) +++ qtcreator-preload-plugins.patch 2019-12-11 20:19:25 UTC (rev 370683) @@ -0,0 +1,13 @@ +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 +@@ -63,7 +63,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis + + const QString clazyChecks = diagnosticConfig.clazyChecks(); + if (!clazyChecks.isEmpty()) { +- arguments << XclangArgs({"-add-plugin", ++ arguments << XclangArgs({"-load", "ClazyPlugin.so", "-add-plugin", + "clazy", + "-plugin-arg-clazy", + diagnosticConfig.clazyChecks()});