qt6-base: update to 6.4.0.
This commit is contained in:
John
parent
fc8bc3f38a
commit
8782bf8f70
4 changed files with 16 additions and 73 deletions
|
|
@ -1,37 +0,0 @@
|
|||
From 8128abeaece5b05476f79ff493597b838b223512 Mon Sep 17 00:00:00 2001
|
||||
From: Marc Mutz <marc.mutz@qt.io>
|
||||
Date: Wed, 3 Aug 2022 17:23:20 +0200
|
||||
Subject: Fix qYieldCpu() for ARM < ARMv7
|
||||
|
||||
Apparently, we still support these architecture versions, and there's
|
||||
no way to detect ARMv6k-or-greater specifically, so exclude yield for
|
||||
ARM < ARMv7.
|
||||
|
||||
Amends 877c158c5976bebffd0ff02c39b6b66a842c6344.
|
||||
|
||||
Fixes: QTBUG-104316
|
||||
Pick-to: 6.4 6.3
|
||||
Change-Id: I51a2f0f8e0993dba41e47bb6110473ac8e7cd32a
|
||||
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
||||
---
|
||||
src/corelib/global/qsimd_p.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
(limited to 'src/corelib/global/qsimd_p.h')
|
||||
|
||||
diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h
|
||||
index ad78c3934f..093fc3aedc 100644
|
||||
--- a/src/corelib/global/qsimd_p.h
|
||||
+++ b/src/corelib/global/qsimd_p.h
|
||||
@@ -397,7 +397,7 @@ static inline void qYieldCpu()
|
||||
{
|
||||
#if defined(Q_PROCESSOR_X86)
|
||||
_mm_pause();
|
||||
-#elif defined(Q_PROCESSOR_ARM)
|
||||
+#elif defined(Q_PROCESSOR_ARM) && Q_PROCESSOR_ARM >= 7 /* yield was added in ARMv7 */
|
||||
# if __has_builtin(__builtin_arm_yield) /* e.g. Clang */
|
||||
__builtin_arm_yield();
|
||||
# elif defined(Q_OS_INTEGRITY) || \
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
|
||||
+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
|
||||
@@ -31,7 +31,7 @@
|
||||
#include <QtCore/private/qmetaobjectbuilder_p.h>
|
||||
|
||||
#ifdef Q_OS_LINUX
|
||||
-# include <pthread.h>
|
||||
+# include <sched.h>
|
||||
#endif
|
||||
|
||||
#include <algorithm>
|
||||
@@ -418,7 +418,7 @@ protected:
|
||||
const char *nm = name.constData();
|
||||
int tp = qRegisterMetaType<Bar>(nm);
|
||||
#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
|
||||
- pthread_yield();
|
||||
+ sched_yield();
|
||||
#endif
|
||||
QMetaType info(tp);
|
||||
if (!info.isValid()) {
|
||||
|
|
@ -1,15 +1,6 @@
|
|||
--- a/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
|
||||
+++ b/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
|
||||
@@ -190,6 +190,8 @@ void tst_QStorageInfo::tempFile()
|
||||
#ifdef Q_OS_LINUX
|
||||
if (storage1.fileSystemType() == "btrfs")
|
||||
QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
|
||||
+ if (storage1.fileSystemType() == "zfs")
|
||||
+ QSKIP("This test doesn't work on zfs");
|
||||
#endif
|
||||
|
||||
qint64 free = storage1.bytesFree();
|
||||
@@ -216,6 +218,8 @@ void tst_QStorageInfo::caching()
|
||||
--- a/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp 2022-11-03 00:05:49.281737775 +0100
|
||||
+++ - 2022-11-03 00:07:52.538145369 +0100
|
||||
@@ -165,6 +165,8 @@
|
||||
#ifdef Q_OS_LINUX
|
||||
if (storage1.fileSystemType() == "btrfs")
|
||||
QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'qt6-base'
|
||||
pkgname=qt6-base
|
||||
version=6.3.1
|
||||
version=6.4.0
|
||||
revision=1
|
||||
wrksrc="qtbase-everywhere-src-${version}"
|
||||
build_style=cmake
|
||||
|
|
@ -31,13 +31,13 @@ maintainer="John <me@johnnynator.dev>"
|
|||
license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
|
||||
homepage="https://www.qt.io"
|
||||
distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtbase-everywhere-src-${version}.tar.xz"
|
||||
checksum=0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03
|
||||
checksum=cb6475a0bd8567c49f7ffbb072a05516ee6671171bed55db75b22b94ead9b37d
|
||||
python_version=3
|
||||
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
hostmakedepends+=" qt6-base-devel"
|
||||
# QtSetup fails native builds if this is set
|
||||
configure_args+="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
|
||||
configure_args+="-DQT_FORCE_BUILD_TOOLS=true"
|
||||
fi
|
||||
|
||||
# It is currently expected that quite a few patches do fail
|
||||
|
|
@ -234,7 +234,9 @@ qt6-plugin-tls-qcertonly_package() {
|
|||
qt6-plugin-networkinformation_package() {
|
||||
short_desc+=" - Networkinformation plugin"
|
||||
pkg_install() {
|
||||
vmove usr/lib/qt6/plugins/networkinformation/
|
||||
vmove usr/lib/qt6/plugins/networkinformation/libqnetworkmanager.so
|
||||
vmove usr/lib/qt6/plugins/networkinformation/libqglib.so
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -251,6 +253,13 @@ qt6-base-devel_package() {
|
|||
qt6-test>=${version}_${revision}
|
||||
qt6-network>=${version}_${revision}
|
||||
qt6-xml>=${version}_${revision}
|
||||
qt6-plugin-odbc>=${version}_${revision}
|
||||
qt6-plugin-pgsql>=${version}_${revision}
|
||||
qt6-plugin-mysql>=${version}_${revision}
|
||||
qt6-plugin-sqlite>=${version}_${revision}
|
||||
qt6-plugin-tls-openssl>=${version}_${revision}
|
||||
qt6-plugin-tls-qcertonly>=${version}_${revision}
|
||||
qt6-plugin-networkinformation>=${version}_${revision}
|
||||
${makedepends}"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue