[PR PATCH] qtcreator: update to 6.0.2.

[PR PATCH] qtcreator: update to 6.0.2.

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 478 bytes --]

There is a new pull request by Chocimier against master on the void-packages repository

https://github.com/Chocimier/void-packages-org qtcreator
https://github.com/void-linux/void-packages/pull/35853

qtcreator: update to 6.0.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

A patch file from https://github.com/void-linux/void-packages/pull/35853.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qtcreator-35853.patch --]
[-- Type: text/x-diff, Size: 5579 bytes --]

From abd081c2d9b876ac0786b405b30cb33f63d7ac82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 25 Feb 2022 22:23:59 +0100
Subject: [PATCH] qtcreator: update to 6.0.2.

---
 .../qtcreator/patches/6.0.2--backtrace.patch  | 44 +++++++++++++++++++
 .../qtcreator/patches/QTCREATORBUG-26910.diff | 39 ++++++++++++++++
 srcpkgs/qtcreator/template                    |  6 +--
 3 files changed, 86 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/qtcreator/patches/6.0.2--backtrace.patch
 create mode 100644 srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff

diff --git a/srcpkgs/qtcreator/patches/6.0.2--backtrace.patch b/srcpkgs/qtcreator/patches/6.0.2--backtrace.patch
new file mode 100644
index 000000000000..c57e1ecc58b2
--- /dev/null
+++ b/srcpkgs/qtcreator/patches/6.0.2--backtrace.patch
@@ -0,0 +1,44 @@
+From 722d84fee5321ee6909f12c1d10b097c24ba1adc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
+Date: Sat, 22 Jan 2022 17:29:59 +0100
+Subject: [PATCH] backtrace
+
+
+diff --git a/src/libs/utils/qtcassert.cpp b/src/libs/utils/qtcassert.cpp
+index 560df43a..87ca6fd5 100644
+--- a/src/libs/utils/qtcassert.cpp
++++ b/src/libs/utils/qtcassert.cpp
+@@ -40,7 +40,7 @@ void dumpBacktrace(int maxdepth)
+ {
+     if (maxdepth == -1)
+         maxdepth = 1000;
+-#if defined(Q_OS_UNIX)
++#if defined(Q_OS_UNIX) && defined(__GLIBC__)
+     void *bt[1000] = {nullptr};
+     int size = backtrace(bt, sizeof(bt) / sizeof(bt[0]));
+     char **lines = backtrace_symbols(bt, size);
+diff --git a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp
+index a3a9806f..bb6cc30d 100644
+--- a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp
++++ b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp
+@@ -99,7 +99,7 @@ bool Exception::warnAboutException()
+ #endif
+ }
+ 
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_UNIX) && defined(__GLIBC__)
+ static QString getBackTrace()
+ {
+     QString backTrace;
+@@ -137,7 +137,7 @@ Exception::Exception(int line, const QByteArray &function,
+   , m_function(QString::fromUtf8(function))
+   , m_file(QString::fromUtf8(file))
+   , m_description(description)
+-  #ifdef Q_OS_LINUX
++  #if defined(Q_OS_UNIX) && defined(__GLIBC__)
+   , m_backTrace(getBackTrace())
+   #endif
+ {
+-- 
+2.34.1
+
diff --git a/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff b/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff
new file mode 100644
index 000000000000..8c07c72ccf10
--- /dev/null
+++ b/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff
@@ -0,0 +1,39 @@
+From b3e9f24ed1c0d3c0ee4917d4b449da90e00e888a Mon Sep 17 00:00:00 2001
+From: Marco Bubke <marco.bubke@qt.io>
+Date: Mon, 24 Jan 2022 14:38:29 +0100
+Subject: [PATCH] QmlDesigner: Fix 32 bit
+
+Because std::ptrdiff_t and int are the same under 32 bit the constructor
+is changed to a template. The class is private so it is very unlikely
+that it leads to errors.
+
+Task-number: QTCREATORBUG-26910
+Change-Id: I94c987b9b6d2f04876740ff283a339c0db056cfd
+Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
+Reviewed-by: Christophe Giboudeaux <christophe@krop.fr>
+Reviewed-by: Eike Ziller <eike.ziller@qt.io>
+Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
+---
+
+diff --git a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
+index 747c3d9..27d2905 100644
+--- a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
++++ b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
+@@ -67,15 +67,8 @@
+ 
+         StorageCacheIndex(const char *) = delete;
+ 
+-        constexpr explicit StorageCacheIndex(int id) noexcept
+-            : id{id}
+-        {}
+-
+-        constexpr explicit StorageCacheIndex(std::size_t id) noexcept
+-            : id{static_cast<int>(id)}
+-        {}
+-
+-        constexpr explicit StorageCacheIndex(std::ptrdiff_t id) noexcept
++        template<typename IntegerType>
++        constexpr explicit StorageCacheIndex(IntegerType id) noexcept
+             : id{static_cast<int>(id)}
+         {}
+ 
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 28e871b406e5..988491ec6496 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,6 +1,6 @@
 # Template file for 'qtcreator'
 pkgname=qtcreator
-version=5.0.3
+version=6.0.2
 revision=1
 wrksrc="qt-creator-opensource-src-${version}"
 build_style=qmake
@@ -8,7 +8,7 @@ make_install_args="INSTALL_ROOT=\${DESTDIR}/usr"
 hostmakedepends="clang llvm perl pkg-config python3 which qt5-qmake
  qt5-host-tools"
 makedepends="qt5-declarative-devel qt5-script-devel qt5-tools-devel
- qt5-quickcontrols clang llvm"
+ qt5-quickcontrols qt5-svg-devel clang llvm"
 depends="qt5-declarative-devel qt5-quickcontrols qt5-plugin-sqlite"
 short_desc="Cross-platform IDE for Qt developers"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -16,7 +16,7 @@ license="LGPL-3.0-or-later, custom:QtCompany-GPL-Exception-1.0"
 homepage="https://wiki.qt.io/Category:Tools::QtCreator"
 changelog="https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changes-${version}.md"
 distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
-checksum=7fd3b14310bcecee6b134f8cb7f4c0ed2385d7f4cecd48d756c5c1fd650ce2eb
+checksum=3d173c1a02ce55137a23f294e1a840d7648656e97826067eb29d9df653351bfa
 replaces="qtcreator-data>=0"
 python_version=3
 

Re: [PR PATCH] [Merged]: qtcreator: update to 6.0.2.

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 317 bytes --]

There's a merged pull request on the void-packages repository

qtcreator: update to 6.0.2.
https://github.com/void-linux/void-packages/pull/35853

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**