Updated to version 4.8.2.

3 files changed, 23 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1d2df0a5da40..6d20f5f47d08 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = qtcreator-fixed-themes
 	pkgdesc = Lightweight, cross-platform integrated development environment, with fixes applied for various themes and other bug fixes
-	pkgver = 4.8.1
+	pkgver = 4.8.2
 	pkgrel = 2
-	url = http://qt-project.org
+	url = https://www.qt.io
 	arch = x86_64
 	license = LGPL
 	makedepends = git
@@ -13,7 +13,7 @@ pkgbase = qtcreator-fixed-themes
 	depends = qt5-quickcontrols
 	depends = qt5-quickcontrols2
 	depends = qt5-webengine
-	depends = clang=7.0.1
+	depends = clang=8.0.0
 	depends = qbs
 	depends = clazy
 	optdepends = qt5-doc: integrated Qt documentation
@@ -28,15 +28,15 @@ pkgbase = qtcreator-fixed-themes
 	optdepends = valgrind: analyze support
 	conflicts = qtcreator
 	options = docs
-	source = http://download.qt.io/official_releases/qtcreator/4.8/4.8.1/qt-creator-opensource-src-4.8.1.tar.xz
+	source = https://download.qt.io/official_releases/qtcreator/4.8/4.8.2/qt-creator-opensource-src-4.8.2.tar.xz
 	source = qtcreator-clang-plugins.patch
 	source = qtcreator-theme-fixes.patch
 	source = qtcreator-occurrences-fix.patch
 	source = qtcreator-debugger-columns-fix.patch
 	source = qtcreator-cmake-fail-target-fix.patch
 	source = qtcreator-cmake-edit-fix.patch
-	sha256sums = 8f691de9b30b99dd44e010525ba9bf3054142a1082dc5273c46c533b91c07bd9
-	sha256sums = 6f19fc9d83964a5460d224b3d44ce580553847960181fe0364e2ce26e1efd2e6
+	sha256sums = a8257daf39f6025c8523285dc73fd6b66645f3ff071e112b484325966eee0c92
+	sha256sums = 34ea74698ddff9925e06bff6b4c995bf93488d1104e8cc517bcfdd621effb428
 	sha256sums = bf0f8e88d0fa628d24f59eaf1f359873926998dde442e3bcbd56afcdd6eec7fa
 	sha256sums = 640c4c1607f9ee867e2445ad576697b9b0d3c9a64ae6589c1b99ea4f1d7e3481
 	sha256sums = cf378a8b591a10646ad89d101375d8b04844c76a83d6c9c960036ba6a3b122e3
diff --git a/PKGBUILD b/PKGBUILD
index 5cbec77a3bdc..bda8de84b413 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,12 +10,12 @@
 # Contributor: delor <bartekpiech gmail com>
 
 pkgname=qtcreator-fixed-themes
-pkgver=4.8.1
-_clangver=7.0.1
+pkgver=4.8.2
+_clangver=8.0.0
 pkgrel=2
 pkgdesc='Lightweight, cross-platform integrated development environment, with fixes applied for various themes and other bug fixes'
 arch=(x86_64)
-url='http://qt-project.org'
+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)
@@ -31,15 +31,15 @@ optdepends=('qt5-doc: integrated Qt documentation'
             '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"
+source=("https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz"
         qtcreator-clang-plugins.patch
         qtcreator-theme-fixes.patch
         qtcreator-occurrences-fix.patch
         qtcreator-debugger-columns-fix.patch
         qtcreator-cmake-fail-target-fix.patch
         qtcreator-cmake-edit-fix.patch)
-sha256sums=('8f691de9b30b99dd44e010525ba9bf3054142a1082dc5273c46c533b91c07bd9'
-            '6f19fc9d83964a5460d224b3d44ce580553847960181fe0364e2ce26e1efd2e6'
+sha256sums=('a8257daf39f6025c8523285dc73fd6b66645f3ff071e112b484325966eee0c92'
+            '34ea74698ddff9925e06bff6b4c995bf93488d1104e8cc517bcfdd621effb428'
             'bf0f8e88d0fa628d24f59eaf1f359873926998dde442e3bcbd56afcdd6eec7fa'
             '640c4c1607f9ee867e2445ad576697b9b0d3c9a64ae6589c1b99ea4f1d7e3481'
             'cf378a8b591a10646ad89d101375d8b04844c76a83d6c9c960036ba6a3b122e3'
diff --git a/qtcreator-clang-plugins.patch b/qtcreator-clang-plugins.patch
index 2585f29dbf5c..5dc5b567afa4 100644
--- a/qtcreator-clang-plugins.patch
+++ b/qtcreator-clang-plugins.patch
@@ -10,14 +10,16 @@ index 25054f14ec..b0e17c3260 100644
          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 @@ index d91724392e..75e1692f49 100644
          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());