[arch-commits] Commit in qtcreator/trunk (PKGBUILD qtcreator-clang-plugins.patch)

2019-05-05 Thread Antonio Rojas via arch-commits 
Date: Sunday, May 5, 2019 @ 09:10:07
  Author: arojas
Revision: 352525

Fix clazy 1.5 patch

Modified:
  qtcreator/trunk/PKGBUILD
  qtcreator/trunk/qtcreator-clang-plugins.patch

---+
 PKGBUILD  |2 +-
 qtcreator-clang-plugins.patch |5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-04 23:53:26 UTC (rev 352524)
+++ PKGBUILD2019-05-05 09:10:07 UTC (rev 352525)
@@ -30,7 +30,7 @@
 
source=("https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz;
 qtcreator-clang-plugins.patch)
 sha256sums=('46ee1992531b769450f8be96cf63520b609d7dd305df345d7cd8216ac396e6a8'
-'149ffcd0ab7c53605951c66dba707ff7e0dc17136c921f1a668fc392c5a7f3f2')
+'ba4ebfa0cb2a9977b9ec9f12eaa92dac152ed2d67976829f2a596bc27888f0ab')
 
 prepare() {
   mkdir -p build

Modified: qtcreator-clang-plugins.patch
===
--- qtcreator-clang-plugins.patch   2019-05-04 23:53:26 UTC (rev 352524)
+++ qtcreator-clang-plugins.patch   2019-05-05 09:10:07 UTC (rev 352525)
@@ -49,9 +49,10 @@
  const QString clazyChecks = m_diagnosticConfig.clazyChecks();
  if (!clazyChecks.isEmpty()) {
 -arguments << XclangArgs({"-add-plugin",
+- "clang-lazy",
+- "-plugin-arg-clang-lazy",
 +arguments << XclangArgs({"-load", "ClazyPlugin.so", "-add-plugin",
-  "clang-lazy",
-- "-plugin-arg-clang-lazy",
++ "clazy",
 + "-plugin-arg-clazy",
   "enable-all-fixits",
 - "-plugin-arg-clang-lazy",

[arch-commits] Commit in qtcreator/trunk (PKGBUILD qtcreator-clang-plugins.patch)

2019-04-20 Thread Antonio Rojas via arch-commits 
Date: Saturday, April 20, 2019 @ 20:06:15
  Author: arojas
Revision: 351784

Update to 4.9.0

Modified:
  qtcreator/trunk/PKGBUILD
  qtcreator/trunk/qtcreator-clang-plugins.patch

---+
 PKGBUILD  |   19 +-
 qtcreator-clang-plugins.patch |   74 
 2 files changed, 49 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-20 20:03:24 UTC (rev 351783)
+++ PKGBUILD2019-04-20 20:06:15 UTC (rev 351784)
@@ -7,15 +7,15 @@
 # Contributor: delor 
 
 pkgname=qtcreator
-pkgver=4.8.2
+pkgver=4.9.0
 _clangver=8.0.0
-pkgrel=2
+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)
-makedepends=(git mesa llvm python)
+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'
@@ -29,8 +29,8 @@
 '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=('a8257daf39f6025c8523285dc73fd6b66645f3ff071e112b484325966eee0c92'
-'34ea74698ddff9925e06bff6b4c995bf93488d1104e8cc517bcfdd621effb428')
+sha256sums=('46ee1992531b769450f8be96cf63520b609d7dd305df345d7cd8216ac396e6a8'
+'149ffcd0ab7c53605951c66dba707ff7e0dc17136c921f1a668fc392c5a7f3f2')
 
 prepare() {
   mkdir -p build
@@ -49,8 +49,11 @@
 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
+  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
 }

Modified: qtcreator-clang-plugins.patch
===
--- qtcreator-clang-plugins.patch   2019-04-20 20:03:24 UTC (rev 351783)
+++ qtcreator-clang-plugins.patch   2019-04-20 20:06:15 UTC (rev 351784)
@@ -1,62 +1,64 @@
 diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp 
b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
-index 0738aa8e70..0ef27d9397 100644
+index 706c5101a3..dbfaeb8457 100644
 --- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
 +++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
-@@ -525,6 +525,7 @@ private:
+@@ -511,6 +511,7 @@ private:
  if (tidyMode == Mode::Disabled)
  return;
  
-+addXclangArg("-load", "libclangTidyPlugin.so");
- addXclangArg("-add-plugin", "clang-tidy");
++m_options.append(CppTools::XclangArgs({"-load", 
"libclangTidyPlugin.so"}));
+ m_options.append(CppTools::XclangArgs({"-add-plugin", "clang-tidy"}));
  
  if (tidyMode == Mode::File)
-@@ -540,15 +541,16 @@ private:
+@@ -526,15 +527,15 @@ private:
  if (checks.isEmpty())
  return;
  
--addXclangArg("-add-plugin", "clang-lazy");
--addXclangArg("-plugin-arg-clang-lazy", "enable-all-fixits");
--addXclangArg("-plugin-arg-clang-lazy", "no-autowrite-fixits");
--addXclangArg("-plugin-arg-clang-lazy", checks);
-+addXclangArg("-load", "ClazyPlugin.so");
-+addXclangArg("-add-plugin", "clazy");
-+addXclangArg("-plugin-arg-clazy", "enable-all-fixits");
-+addXclangArg("-plugin-arg-clazy", "no-autowrite-fixits");
-+addXclangArg("-plugin-arg-clazy", checks);
- 
- // NOTE: we already use -isystem for all include paths to make 
libclang skip diagnostics for
- // all of them. That means that ignore-included-files will not change 
anything unless we decide
- // to return the original -I prefix for some include paths.
--addXclangArg("-plugin-arg-clang-lazy", "ignore-included-files");
-+addXclangArg("-plugin-arg-clazy", "ignore-included-files");
+-m_options.append(CppTools::XclangArgs({"-add-plugin",
+-   "clang-lazy",
+-   "-plugin-arg-clang-lazy",
++m_options.append(CppTools::XclangArgs({"-load", "ClazyPlugin.so", 
"-add-plugin",
++   "clazy",
++

[arch-commits] Commit in qtcreator/trunk (PKGBUILD qtcreator-clang-plugins.patch)

2019-02-01 Thread Antonio Rojas via arch-commits 
Date: Friday, February 1, 2019 @ 09:54:19
  Author: arojas
Revision: 344998

Support clazy 1.5

Modified:
  qtcreator/trunk/PKGBUILD
  qtcreator/trunk/qtcreator-clang-plugins.patch

---+
 PKGBUILD  |2 +-
 qtcreator-clang-plugins.patch |   18 +++---
 2 files changed, 12 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-01 08:47:53 UTC (rev 344997)
+++ PKGBUILD2019-02-01 09:54:19 UTC (rev 344998)
@@ -30,7 +30,7 @@
 
source=("https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz;
 qtcreator-clang-plugins.patch)
 sha256sums=('8f691de9b30b99dd44e010525ba9bf3054142a1082dc5273c46c533b91c07bd9'
-'6f19fc9d83964a5460d224b3d44ce580553847960181fe0364e2ce26e1efd2e6')
+'34ea74698ddff9925e06bff6b4c995bf93488d1104e8cc517bcfdd621effb428')
 
 prepare() {
   mkdir -p build

Modified: qtcreator-clang-plugins.patch
===
--- qtcreator-clang-plugins.patch   2019-02-01 08:47:53 UTC (rev 344997)
+++ qtcreator-clang-plugins.patch   2019-02-01 09:54:19 UTC (rev 344998)
@@ -10,14 +10,16 @@
  addXclangArg("-add-plugin", "clang-tidy");
  
  if (tidyMode == Mode::File)
-@@ -539,6 +540,7 @@ private:
+@@ -539,7 +540,8 @@ private:
  if (checks.isEmpty())
  return;
- 
-+addXclangArg("-load", "ClangLazy.so");
- addXclangArg("-add-plugin", "clang-lazy");
+
+-addXclangArg("-add-plugin", "clang-lazy");
++addXclangArg("-load", "ClazyPlugin.so");
++addXclangArg("-add-plugin", "clazy");
  addXclangArg("-plugin-arg-clang-lazy", "enable-all-fixits");
  addXclangArg("-plugin-arg-clang-lazy", "no-autowrite-fixits");
+ addXclangArg("-plugin-arg-clang-lazy", checks);
 diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp 
b/src/plugins/clangtools/clangtidyclazyrunner.cpp
 index d91724392e..75e1692f49 100644
 --- a/src/plugins/clangtools/clangtidyclazyrunner.cpp
@@ -30,11 +32,13 @@
  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
+@@ -92,7 +93,8 @@ 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("-add-plugin"), 
QString("clang-lazy"));
++addXclangArg(arguments, QString("-load"), QString("ClazyPlugin.so"));
++addXclangArg(arguments, QString("-add-plugin"), QString("clazy"));
  addXclangArg(arguments, QString("-plugin-arg-clang-lazy"), 
QString("enable-all-fixits"));
  addXclangArg(arguments, QString("-plugin-arg-clang-lazy"), 
QString("no-autowrite-fixits"));
+ addXclangArg(arguments, QString("-plugin-arg-clang-lazy"), 
m_diagnosticConfig.clazyChecks());

[arch-commits] Commit in qtcreator/trunk (PKGBUILD qtcreator-clang-plugins.patch)

2018-08-26 Thread Antonio Rojas via arch-commits 
Date: Sunday, August 26, 2018 @ 08:43:40
  Author: arojas
Revision: 333020

Load analyzer plugins on demand (FS#59492)

Added:
  qtcreator/trunk/qtcreator-clang-plugins.patch
Modified:
  qtcreator/trunk/PKGBUILD

---+
 PKGBUILD  |   17 +++--
 qtcreator-clang-plugins.patch |   40 
 2 files changed, 51 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-26 00:20:00 UTC (rev 333019)
+++ PKGBUILD2018-08-26 08:43:40 UTC (rev 333020)
@@ -10,12 +10,12 @@
 pkgname=qtcreator
 pkgver=4.7.0
 _clangver=6.0.1
-pkgrel=1
+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)
+depends=(qt5-tools qt5-quickcontrols qt5-quickcontrols2 qt5-webengine 
clang=$_clangver qbs clazy)
 makedepends=(git mesa llvm)
 options=(docs)
 optdepends=('qt5-doc: integrated Qt documentation'
@@ -27,10 +27,11 @@
 'git: git support'
 'mercurial: mercurial support'
 'bzr: bazaar support'
-'valgrind: analyze support'
-'clazy: code analyzer')
-source=("http://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz;)
-sha256sums=('4b19870bf8d43665deac73a0522a1459d19f5b18b6f52030bb7fbc82d90b759b')
+'valgrind: analyze support')
+source=("http://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz;
+qtcreator-clang-plugins.patch)
+sha256sums=('4b19870bf8d43665deac73a0522a1459d19f5b18b6f52030bb7fbc82d90b759b'
+'6f19fc9d83964a5460d224b3d44ce580553847960181fe0364e2ce26e1efd2e6')
 
 prepare() {
   mkdir -p build
@@ -40,6 +41,10 @@
   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=7f349701d3ea0c47be3a43e2656993fd55cf
+  # and https://bugs.archlinux.org/task/59492
+  patch -p1 -i ../qtcreator-clang-plugins.patch
 }
 
 build() {

Added: qtcreator-clang-plugins.patch
===
--- qtcreator-clang-plugins.patch   (rev 0)
+++ qtcreator-clang-plugins.patch   2018-08-26 08:43:40 UTC (rev 333020)
@@ -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"));