[arch-commits] Commit in qtcreator/repos (3 files)

Antonio Rojas arojas at archlinux.org
Sat Apr 20 20:06:55 UTC 2019


    Date: Saturday, April 20, 2019 @ 20:06:38
  Author: arojas
Revision: 351785

archrelease: copy trunk to staging-x86_64

Added:
  qtcreator/repos/staging-x86_64/
  qtcreator/repos/staging-x86_64/PKGBUILD
    (from rev 351784, qtcreator/trunk/PKGBUILD)
  qtcreator/repos/staging-x86_64/qtcreator-clang-plugins.patch
    (from rev 351784, qtcreator/trunk/qtcreator-clang-plugins.patch)

-------------------------------+
 PKGBUILD                      |   68 ++++++++++++++++++++++++++++++++++++++++
 qtcreator-clang-plugins.patch |   64 +++++++++++++++++++++++++++++++++++++
 2 files changed, 132 insertions(+)

Copied: qtcreator/repos/staging-x86_64/PKGBUILD (from rev 351784, qtcreator/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2019-04-20 20:06:38 UTC (rev 351785)
@@ -0,0 +1,68 @@
+# 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=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)
+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-clang-plugins.patch)
+sha256sums=('46ee1992531b769450f8be96cf63520b609d7dd305df345d7cd8216ac396e6a8'
+            '149ffcd0ab7c53605951c66dba707ff7e0dc17136c921f1a668fc392c5a7f3f2')
+
+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
+  # Load analyzer plugins on demand, 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-clang-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
+}

Copied: qtcreator/repos/staging-x86_64/qtcreator-clang-plugins.patch (from rev 351784, qtcreator/trunk/qtcreator-clang-plugins.patch)
===================================================================
--- staging-x86_64/qtcreator-clang-plugins.patch	                        (rev 0)
+++ staging-x86_64/qtcreator-clang-plugins.patch	2019-04-20 20:06:38 UTC (rev 351785)
@@ -0,0 +1,64 @@
+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
+@@ -511,6 +511,7 @@ private:
+         if (tidyMode == Mode::Disabled)
+             return;
+ 
++        m_options.append(CppTools::XclangArgs({"-load", "libclangTidyPlugin.so"}));
+         m_options.append(CppTools::XclangArgs({"-add-plugin", "clang-tidy"}));
+ 
+         if (tidyMode == Mode::File)
+@@ -526,15 +527,15 @@ private:
+         if (checks.isEmpty())
+             return;
+ 
+-        m_options.append(CppTools::XclangArgs({"-add-plugin",
+-                                               "clang-lazy",
+-                                               "-plugin-arg-clang-lazy",
++        m_options.append(CppTools::XclangArgs({"-load", "ClazyPlugin.so", "-add-plugin",
++                                               "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
+@@ -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,13 +86,13 @@ 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",
+                                  "clang-lazy",
+-                                 "-plugin-arg-clang-lazy",
++                                 "-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()});
+     }
+ 


More information about the arch-commits mailing list