libre/qtcreator: updated to 4.8.2

8 files changed, 62 insertions, 228 deletions

diff --git a/libre/qtcreator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch b/libre/qtcreator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch
deleted file mode 100644
index 84e268712..000000000
--- a/libre/qtcreator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From c6d02dba2911d93e2379cfb5e550b93558dd51bf Mon Sep 17 00:00:00 2001
-From: Greg Nietsky <gregory@distrotech.co.za>
-Date: Tue, 4 Mar 2014 11:33:40 +0200
-Subject: [PATCH] Fix: Allow qt-creator to build on arm aarch32 and aarch64
-
-Botan is imported hardwired for x86 this small patch allows it
-too operate on arm other platforms could be added.
-
-Task-number: QTCREATORBUG-8107
-Change-Id: Iddea28f21c9fa1afd2fdd5d16a44e6c96a516a7a
----
- src/libs/3rdparty/botan/botan.cpp | 16 +++++++++++++++-
- src/libs/3rdparty/botan/botan.h   |  2 ++
- 2 files changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/src/libs/3rdparty/botan/botan.cpp b/src/libs/3rdparty/botan/botan.cpp
-index 917c385..4364a2e 100644
---- a/src/libs/3rdparty/botan/botan.cpp
-+++ b/src/libs/3rdparty/botan/botan.cpp
-@@ -1101,6 +1101,8 @@ class Montgomery_Exponentiator : public Modular_Exponentiator
- 
- #if (BOTAN_MP_WORD_BITS != 32)
-    #error The mp_x86_32 module requires that BOTAN_MP_WORD_BITS == 32
-+#elif !defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
-+typedef Botan::u64bit dword;
- #endif
- 
- #ifdef Q_OS_UNIX
-@@ -1118,6 +1120,7 @@ extern "C" {
- */
- inline word word_madd2(word a, word b, word* c)
-    {
-+#if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
-    asm(
-       ASM("mull %[b]")
-       ASM("addl %[c],%[a]")
-@@ -1127,6 +1130,11 @@ inline word word_madd2(word a, word b, word* c)
-       : "0"(a), "1"(b), [c]"g"(*c) : "cc");
- 
-    return a;
-+#else
-+   dword z = (dword)a * b + *c;
-+   *c = (word)(z >> BOTAN_MP_WORD_BITS);
-+   return (word)z;
-+#endif
-    }
- 
- /*
-@@ -1134,6 +1142,7 @@ inline word word_madd2(word a, word b, word* c)
- */
- inline word word_madd3(word a, word b, word c, word* d)
-    {
-+#if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
-    asm(
-       ASM("mull %[b]")
- 
-@@ -1147,6 +1156,11 @@ inline word word_madd3(word a, word b, word c, word* d)
-       : "0"(a), "1"(b), [c]"g"(c), [d]"g"(*d) : "cc");
- 
-    return a;
-+#else
-+   dword z = (dword)a * b + c + *d;
-+   *d = (word)(z >> BOTAN_MP_WORD_BITS);
-+   return (word)z;
-+#endif
-    }
- 
- }
-@@ -2315,7 +2329,7 @@ namespace Botan {
- 
- extern "C" {
- 
--#ifdef Q_OS_UNIX
-+#if defined(Q_OS_UNIX) && defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
- /*
- * Helper Macros for x86 Assembly
- */
-diff --git a/src/libs/3rdparty/botan/botan.h b/src/libs/3rdparty/botan/botan.h
-index 6a9cbe0..3bfdbc2 100644
---- a/src/libs/3rdparty/botan/botan.h
-+++ b/src/libs/3rdparty/botan/botan.h
-@@ -81,7 +81,9 @@
- #endif
- 
- #define BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN
-+#if !defined(__arm__) && !defined(__aarch64__)
- #define BOTAN_TARGET_CPU_IS_X86_FAMILY
-+#endif
- #define BOTAN_TARGET_UNALIGNED_MEMORY_ACCESS_OK 1
- 
- #if defined(BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN) || \
--- 
-2.3.0
-
diff --git a/libre/qtcreator/PKGBUILD b/libre/qtcreator/PKGBUILD
index b2ecd0e08..c1a4048b6 100644
--- a/libre/qtcreator/PKGBUILD
+++ b/libre/qtcreator/PKGBUILD
@@ -10,11 +10,10 @@
 
 # parabola changes and rationale:
 #  - removed support for qt5-webengine
-#  - added patch to build on arm
 
 
 pkgname=qtcreator
-pkgver=4.7.1
+pkgver=4.8.2
 _clangver=7.0.1
 pkgrel=1
 pkgrel+=.parabola2
@@ -22,10 +21,9 @@ pkgdesc='Lightweight, cross-platform integrated development environment'
 pkgdesc+=', without nonfree qt5-webengine support'
 arch=(x86_64)
 arch+=(i686 armv7h)
-url='http://qt-project.org'
+url='https://www.qt.io'
 license=(LGPL)
-
-depends=(qt5-tools qt5-quickcontrols qt5-quickcontrols2 clang=$_clangver qbs)
+depends=(qt5-tools qt5-quickcontrols qt5-quickcontrols2 clang=$_clangver qbs clazy)
 makedepends=(git mesa llvm python)
 options=(docs)
 optdepends=('qt5-doc: integrated Qt documentation'
@@ -38,54 +36,36 @@ 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"
-        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")
-source+=('0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch'
-         'libre.patch')
-sha256sums=('c98254336953f637015f14b8b4ddb5e274454a5416fd20dd09747a6e50762565'
-            '6f19fc9d83964a5460d224b3d44ce580553847960181fe0364e2ce26e1efd2e6'
-            '88b78c8ebd72cdad8f59bba8172cc5d1f3f9577e2bb31d841d5cabdd76eba36c'
-            'a7a00a390fb46f13d53055b1862dcd916deb595dbba20c2340662cab51e5a8c1'
-            '89a3fff5e398f11367ab060d910098c295968e909fcca3f35d30073cd80cbf03'
-            '56e6876f41ee8909ee197f7ab5a2bb18ad5a7fe26ce490a48cdf062fa199ffc6'
-            '53d119a70047c6b64d8227e65d402d308017cc1d99d8886421bf2da4f7407c80')
+source=("https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz"
+        qtcreator-clang-plugins.patch)
+source+=('libre.patch')
+sha256sums=('a8257daf39f6025c8523285dc73fd6b66645f3ff071e112b484325966eee0c92'
+            '34ea74698ddff9925e06bff6b4c995bf93488d1104e8cc517bcfdd621effb428'
+            'b44b9217770573b16e7bea873b0a0fb1b9f6f59502686eb6136d78bebc671ddb')
 
 prepare() {
   mkdir -p build
 
+  cd qt-creator-opensource-src-$pkgver
   # fix hardcoded libexec path
-  sed -e 's|libexec\/qtcreator|lib\/qtcreator|g' -i qt-creator-opensource-src-${pkgver}/qtcreator.pri
-
+  sed -e 's|libexec\/qtcreator|lib\/qtcreator|g' -i qtcreator.pri
   # use system qbs
-  rm -r qt-creator-opensource-src-${pkgver}/src/shared/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
-  cd qt-creator-opensource-src-${pkgver}
-  patch -p1 -i "$srcdir"/qtcreator-clang-plugins.patch
-  # Don't use unreleased API when building against clang 7
-  patch -p1 -i "$srcdir"/qtcreator-clang7.patch
-  # https://bugreports.qt.io/browse/QTCREATORBUG-19367
-  patch -p1 -i "$srcdir"/qtcreatorbug-19367a.patch
-  patch -p1 -i "$srcdir"/qtcreatorbug-19367b.patch
+  patch -p1 -i ../qtcreator-clang-plugins.patch
 
   # remove qt5-webengine support
   patch -Np1 -i "$srcdir"/libre.patch
   rm -rv src/plugins/help/webenginehelpviewer.{cpp,h}
-
-  # fix arm build
-  if [[ "$CARCH" == arm* ]]; then
-    git apply ../0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch
-  fi
 }
 
 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
+    DEFINES+=QBS_ENABLE_PROJECT_FILE_UPDATES "$srcdir"/qt-creator-opensource-src-$pkgver/qtcreator.pro
   make
   make docs
 }
diff --git a/libre/qtcreator/libre.patch b/libre/qtcreator/libre.patch
index f567dd62e..323f94239 100644
--- a/libre/qtcreator/libre.patch
+++ b/libre/qtcreator/libre.patch
@@ -2,7 +2,7 @@ diff --git a/src/plugins/help/help.pro b/src/plugins/help/help.pro
 index ffe71b6f1..a8d0bd72f 100644
 --- a/src/plugins/help/help.pro
 +++ b/src/plugins/help/help.pro
-@@ -58,13 +58,6 @@ FORMS += docsettingspage.ui \
+@@ -60,13 +60,6 @@ FORMS += docsettingspage.ui \
      generalsettingspage.ui \
      remotehelpfilter.ui
  
@@ -20,7 +20,7 @@ diff --git a/src/plugins/qmakeprojectmanager/qtmodulesinfo.cpp b/src/plugins/qma
 index a10899a2a..9ce2b463d 100644
 --- a/src/plugins/qmakeprojectmanager/qtmodulesinfo.cpp
 +++ b/src/plugins/qmakeprojectmanager/qtmodulesinfo.cpp
-@@ -93,14 +93,6 @@ static inline QVector<const item*> itemVector()
+@@ -93,14 +93,6 @@ static inline QVector<const item*> itemV
              QLatin1String("QtSvg"),
              QCoreApplication::translate("QtModulesInfo", "Classes for displaying the contents of SVG files"),
              false},
diff --git a/libre/qtcreator/libre.patch.new b/libre/qtcreator/libre.patch.new
new file mode 100644
index 000000000..03c40136f
--- /dev/null
+++ b/libre/qtcreator/libre.patch.new
@@ -0,0 +1,35 @@
+diff -rupN qt-creator-opensource-src-4.8.2/src/plugins/help/help.pro qt-creator-opensource-src-4.8.2.new/src/plugins/help/help.pro
+--- qt-creator-opensource-src-4.8.2/src/plugins/help/help.pro	2019-02-28 12:11:27.000000000 +0100
++++ qt-creator-opensource-src-4.8.2.new/src/plugins/help/help.pro	2019-03-21 18:56:01.591134301 +0100
+@@ -60,13 +60,6 @@ FORMS += docsettingspage.ui \
+     generalsettingspage.ui \
+     remotehelpfilter.ui
+ 
+-!isEmpty(QT.webenginewidgets.name) {
+-    QT += webenginewidgets
+-    HEADERS += webenginehelpviewer.h
+-    SOURCES += webenginehelpviewer.cpp
+-    DEFINES += QTC_WEBENGINE_HELPVIEWER
+-}
+-
+ osx {
+     DEFINES += QTC_MAC_NATIVE_HELPVIEWER
+     QT += macextras
+diff -rupN qt-creator-opensource-src-4.8.2/src/plugins/qmakeprojectmanager/qtmodulesinfo.cpp qt-creator-opensource-src-4.8.2.new/src/plugins/qmakeprojectmanager/qtmodulesinfo.cpp
+--- qt-creator-opensource-src-4.8.2/src/plugins/qmakeprojectmanager/qtmodulesinfo.cpp	2019-02-28 12:11:27.000000000 +0100
++++ qt-creator-opensource-src-4.8.2.new/src/plugins/qmakeprojectmanager/qtmodulesinfo.cpp	2019-03-21 18:56:01.591134301 +0100
+@@ -93,14 +93,6 @@ static inline QVector<const item*> itemV
+             QLatin1String("QtSvg"),
+             QCoreApplication::translate("QtModulesInfo", "Classes for displaying the contents of SVG files"),
+             false},
+-        {"webengine",
+-            QLatin1String("QtWebEngine"),
+-                    QCoreApplication::translate("QtModulesInfo", "Classes for displaying and editing Web content using Chromium backend"),
+-                    false},
+-        {"webenginewidgets",
+-            QLatin1String("QtWebEngineWidgets"),
+-                    QCoreApplication::translate("QtModulesInfo", "WebEngine and QWidget-based classes using Chromium backend"),
+-                    false},
+         {"webkit",
+             QLatin1String("QtWebKit"),
+             QCoreApplication::translate("QtModulesInfo", "Classes for displaying and editing Web content"),
diff --git a/libre/qtcreator/qtcreator-clang-plugins.patch b/libre/qtcreator/qtcreator-clang-plugins.patch
index 2585f29db..5dc5b567a 100644
--- a/libre/qtcreator/qtcreator-clang-plugins.patch
+++ b/libre/qtcreator/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());
diff --git a/libre/qtcreator/qtcreator-clang7.patch b/libre/qtcreator/qtcreator-clang7.patch
deleted file mode 100644
index 378b114b8..000000000
--- a/libre/qtcreator/qtcreator-clang7.patch
+++ /dev/null
@@ -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
- 
diff --git a/libre/qtcreator/qtcreatorbug-19367a.patch b/libre/qtcreator/qtcreatorbug-19367a.patch
deleted file mode 100644
index 397deda18..000000000
--- a/libre/qtcreator/qtcreatorbug-19367a.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 807b0f78fc89409559ecc22229650a883def436d Mon Sep 17 00:00:00 2001
-From: Jonathan Liu <net147@gmail.com>
-Date: Thu, 20 Sep 2018 13:46:05 +1000
-Subject: ProjectExplorer: Do not add too many newlines for remote processes
-
-Do not add newlines when remote process output gets flushed.
-
-Task-number: QTCREATORBUG-19367
-Change-Id: I9e878695279404d436264abd580884fb6a9e91ad
-Reviewed-by: hjk <hjk@qt.io>
----
- src/plugins/projectexplorer/runconfiguration.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
-index 438d631c78..f2f5871a5a 100644
---- a/src/plugins/projectexplorer/runconfiguration.cpp
-+++ b/src/plugins/projectexplorer/runconfiguration.cpp
-@@ -1659,12 +1659,12 @@ void SimpleTargetRunner::start()
- 
-         connect(&m_launcher, &ApplicationLauncher::remoteStderr,
-                 this, [this](const QString &output) {
--                    appendMessage(output, Utils::StdErrFormatSameLine);
-+                    appendMessage(output, Utils::StdErrFormatSameLine, false);
-                 });
- 
-         connect(&m_launcher, &ApplicationLauncher::remoteStdout,
-                 this, [this](const QString &output) {
--                    appendMessage(output, Utils::StdOutFormatSameLine);
-+                    appendMessage(output, Utils::StdOutFormatSameLine, false);
-                 });
- 
-         connect(&m_launcher, &ApplicationLauncher::finished,
--- 
-cgit v1.2.1
-
diff --git a/libre/qtcreator/qtcreatorbug-19367b.patch b/libre/qtcreator/qtcreatorbug-19367b.patch
deleted file mode 100644
index 7603877cd..000000000
--- a/libre/qtcreator/qtcreatorbug-19367b.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 813c16854df6be7fd1f1a8013d0b180f6248e5ab Mon Sep 17 00:00:00 2001
-From: Jonathan Liu <net147@gmail.com>
-Date: Thu, 20 Sep 2018 13:48:58 +1000
-Subject: SshDeviceProcess: Don't emit readyRead signals if no data available
-
-Task-number: QTCREATORBUG-19367
-Change-Id: I477800b2e2060748c2b5f9fde3acc91d9f5ae176
-Reviewed-by: hjk <hjk@qt.io>
-Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
----
- src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
-index b34e0ce805..3bb813d55d 100644
---- a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
-+++ b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
-@@ -245,13 +245,19 @@ void SshDeviceProcess::handleProcessFinished(int exitStatus)
- 
- void SshDeviceProcess::handleStdout()
- {
--    d->stdOut += d->process->readAllStandardOutput();
-+    QByteArray output = d->process->readAllStandardOutput();
-+    if (output.isEmpty())
-+        return;
-+    d->stdOut += output;
-     emit readyReadStandardOutput();
- }
- 
- void SshDeviceProcess::handleStderr()
- {
--    d->stdErr += d->process->readAllStandardError();
-+    QByteArray output = d->process->readAllStandardError();
-+    if (output.isEmpty())
-+        return;
-+    d->stdErr += output;
-     emit readyReadStandardError();
- }
- 
--- 
-cgit v1.2.1
-