qtcreator: update to 9.0.1.

This commit is contained in:
Piotr Wójcik 2023-02-15 18:55:05 +01:00 committed by Chocimier
parent 4157821449
commit 4de1ab357c
3 changed files with 50 additions and 38 deletions

View File

@ -1,28 +1,28 @@
From 722d84fee5321ee6909f12c1d10b097c24ba1adc Mon Sep 17 00:00:00 2001 From f178b839d5137f2e8e1e728cbf877f6a3a73346e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl> From: Piotr Wójcik <chocimier@tlen.pl>
Date: Sat, 22 Jan 2022 17:29:59 +0100 Date: Sat, 21 Jan 2023 21:29:41 +0100
Subject: [PATCH] backtrace Subject: backtrace
diff --git a/src/libs/utils/qtcassert.cpp b/src/libs/utils/qtcassert.cpp diff --git a/src/libs/utils/qtcassert.cpp b/src/libs/utils/qtcassert.cpp
index 560df43a..87ca6fd5 100644 index d371b6f6..40b4cd9b 100644
--- a/src/libs/utils/qtcassert.cpp --- a/src/libs/utils/qtcassert.cpp
+++ b/src/libs/utils/qtcassert.cpp +++ b/src/libs/utils/qtcassert.cpp
@@ -40,7 +40,7 @@ void dumpBacktrace(int maxdepth) @@ -29,7 +29,7 @@ void dumpBacktrace(int maxdepth)
{ const int ArraySize = 1000;
if (maxdepth == -1) if (maxdepth < 0 || maxdepth > ArraySize)
maxdepth = 1000; maxdepth = ArraySize;
-#if defined(Q_OS_UNIX) -#if defined(Q_OS_UNIX)
+#if defined(Q_OS_UNIX) && defined(__GLIBC__) +#if defined(Q_OS_UNIX) && defined(__GLIBC__)
void *bt[1000] = {nullptr}; void *bt[ArraySize] = {nullptr};
int size = backtrace(bt, sizeof(bt) / sizeof(bt[0])); int size = backtrace(bt, maxdepth);
char **lines = backtrace_symbols(bt, size); char **lines = backtrace_symbols(bt, size);
diff --git a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp diff --git a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp
index a3a9806f..bb6cc30d 100644 index ba8afd56..2ae4041a 100644
--- a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp --- a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp
+++ b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp +++ b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp
@@ -99,7 +99,7 @@ bool Exception::warnAboutException() @@ -75,7 +75,7 @@ bool Exception::warnAboutException()
#endif return s_warnAboutException;
} }
-#ifdef Q_OS_LINUX -#ifdef Q_OS_LINUX
@ -30,7 +30,7 @@ index a3a9806f..bb6cc30d 100644
static QString getBackTrace() static QString getBackTrace()
{ {
QString backTrace; QString backTrace;
@@ -137,7 +137,7 @@ Exception::Exception(int line, const QByteArray &function, @@ -113,7 +113,7 @@ Exception::Exception(int line, const QByteArray &function,
, m_function(QString::fromUtf8(function)) , m_function(QString::fromUtf8(function))
, m_file(QString::fromUtf8(file)) , m_file(QString::fromUtf8(file))
, m_description(description) , m_description(description)
@ -40,5 +40,5 @@ index a3a9806f..bb6cc30d 100644
#endif #endif
{ {
-- --
2.34.1 2.39.0

View File

@ -1,13 +1,22 @@
--- a/src/app/main.cpp 2020-08-25 13:26:21.000000000 +0200 From b13eb9f3dc96226d2f10a986c7e4d6c565e63c53 Mon Sep 17 00:00:00 2001
+++ b/src/app/main.cpp 2020-09-03 14:21:38.975668939 +0200 From: Piotr Wójcik <chocimier@tlen.pl>
@@ -718,8 +718,10 @@ Date: Sat, 21 Jan 2023 23:34:10 +0100
{ Subject: malloc_trim
m_trimTimer.setSingleShot(true);
m_trimTimer.setInterval(60000);
+#if defined(__GLIBC__) diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
// glibc may not actually free memory in free(). index 4950eb90..a3cd7f4e 100644
connect(&m_trimTimer, &QTimer::timeout, this, [] { malloc_trim(0); }); --- a/src/plugins/coreplugin/mainwindow.cpp
+#endif +++ b/src/plugins/coreplugin/mainwindow.cpp
} @@ -216,7 +216,7 @@ MainWindow::MainWindow()
m_trimTimer.setSingleShot(true);
m_trimTimer.setInterval(60000);
// glibc may not actually free memory in free().
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) && defined(__GLIBC__)
connect(&m_trimTimer, &QTimer::timeout, this, [] { malloc_trim(0); });
#endif
}
--
2.39.0
bool eventFilter(QObject *, QEvent *e) override

View File

@ -1,23 +1,25 @@
# Template file for 'qtcreator' # Template file for 'qtcreator'
pkgname=qtcreator pkgname=qtcreator
version=8.0.0 version=9.0.1
revision=1 revision=1
build_style=cmake build_style=cmake
configure_args="$(vopt_bool qbs BUILD_QBS)" configure_args="$(vopt_bool qbs BUILD_QBS) -DWITH_DOCS=ON -DBUILD_WITH_PCH=OFF
hostmakedepends="clang llvm perl pkg-config python3 which qt5-qmake -DQT_HOST_PATH=/usr/ -DQT_HOST_PATH_CMAKE_DIR=/usr/lib64/cmake/Qt6"
qt5-host-tools qt5-tools" hostmakedepends="clang llvm perl pkg-config python3 which
makedepends="qt5-declarative-devel qt5-script-devel qt5-tools-devel qt6-base-devel qt6-tools qtchooser qt6-shadertools-devel"
qt5-quickcontrols qt5-svg-devel qt5-plugin-odbc qt5-plugin-sqlite makedepends="qt6-declarative-devel
qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql qt6-quick3d-devel qt6-svg-devel qt6-plugin-odbc qt6-plugin-sqlite
qt6-plugin-pgsql qt6-plugin-mysql qt6-qt5compat-devel
qt6-serialport-devel
clang llvm clang-tools-extra" clang llvm clang-tools-extra"
depends="qt5-declarative-devel qt5-quickcontrols qt5-plugin-sqlite" depends="qt6-plugin-sqlite"
short_desc="Cross-platform IDE for Qt developers" short_desc="Cross-platform IDE for Qt developers"
maintainer="Piotr Wójcik <chocimier@tlen.pl>" maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="LGPL-3.0-or-later, custom:QtCompany-GPL-Exception-1.0" license="LGPL-3.0-or-later, custom:QtCompany-GPL-Exception-1.0"
homepage="https://wiki.qt.io/Category:Tools::QtCreator" homepage="https://wiki.qt.io/Category:Tools::QtCreator"
changelog="https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changelog/changes-${version}.md" changelog="https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changelog/changes-${version}.md"
distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/qt-creator-opensource-src-${version}.tar.xz" distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/qt-creator-opensource-src-${version}.tar.xz"
checksum=323640f96c76d199fe5bf7b02cbf2dd1a3b6489ab7cc0adeaad3957d8dc96f17 checksum=4e4e881b2635bac07e785c9e889ab9a253ad47a00074e260cbccdb3c0aef189f
replaces="qtcreator-data>=0" replaces="qtcreator-data>=0"
python_version=3 python_version=3
@ -25,6 +27,7 @@ build_options="qbs"
desc_option_qbs="Build vendored Qbs" desc_option_qbs="Build vendored Qbs"
if [ -z "$XBPS_CROSS_BUILD" ]; then if [ -z "$XBPS_CROSS_BUILD" ]; then
hostmakedepends+=" qt6-tools-devel"
build_options_default="qbs" build_options_default="qbs"
fi fi