[arch-commits] Commit in qtcreator/repos/testing-x86_64 (6 files)
Antonio Rojas
arojas at archlinux.org
Sat Sep 29 19:55:40 UTC 2018
Date: Saturday, September 29, 2018 @ 19:55:40
Author: arojas
Revision: 335554
archrelease: copy trunk to testing-x86_64
Added:
qtcreator/repos/testing-x86_64/PKGBUILD
(from rev 335553, qtcreator/trunk/PKGBUILD)
qtcreator/repos/testing-x86_64/qtcreator-clang-plugins.patch
(from rev 335553, qtcreator/trunk/qtcreator-clang-plugins.patch)
qtcreator/repos/testing-x86_64/qtcreator-clang7.patch
(from rev 335553, qtcreator/trunk/qtcreator-clang7.patch)
Deleted:
qtcreator/repos/testing-x86_64/PKGBUILD
qtcreator/repos/testing-x86_64/qtcreator-clang-plugins.patch
qtcreator/repos/testing-x86_64/qtcreator-clang7.patch
-------------------------------+
PKGBUILD | 143 ++++++++++++++++++++--------------------
qtcreator-clang-plugins.patch | 80 +++++++++++-----------
qtcreator-clang7.patch | 26 +++----
3 files changed, 128 insertions(+), 121 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-09-29 19:55:10 UTC (rev 335553)
+++ PKGBUILD 2018-09-29 19:55:40 UTC (rev 335554)
@@ -1,68 +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.7.1
-_clangver=7.0.0
-pkgrel=2
-pkgdesc='Lightweight, cross-platform integrated development environment'
-arch=(x86_64)
-url='http://qt-project.org'
-license=(LGPL)
-depends=(qt5-tools qt5-quickcontrols qt5-quickcontrols2 qt5-webengine clang=$_clangver qbs clazy)
-makedepends=(git mesa 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=("http://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz"
- qtcreator-clang-plugins.patch qtcreator-clang7.patch)
-sha256sums=('c98254336953f637015f14b8b4ddb5e274454a5416fd20dd09747a6e50762565'
- '6f19fc9d83964a5460d224b3d44ce580553847960181fe0364e2ce26e1efd2e6'
- '88b78c8ebd72cdad8f59bba8172cc5d1f3f9577e2bb31d841d5cabdd76eba36c')
-
-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
- # Don't use unreleased API when building against clang 7
- patch -p1 -i ../qtcreator-clang7.patch
-}
-
-build() {
- cd build
-
- qmake LLVM_INSTALL_DIR=/usr QBS_INSTALL_DIR=/usr 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/testing-x86_64/PKGBUILD (from rev 335553, qtcreator/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-09-29 19:55:40 UTC (rev 335554)
@@ -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.7.1
+_clangver=7.0.0
+pkgrel=3
+pkgdesc='Lightweight, cross-platform integrated development environment'
+arch=(x86_64)
+url='http://qt-project.org'
+license=(LGPL)
+depends=(qt5-tools qt5-quickcontrols qt5-quickcontrols2 qt5-webengine clang=$_clangver qbs clazy)
+makedepends=(git mesa 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=("http://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz"
+ qtcreator-clang-plugins.patch qtcreator-clang7.patch
+ qtcreatorbug-19367a.patch::"http://code.qt.io/cgit/qt-creator/qt-creator.git/patch/?id=807b0f78"
+ qtcreatorbug-19367b.patch::"http://code.qt.io/cgit/qt-creator/qt-creator.git/patch/?id=813c1685")
+sha256sums=('c98254336953f637015f14b8b4ddb5e274454a5416fd20dd09747a6e50762565'
+ '6f19fc9d83964a5460d224b3d44ce580553847960181fe0364e2ce26e1efd2e6'
+ '88b78c8ebd72cdad8f59bba8172cc5d1f3f9577e2bb31d841d5cabdd76eba36c'
+ 'a7a00a390fb46f13d53055b1862dcd916deb595dbba20c2340662cab51e5a8c1'
+ '89a3fff5e398f11367ab060d910098c295968e909fcca3f35d30073cd80cbf03')
+
+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
+ # Don't use unreleased API when building against clang 7
+ patch -p1 -i ../qtcreator-clang7.patch
+ # https://bugreports.qt.io/browse/QTCREATORBUG-19367
+ patch -p1 -i ../qtcreatorbug-19367a.patch
+ patch -p1 -i ../qtcreatorbug-19367b.patch
+}
+
+build() {
+ cd build
+
+ qmake LLVM_INSTALL_DIR=/usr QBS_INSTALL_DIR=/usr 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
+}
Deleted: qtcreator-clang-plugins.patch
===================================================================
--- qtcreator-clang-plugins.patch 2018-09-29 19:55:10 UTC (rev 335553)
+++ qtcreator-clang-plugins.patch 2018-09-29 19:55:40 UTC (rev 335554)
@@ -1,40 +0,0 @@
-diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
-index 25054f14ec..b0e17c3260 100644
---- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
-+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
-@@ -524,6 +524,7 @@ private:
- if (tidyMode == Mode::Disabled)
- return;
-
-+ addXclangArg("-load", "libclangTidyPlugin.so");
- addXclangArg("-add-plugin", "clang-tidy");
-
- if (tidyMode == Mode::File)
-@@ -539,6 +540,7 @@ private:
- if (checks.isEmpty())
- return;
-
-+ addXclangArg("-load", "ClangLazy.so");
- addXclangArg("-add-plugin", "clang-lazy");
- addXclangArg("-plugin-arg-clang-lazy", "enable-all-fixits");
- addXclangArg("-plugin-arg-clang-lazy", "no-autowrite-fixits");
-diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp
-index d91724392e..75e1692f49 100644
---- a/src/plugins/clangtools/clangtidyclazyrunner.cpp
-+++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp
-@@ -83,6 +83,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis
-
- const ClangDiagnosticConfig::TidyMode tidyMode = m_diagnosticConfig.clangTidyMode();
- if (tidyMode != ClangDiagnosticConfig::TidyMode::Disabled) {
-+ addXclangArg(arguments, QString("-load"), QString("libclangTidyPlugin.so"));
- addXclangArg(arguments, QString("-add-plugin"), QString("clang-tidy"));
- if (tidyMode != ClangDiagnosticConfig::TidyMode::File) {
- const QString tidyChecks = m_diagnosticConfig.clangTidyChecks();
-@@ -92,6 +93,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis
-
- const QString clazyChecks = m_diagnosticConfig.clazyChecks();
- if (!clazyChecks.isEmpty()) {
-+ addXclangArg(arguments, QString("-load"), QString("ClangLazy.so"));
- addXclangArg(arguments, QString("-add-plugin"), QString("clang-lazy"));
- addXclangArg(arguments, QString("-plugin-arg-clang-lazy"), QString("enable-all-fixits"));
- addXclangArg(arguments, QString("-plugin-arg-clang-lazy"), QString("no-autowrite-fixits"));
Copied: qtcreator/repos/testing-x86_64/qtcreator-clang-plugins.patch (from rev 335553, qtcreator/trunk/qtcreator-clang-plugins.patch)
===================================================================
--- qtcreator-clang-plugins.patch (rev 0)
+++ qtcreator-clang-plugins.patch 2018-09-29 19:55:40 UTC (rev 335554)
@@ -0,0 +1,40 @@
+diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
+index 25054f14ec..b0e17c3260 100644
+--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
++++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
+@@ -524,6 +524,7 @@ private:
+ if (tidyMode == Mode::Disabled)
+ return;
+
++ addXclangArg("-load", "libclangTidyPlugin.so");
+ addXclangArg("-add-plugin", "clang-tidy");
+
+ if (tidyMode == Mode::File)
+@@ -539,6 +540,7 @@ private:
+ if (checks.isEmpty())
+ return;
+
++ addXclangArg("-load", "ClangLazy.so");
+ addXclangArg("-add-plugin", "clang-lazy");
+ addXclangArg("-plugin-arg-clang-lazy", "enable-all-fixits");
+ addXclangArg("-plugin-arg-clang-lazy", "no-autowrite-fixits");
+diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp
+index d91724392e..75e1692f49 100644
+--- a/src/plugins/clangtools/clangtidyclazyrunner.cpp
++++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp
+@@ -83,6 +83,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis
+
+ const ClangDiagnosticConfig::TidyMode tidyMode = m_diagnosticConfig.clangTidyMode();
+ if (tidyMode != ClangDiagnosticConfig::TidyMode::Disabled) {
++ addXclangArg(arguments, QString("-load"), QString("libclangTidyPlugin.so"));
+ addXclangArg(arguments, QString("-add-plugin"), QString("clang-tidy"));
+ if (tidyMode != ClangDiagnosticConfig::TidyMode::File) {
+ const QString tidyChecks = m_diagnosticConfig.clangTidyChecks();
+@@ -92,6 +93,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis
+
+ const QString clazyChecks = m_diagnosticConfig.clazyChecks();
+ if (!clazyChecks.isEmpty()) {
++ addXclangArg(arguments, QString("-load"), QString("ClangLazy.so"));
+ addXclangArg(arguments, QString("-add-plugin"), QString("clang-lazy"));
+ addXclangArg(arguments, QString("-plugin-arg-clang-lazy"), QString("enable-all-fixits"));
+ addXclangArg(arguments, QString("-plugin-arg-clang-lazy"), QString("no-autowrite-fixits"));
Deleted: qtcreator-clang7.patch
===================================================================
--- qtcreator-clang7.patch 2018-09-29 19:55:10 UTC (rev 335553)
+++ qtcreator-clang7.patch 2018-09-29 19:55:40 UTC (rev 335554)
@@ -1,13 +0,0 @@
-diff --git a/src/tools/clangbackend/source/clangbackend_global.h b/src/tools/clangbackend/source/clangbackend_global.h
-index 658e2e8fb1..5c27224ae4 100644
---- a/src/tools/clangbackend/source/clangbackend_global.h
-+++ b/src/tools/clangbackend/source/clangbackend_global.h
-@@ -52,7 +52,7 @@ enum class PreferredTranslationUnit
- #endif
-
- // CLANG-UPGRADE-CHECK: Remove IS_SKIPWARNINGSFROMINCLUDEDFILES_SUPPORTED once we require clang >= 7.0
--#if defined(CINDEX_VERSION_HAS_SKIPWARNINGSFROMINCLUDEDFILES_BACKPORTED) || CINDEX_VERSION_MINOR >= 46
-+#if defined(CINDEX_VERSION_HAS_SKIPWARNINGSFROMINCLUDEDFILES_BACKPORTED)
- # define IS_SKIPWARNINGSFROMINCLUDEDFILES_SUPPORTED
- #endif
-
Copied: qtcreator/repos/testing-x86_64/qtcreator-clang7.patch (from rev 335553, qtcreator/trunk/qtcreator-clang7.patch)
===================================================================
--- qtcreator-clang7.patch (rev 0)
+++ qtcreator-clang7.patch 2018-09-29 19:55:40 UTC (rev 335554)
@@ -0,0 +1,13 @@
+diff --git a/src/tools/clangbackend/source/clangbackend_global.h b/src/tools/clangbackend/source/clangbackend_global.h
+index 658e2e8fb1..5c27224ae4 100644
+--- a/src/tools/clangbackend/source/clangbackend_global.h
++++ b/src/tools/clangbackend/source/clangbackend_global.h
+@@ -52,7 +52,7 @@ enum class PreferredTranslationUnit
+ #endif
+
+ // CLANG-UPGRADE-CHECK: Remove IS_SKIPWARNINGSFROMINCLUDEDFILES_SUPPORTED once we require clang >= 7.0
+-#if defined(CINDEX_VERSION_HAS_SKIPWARNINGSFROMINCLUDEDFILES_BACKPORTED) || CINDEX_VERSION_MINOR >= 46
++#if defined(CINDEX_VERSION_HAS_SKIPWARNINGSFROMINCLUDEDFILES_BACKPORTED)
+ # define IS_SKIPWARNINGSFROMINCLUDEDFILES_SUPPORTED
+ #endif
+
More information about the arch-commits
mailing list