[arch-commits] Commit in qtcreator/repos/extra-x86_64 (6 files)
Antonio Rojas
arojas at archlinux.org
Tue May 7 18:22:31 UTC 2019
Date: Tuesday, May 7, 2019 @ 18:22:31
Author: arojas
Revision: 352733
archrelease: copy trunk to extra-x86_64
Added:
qtcreator/repos/extra-x86_64/PKGBUILD
(from rev 352732, qtcreator/trunk/PKGBUILD)
qtcreator/repos/extra-x86_64/qtcreator-clazy-1.5.patch
(from rev 352732, qtcreator/trunk/qtcreator-clazy-1.5.patch)
qtcreator/repos/extra-x86_64/qtcreator-preload-plugins.patch
(from rev 352732, qtcreator/trunk/qtcreator-preload-plugins.patch)
Deleted:
qtcreator/repos/extra-x86_64/PKGBUILD
qtcreator/repos/extra-x86_64/qtcreator-clazy-1.5.patch
qtcreator/repos/extra-x86_64/qtcreator-preload-plugins.patch
---------------------------------+
PKGBUILD | 147 +++++++++++++++++++-------------------
qtcreator-clazy-1.5.patch | 90 +++++++++++------------
qtcreator-preload-plugins.patch | 33 +++++---
3 files changed, 141 insertions(+), 129 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-05-07 18:22:05 UTC (rev 352732)
+++ PKGBUILD 2019-05-07 18:22:31 UTC (rev 352733)
@@ -1,72 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Imanol Celaya <ornitorrincos at archlinux-es.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky at gmail.com>
-# Contributor: Dan Vratil <progdan at progdansoft.com>
-# Contributor: thotypous <matiasΘarchlinux-br·org>
-# Contributor: delor <bartekpiech gmail com>
-
-pkgname=qtcreator
-pkgver=4.9.0
-_clangver=8.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)
-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')
-source=("https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz"
- qtcreator-clazy-1.5.patch
- qtcreator-preload-plugins.patch)
-sha256sums=('46ee1992531b769450f8be96cf63520b609d7dd305df345d7cd8216ac396e6a8'
- '1f6998fea92b9a157f42cca783839ce95f70ccc667027078b7881cbb253838f0'
- '0e59c98c02d46f93275dda2b22216a0ba467104f0151f35c88ae2172c3858b03')
-
-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
- # 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
- # Adapt to clazy 1.5 plugin rename
- patch -p1 -i ../qtcreator-clazy-1.5.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
-}
Copied: qtcreator/repos/extra-x86_64/PKGBUILD (from rev 352732, qtcreator/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-05-07 18:22:31 UTC (rev 352733)
@@ -0,0 +1,75 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Imanol Celaya <ornitorrincos at archlinux-es.org>
+# Contributor: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+# Contributor: Dan Vratil <progdan at progdansoft.com>
+# Contributor: thotypous <matiasΘarchlinux-br·org>
+# Contributor: delor <bartekpiech gmail com>
+
+pkgname=qtcreator
+pkgver=4.9.0
+_clangver=8.0.0
+pkgrel=3
+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')
+source=("https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz"
+ qtcreator-clazy-1.5.patch
+ qtcreator-preload-plugins.patch)
+sha256sums=('46ee1992531b769450f8be96cf63520b609d7dd305df345d7cd8216ac396e6a8'
+ '1f6998fea92b9a157f42cca783839ce95f70ccc667027078b7881cbb253838f0'
+ '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
+ # use system qbs
+ rm -r src/shared/qbs
+ # Adapt to clazy 1.5 plugin rename
+ patch -p1 -i ../qtcreator-clazy-1.5.patch
+ # 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-clazy-1.5.patch
===================================================================
--- qtcreator-clazy-1.5.patch 2019-05-07 18:22:05 UTC (rev 352732)
+++ qtcreator-clazy-1.5.patch 2019-05-07 18:22:31 UTC (rev 352733)
@@ -1,45 +0,0 @@
-diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
-index 706c5101a3..dbfaeb8457 100644
---- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
-+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
-@@ -527,14 +528,14 @@ private:
- return;
-
- m_options.append(CppTools::XclangArgs({"-add-plugin",
-- "clang-lazy",
-- "-plugin-arg-clang-lazy",
-+ "clazy",
-+ "-plugin-arg-clazy",
- "enable-all-fixits",
-- "-plugin-arg-clang-lazy",
-+ "-plugin-arg-clazy",
- "no-autowrite-fixits",
-- "-plugin-arg-clang-lazy",
-+ "-plugin-arg-clazy",
- checks,
-- "-plugin-arg-clang-lazy",
-+ "-plugin-arg-clazy",
- "ignore-included-files"}));
- }
-
-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
-@@ -86,12 +87,12 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis
- const QString clazyChecks = m_diagnosticConfig.clazyChecks();
- if (!clazyChecks.isEmpty()) {
- arguments << XclangArgs({"-add-plugin",
-- "clang-lazy",
-- "-plugin-arg-clang-lazy",
-+ "clazy",
-+ "-plugin-arg-clazy",
- "enable-all-fixits",
-- "-plugin-arg-clang-lazy",
-+ "-plugin-arg-clazy",
- "no-autowrite-fixits",
-- "-plugin-arg-clang-lazy",
-+ "-plugin-arg-clazy",
- m_diagnosticConfig.clazyChecks()});
- }
-
Copied: qtcreator/repos/extra-x86_64/qtcreator-clazy-1.5.patch (from rev 352732, qtcreator/trunk/qtcreator-clazy-1.5.patch)
===================================================================
--- qtcreator-clazy-1.5.patch (rev 0)
+++ qtcreator-clazy-1.5.patch 2019-05-07 18:22:31 UTC (rev 352733)
@@ -0,0 +1,45 @@
+diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
+index 706c5101a3..dbfaeb8457 100644
+--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
++++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
+@@ -527,14 +528,14 @@ private:
+ return;
+
+ m_options.append(CppTools::XclangArgs({"-add-plugin",
+- "clang-lazy",
+- "-plugin-arg-clang-lazy",
++ "clazy",
++ "-plugin-arg-clazy",
+ "enable-all-fixits",
+- "-plugin-arg-clang-lazy",
++ "-plugin-arg-clazy",
+ "no-autowrite-fixits",
+- "-plugin-arg-clang-lazy",
++ "-plugin-arg-clazy",
+ checks,
+- "-plugin-arg-clang-lazy",
++ "-plugin-arg-clazy",
+ "ignore-included-files"}));
+ }
+
+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
+@@ -86,12 +87,12 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis
+ const QString clazyChecks = m_diagnosticConfig.clazyChecks();
+ if (!clazyChecks.isEmpty()) {
+ arguments << XclangArgs({"-add-plugin",
+- "clang-lazy",
+- "-plugin-arg-clang-lazy",
++ "clazy",
++ "-plugin-arg-clazy",
+ "enable-all-fixits",
+- "-plugin-arg-clang-lazy",
++ "-plugin-arg-clazy",
+ "no-autowrite-fixits",
+- "-plugin-arg-clang-lazy",
++ "-plugin-arg-clazy",
+ m_diagnosticConfig.clazyChecks()});
+ }
+
Deleted: qtcreator-preload-plugins.patch
===================================================================
--- qtcreator-preload-plugins.patch 2019-05-07 18:22:05 UTC (rev 352732)
+++ qtcreator-preload-plugins.patch 2019-05-07 18:22:31 UTC (rev 352733)
@@ -1,12 +0,0 @@
-diff --git a/dist/org.qt-project.qtcreator.desktop b/dist/org.qt-project.qtcreator.desktop
-index 034721891d..93351f28da 100644
---- a/dist/org.qt-project.qtcreator.desktop
-+++ b/dist/org.qt-project.qtcreator.desktop
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Type=Application
--Exec=qtcreator %F
-+Exec=LD_PRELOAD=ClazyPlugin.so:libclangTidyPlugin.so qtcreator %F
- Name=Qt Creator
- GenericName=C++ IDE for developing Qt applications
- X-KDE-StartupNotify=true
Copied: qtcreator/repos/extra-x86_64/qtcreator-preload-plugins.patch (from rev 352732, qtcreator/trunk/qtcreator-preload-plugins.patch)
===================================================================
--- qtcreator-preload-plugins.patch (rev 0)
+++ qtcreator-preload-plugins.patch 2019-05-07 18:22:31 UTC (rev 352733)
@@ -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",
More information about the arch-commits
mailing list