wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-04-22 17:17:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

qt6-declarative: update to 6.8.2.

Browse source
This commit is contained in:
John 2025-02-08 12:01:31 +01:00 • committed by John Zimmermann
parent c716a24315
commit 71d56feb91
3 changed files with 37 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
srcpkgs/qt6-declarative/patches/bin-qml-location.patch
View file

@ -134,27 +134,6 @@
#ifdef Q_OS_WIN
m_qmlimportscannerPath += QLatin1String(".exe");
#endif
--- a/tests/auto/qml/qmllint/tst_qmllint.cpp
+++ b/tests/auto/qml/qmllint/tst_qmllint.cpp
@@ -170,10 +170,18 @@ void TestQmllint::initTestCase()
{
QQmlDataTest::initTestCase();
m_qmllintPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmllint");
+ char *build_bin = getenv("QT_BUILD_BIN_PATH");
+ if (build_bin && *build_bin)
+ m_qmllintPath = QLatin1String(build_bin) + "/qmllint";
m_qmljsrootgenPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+ QLatin1String("/qmljsrootgen");
m_qmltyperegistrarPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+ QLatin1String("/qmltyperegistrar");
+ char *build_libexec = getenv("QT_BUILD_LIBEXEC_PATH");
+ if (build_libexec && *build_libexec) {
+ m_qmljsrootgenPath = QLatin1String(build_libexec) + "/qmljsrootgen";
+ m_qmltyperegistrarPath = QLatin1String(build_libexec) + "/qmltypesregistrar";
+ }
#ifdef Q_OS_WIN
m_qmllintPath += QLatin1String(".exe");
m_qmljsrootgenPath += QLatin1String(".exe");
--- a/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
+++ b/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
@@ -118,7 +118,11 @@ tst_QDebugMessageService::tst_QDebugMess
@ -204,3 +183,27 @@
: debugJsServerPath("qqmldebugjs");
return QQmlDebugTest::connectTo(
executable, restrictServices ? QStringLiteral("V8Debugger") : QString(),
--- a/tests/auto/qml/qmllint/tst_qmllint.cpp.orig 2025-02-23 13:31:55.799663378 +0100
+++ b/tests/auto/qml/qmllint/tst_qmllint.cpp 2025-02-23 13:34:17.539682211 +0100
@@ -194,6 +194,9 @@
{
QQmlDataTest::initTestCase();
m_qmllintPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmllint");
+ char *build_bin = getenv("QT_BUILD_BIN_PATH");
+ if (build_bin && *build_bin)
+ m_qmllintPath = QLatin1String(build_bin) + "/qmllint";
#ifdef Q_OS_WIN
m_qmllintPath += QLatin1String(".exe");
--- a/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.cpp 2025-01-24 07:04:38.000000000 +0100
+++ - 2025-02-23 13:38:39.915208747 +0100
@@ -29,6 +29,9 @@
m_qmljsrootgenPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+ QLatin1String("/qmljsrootgen");
+ char *build_libexec = getenv("QT_BUILD_LIBEXEC_PATH");
+ if (build_libexec && *build_libexec)
+ m_qmljsrootgenPath = QLatin1String(build_libexec) + "/qmljsrootgen";
#ifdef Q_OS_WIN
m_qmljsrootgenPath += QLatin1String(".exe");

11
srcpkgs/qt6-declarative/patches/test_generate_qmlls_ini.patch Normal file
View file

@ -0,0 +1,11 @@
--- tests/auto/cmake/test_generate_qmlls_ini/main.cpp 2025-02-23 14:05:00.700920877 +0100
+++ - 2025-02-23 14:07:13.399639405 +0100
@@ -42,7 +42,7 @@
)"_s;
const QString &docPath = QLibraryInfo::path(QLibraryInfo::DocumentationPath);
- const QString defaultImportPath = QLibraryInfo::path(QLibraryInfo::QmlImportsPath);
+ const QString defaultImportPath = qgetenv("QML2_IMPORT_PATH") + ":" + QLibraryInfo::path(QLibraryInfo::QmlImportsPath);
{
auto file = QFile(source.absoluteFilePath(qmllsIniName));
QVERIFY(file.exists());

4
srcpkgs/qt6-declarative/template
View file

@ -2,7 +2,7 @@
#
# On update, rebuild pkgs with qt6-declarative-private-devel
pkgname=qt6-declarative
version=6.8.1
version=6.8.2
revision=1
build_style=cmake
configure_args="-DQT_BUILD_TESTS=ON"
@ -14,7 +14,7 @@ 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/qtdeclarative-everywhere-src-${version}.tar.xz"
checksum=95d15d5c1b6adcedb1df6485219ad13b8dc1bb5168b5151f2f1f7246a4c039fc
checksum=144d876adc8bb55909735143e678d1e24eadcd0a380a0186792d88b731346d56
replaces="qt6-quickcontrols2>=0"
if [ "$CROSS_BUILD" ]; then