Date: Thursday, April 23, 2020 @ 07:51:12 Author: arojas Revision: 380752
archrelease: copy trunk to extra-x86_64 Added: qtcreator/repos/extra-x86_64/PKGBUILD (from rev 380751, qtcreator/trunk/PKGBUILD) qtcreator/repos/extra-x86_64/qtcreator-clang-libs.patch (from rev 380751, qtcreator/trunk/qtcreator-clang-libs.patch) qtcreator/repos/extra-x86_64/qtcreator-preload-plugins.patch (from rev 380751, qtcreator/trunk/qtcreator-preload-plugins.patch) Deleted: qtcreator/repos/extra-x86_64/PKGBUILD qtcreator/repos/extra-x86_64/qtcreator-clang-libs.patch qtcreator/repos/extra-x86_64/qtcreator-preload-plugins.patch ---------------------------------+ PKGBUILD | 159 ++++++++++++++++++-------------------- qtcreator-clang-libs.patch | 48 +++++------ qtcreator-preload-plugins.patch | 26 +++--- 3 files changed, 115 insertions(+), 118 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-04-23 07:50:47 UTC (rev 380751) +++ PKGBUILD 2020-04-23 07:51:12 UTC (rev 380752) @@ -1,81 +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.11.2 -_clangver=10.0.0 -pkgrel=4 -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 !strip) # https://bugs.archlinux.org/task/66078 -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-libs.patch - qtcreator-clang-10.patch::"https://code.qt.io/cgit/qt-creator/qt-creator.git/patch?id=44023c8f") -sha256sums=('8d67e45b66944fdb0f879cbfae341af7e38d6a348cf18332b5cb9f07937aae02' - 'd6f979c820e2294653f4f1853af96942bf25ff9fe9450657d45ff1c7f02bbca7' - '0f6d0dc41a87aae9ef371b1950f5b9d823db8b5685c6ac04a7a7ac133eb19a3f' - 'cbbaa52f8daf40866c1c7157f168746cf7cb0231200feaeed05a0fb80e78c8ab') - -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 10 - patch -p1 -i ../qtcreator-clang-10.patch - patch -p1 -i ../qtcreator-clang-libs.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 380751, qtcreator/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-04-23 07:51:12 UTC (rev 380752) @@ -0,0 +1,78 @@ +# 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.12.0 +_clangver=10.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 yaml-cpp desktop-file-utils) +makedepends=(llvm python patchelf) +options=(docs !strip) # https://bugs.archlinux.org/task/66078 +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-libs.patch) +sha256sums=('d76655799ad2af81fb15f85d412d74583659fb1b4cf27b758ad8aae73675948b' + 'b40e222b30c355d1230160a4e933dbd161b8748125662e3bde312ea52296457a' + '0f6d0dc41a87aae9ef371b1950f5b9d823db8b5685c6ac04a7a7ac133eb19a3f') + +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 10 + patch -p1 -i ../qtcreator-clang-libs.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-libs.patch =================================================================== --- qtcreator-clang-libs.patch 2020-04-23 07:50:47 UTC (rev 380751) +++ qtcreator-clang-libs.patch 2020-04-23 07:51:12 UTC (rev 380752) @@ -1,24 +0,0 @@ -diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri -index 08838838bc..bee3779484 100644 ---- a/src/shared/clang/clang_installation.pri -+++ b/src/shared/clang/clang_installation.pri -@@ -131,9 +131,7 @@ defineReplace(extractWarnings) { - return($$result) - } - --CLANGTOOLING_LIBS=-lclangTooling -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ -- -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ -- -lclangASTMatchers -lclangToolingCore -lclangAST -lclangLex -lclangBasic -+CLANGTOOLING_LIBS=-lclang-cpp - win32:CLANGTOOLING_LIBS += -lversion - - BIN_EXTENSION = -@@ -207,7 +205,7 @@ isEmpty(LLVM_VERSION) { - isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) { - CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h - exists($$CLANGFORMAT_MAIN_HEADER) { -- CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic -+ CLANGFORMAT_LIBS=-lclang-cpp - ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \ - -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ - -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ Copied: qtcreator/repos/extra-x86_64/qtcreator-clang-libs.patch (from rev 380751, qtcreator/trunk/qtcreator-clang-libs.patch) =================================================================== --- qtcreator-clang-libs.patch (rev 0) +++ qtcreator-clang-libs.patch 2020-04-23 07:51:12 UTC (rev 380752) @@ -0,0 +1,24 @@ +diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri +index 08838838bc..bee3779484 100644 +--- a/src/shared/clang/clang_installation.pri ++++ b/src/shared/clang/clang_installation.pri +@@ -131,9 +131,7 @@ defineReplace(extractWarnings) { + return($$result) + } + +-CLANGTOOLING_LIBS=-lclangTooling -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ +- -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ +- -lclangASTMatchers -lclangToolingCore -lclangAST -lclangLex -lclangBasic ++CLANGTOOLING_LIBS=-lclang-cpp + win32:CLANGTOOLING_LIBS += -lversion + + BIN_EXTENSION = +@@ -207,7 +205,7 @@ isEmpty(LLVM_VERSION) { + isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) { + CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h + exists($$CLANGFORMAT_MAIN_HEADER) { +- CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic ++ CLANGFORMAT_LIBS=-lclang-cpp + ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \ + -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ + -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ Deleted: qtcreator-preload-plugins.patch =================================================================== --- qtcreator-preload-plugins.patch 2020-04-23 07:50:47 UTC (rev 380751) +++ qtcreator-preload-plugins.patch 2020-04-23 07:51:12 UTC (rev 380752) @@ -1,13 +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 -@@ -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()}); Copied: qtcreator/repos/extra-x86_64/qtcreator-preload-plugins.patch (from rev 380751, qtcreator/trunk/qtcreator-preload-plugins.patch) =================================================================== --- qtcreator-preload-plugins.patch (rev 0) +++ qtcreator-preload-plugins.patch 2020-04-23 07:51:12 UTC (rev 380752) @@ -0,0 +1,13 @@ +diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp +index 166d1c94e0..de0b9cc67b 100644 +--- a/src/plugins/clangtools/clangtidyclazyrunner.cpp ++++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp +@@ -67,7 +67,7 @@ static QStringList clazyPluginArguments(const ClangDiagnosticConfig diagnosticCo + QStringList arguments; + + if (diagnosticConfig.isClazyEnabled()) { +- arguments << XclangArgs({"-add-plugin", "clazy"}); ++ arguments << XclangArgs({"-load", "ClazyPlugin.so", "-add-plugin", "clazy"}); + if (!diagnosticConfig.clazyChecks().isEmpty()) + arguments << XclangArgs({"-plugin-arg-clazy", diagnosticConfig.clazyChecks()}); + }