From 0e051326b1cb2bdbd5cc1ff5aca157575fa7cfd4 Mon Sep 17 00:00:00 2001 From: openKylinBot Date: Sat, 14 May 2022 17:42:42 +0800 Subject: [PATCH] format patches --- debian/patches/disableopengltests.patch | 22 +- debian/patches/fix_sweep_step.patch | 42 ++- .../fix_test_remove_qlibraryinfo.patch | 243 +++++++++++------- debian/patches/gcc_11.patch | 16 +- debian/patches/python3.patch | 17 +- debian/patches/remove_youtube_iframe.patch | 13 +- debian/patches/riscv64-latomic.patch | 13 +- debian/patches/series | 3 - .../patches/support_apos_in_styled_text.patch | 18 +- .../patches/tst_qmldiskcache_big_endian.patch | 13 +- debian/patches/wait_for_window_exposed.patch | 15 +- 11 files changed, 282 insertions(+), 133 deletions(-) diff --git a/debian/patches/disableopengltests.patch b/debian/patches/disableopengltests.patch index 18ce8c8b..e0cddd50 100644 --- a/debian/patches/disableopengltests.patch +++ b/debian/patches/disableopengltests.patch @@ -1,10 +1,20 @@ -Description: Disable all tests that fails with xvfb - So far some tests need real OpenGL support -Author: Sandro Knauß +From: =?utf-8?q?Sandro_Knau=C3=9F?= +Date: Sat, 14 May 2022 17:42:41 +0800 +Subject: Disable all tests that fails with xvfb + +So far some tests need real OpenGL support Origin: Debian Forwarded: not-needed - it is a limitation so far inside Debian Last-Update: 2019-03-14 +--- + tests/auto/auto.pro | 1 - + tests/auto/qml/debugger/debugger.pro | 1 - + tests/auto/qml/qml.pro | 5 ----- + tests/auto/quick/quick.pro | 4 +--- + 4 files changed, 1 insertion(+), 10 deletions(-) +diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro +index 1e80f1b..591fe27 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -11,7 +11,6 @@ SUBDIRS=\ @@ -15,6 +25,8 @@ Last-Update: 2019-03-14 } +diff --git a/tests/auto/qml/debugger/debugger.pro b/tests/auto/qml/debugger/debugger.pro +index 890e722..292faab 100644 --- a/tests/auto/qml/debugger/debugger.pro +++ b/tests/auto/qml/debugger/debugger.pro @@ -8,7 +8,6 @@ PUBLICTESTS += \ @@ -25,6 +37,8 @@ Last-Update: 2019-03-14 qpacketprotocol \ qqmlenginedebuginspectorintegrationtest \ qqmlenginecontrol \ +diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro +index 621e8bb..8cacaac 100644 --- a/tests/auto/qml/qml.pro +++ b/tests/auto/qml/qml.pro @@ -25,7 +25,6 @@ PUBLICTESTS += \ @@ -46,6 +60,8 @@ Last-Update: 2019-03-14 qtConfig(private_tests): \ SUBDIRS += $$PRIVATETESTS +diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro +index 45bcf8a..ab2bcc2 100644 --- a/tests/auto/quick/quick.pro +++ b/tests/auto/quick/quick.pro @@ -6,9 +6,7 @@ PUBLICTESTS += \ diff --git a/debian/patches/fix_sweep_step.patch b/debian/patches/fix_sweep_step.patch index ec33f771..60ca2d8a 100644 --- a/debian/patches/fix_sweep_step.patch +++ b/debian/patches/fix_sweep_step.patch @@ -1,22 +1,32 @@ -Description: fix sweep step for tainted QObject JavaScript wrappers - Currently, whenever the garbage collector runs, it will destroy all - valid tainted wrappers. - . - Only null or undefined wrappers will be preserved in the - m_multiplyWrappedQObjects map. - . - It seems like "!" was overlooked in - 3b5d37ce3841c4bfdf1c629d33f0e33b881b47fb. Prior to that change, it - was "!it.value()->markBit()", so calling erase() in the then branch - did make sense. But with "!it.value().isNullOrUndefined()", erase() - will be called for every valid wrapper, which is the opposite what we - want. +From: Debian Qt/KDE Maintainers +Date: Sat, 14 May 2022 17:42:41 +0800 +Subject: fix sweep step for tainted QObject JavaScript wrappers + +Currently, whenever the garbage collector runs, it will destroy all +valid tainted wrappers. + +Only null or undefined wrappers will be preserved in the +m_multiplyWrappedQObjects map. + +It seems like "!" was overlooked in +3b5d37ce3841c4bfdf1c629d33f0e33b881b47fb. Prior to that change, it +was "!it.value()->markBit()", so calling erase() in the then branch +did make sense. But with "!it.value().isNullOrUndefined()", erase() +will be called for every valid wrapper, which is the opposite what we +want. Origin: upstream, https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=e6b2f88d892dcf39 Last-Update: 2022-02-13 +--- + src/qml/memory/qv4mm.cpp | 2 +- + tests/auto/qml/qjsengine/tst_qjsengine.cpp | 39 ++++++++++++++++++++++++++++++ + tests/auto/qml/qv4mm/tst_qv4mm.cpp | 6 ++--- + 3 files changed, 43 insertions(+), 4 deletions(-) +diff --git a/src/qml/memory/qv4mm.cpp b/src/qml/memory/qv4mm.cpp +index 06caf04..da149a6 100644 --- a/src/qml/memory/qv4mm.cpp +++ b/src/qml/memory/qv4mm.cpp -@@ -981,7 +981,7 @@ void MemoryManager::sweep(bool lastSweep +@@ -981,7 +981,7 @@ void MemoryManager::sweep(bool lastSweep, ClassDestroyStatsCallback classCountPt if (MultiplyWrappedQObjectMap *multiplyWrappedQObjects = engine->m_multiplyWrappedQObjects) { for (MultiplyWrappedQObjectMap::Iterator it = multiplyWrappedQObjects->begin(); it != multiplyWrappedQObjects->end();) { @@ -25,6 +35,8 @@ Last-Update: 2022-02-13 it = multiplyWrappedQObjects->erase(it); else ++it; +diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp +index 3b7d74d..b75bf82 100644 --- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp +++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp @@ -102,6 +102,7 @@ private slots: @@ -80,6 +92,8 @@ Last-Update: 2022-02-13 void tst_QJSEngine::gcWithNestedDataStructure() { // The GC must be able to traverse deeply nested objects, otherwise this +diff --git a/tests/auto/qml/qv4mm/tst_qv4mm.cpp b/tests/auto/qml/qv4mm/tst_qv4mm.cpp +index 5d635aa..824fd89 100644 --- a/tests/auto/qml/qv4mm/tst_qv4mm.cpp +++ b/tests/auto/qml/qv4mm/tst_qv4mm.cpp @@ -76,10 +76,10 @@ void tst_qv4mm::multiWrappedQObjects() diff --git a/debian/patches/fix_test_remove_qlibraryinfo.patch b/debian/patches/fix_test_remove_qlibraryinfo.patch index b2f4c2fa..deef64a0 100644 --- a/debian/patches/fix_test_remove_qlibraryinfo.patch +++ b/debian/patches/fix_test_remove_qlibraryinfo.patch @@ -1,10 +1,33 @@ -Description: Make sure that tests run with just compiled versions of tools -Author: Sandro Knauß +From: =?utf-8?q?Sandro_Knau=C3=9F?= +Date: Sat, 14 May 2022 17:42:41 +0800 +Subject: Make sure that tests run with just compiled versions of tools + Origin: Debian Last-Update: 2020-09-08 --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + .qmake.conf | 3 +++ + .../qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp | 2 +- + .../qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp | 3 +-- + tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp | 7 +++---- + tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp | 6 ++---- + .../tst_qqmldebugtranslationservice.cpp | 2 +- + .../auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp | 2 +- + .../tst_qqmlenginedebuginspectorintegration.cpp | 2 +- + tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp | 2 +- + tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp | 2 +- + .../qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp | 3 +-- + tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp | 2 +- + tests/auto/qml/qmlformat/tst_qmlformat.cpp | 2 +- + tests/auto/qml/qmllint/tst_qmllint.cpp | 4 ++-- + tests/auto/qml/qmlmin/tst_qmlmin.cpp | 2 +- + tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp | 2 +- + tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 2 +- + tests/auto/qml/qv4assembler/tst_qv4assembler.cpp | 2 +- + tests/auto/quick/examples/tst_examples.cpp | 4 ++-- + 19 files changed, 26 insertions(+), 28 deletions(-) +diff --git a/.qmake.conf b/.qmake.conf +index 4e82106..11c9b29 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,6 +1,9 @@ @@ -17,20 +40,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ DEFINES += QT_NO_LINKED_LIST DEFINES += QT_NO_JAVA_STYLE_ITERATORS ---- a/tests/auto/qml/qmlmin/tst_qmlmin.cpp -+++ b/tests/auto/qml/qmlmin/tst_qmlmin.cpp -@@ -68,7 +68,7 @@ tst_qmlmin::tst_qmlmin() - void tst_qmlmin::initTestCase() - { - #if QT_CONFIG(process) && !defined(QTEST_CROSS_COMPILED) // sources not available when cross compiled -- qmlminPath = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/qmlmin"); -+ qmlminPath = QStringLiteral(TESTBINDIR "/qmlmin"); - #ifdef Q_OS_WIN - qmlminPath += QLatin1String(".exe"); - #endif +diff --git a/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp b/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp +index ec7ee15..73fec02 100644 --- a/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp +++ b/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp -@@ -135,7 +135,7 @@ QList tst_QDebugMessa +@@ -135,7 +135,7 @@ QList tst_QDebugMessageService::createClients() void tst_QDebugMessageService::retrieveDebugOutput() { @@ -39,9 +53,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ QString(), testFile(QMLFILE), true), ConnectSuccess); QTRY_VERIFY(m_client->logBuffer.size() >= 2); +diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp +index 37118f4..866cb9a 100644 --- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp +++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp -@@ -102,8 +102,7 @@ void tst_QQmlDebuggingEnabler::qmlscene( +@@ -102,8 +102,7 @@ void tst_QQmlDebuggingEnabler::qmlscene() QFETCH(bool, blockMode); QFETCH(QStringList, services); @@ -51,9 +67,43 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ m_process->setMaximumBindErrors(1); m_process->start(QStringList() << QString::fromLatin1("-qmljsdebugger=connector:%1%2%3%4") +diff --git a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp +index 91470e0..a6070ac 100644 +--- a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp ++++ b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp +@@ -178,7 +178,7 @@ QQmlDebugTest::ConnectResult tst_QQmlDebugJS::init(bool qmlscene, const QString + bool blockMode, bool restrictServices) + { + const QString executable = qmlscene +- ? QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene" ++ ? TESTBINDIR "/qmlscene" + : debugJsServerPath("qqmldebugjs"); + return QQmlDebugTest::connectTo( + executable, restrictServices ? QStringLiteral("V8Debugger") : QString(), +@@ -471,7 +471,7 @@ void tst_QQmlDebugJS::setBreakpointInJavaScript() + + if (seedCache) { // Make sure there is a qmlc file that the engine should _not_ laod. + QProcess process; +- process.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene", ++ process.start(QStringLiteral(TESTBINDIR "/qmlscene"), + { testFile(QUITINJS_QMLFILE) }); + QTRY_COMPARE(process.state(), QProcess::NotRunning); + } +@@ -853,8 +853,7 @@ void tst_QQmlDebugJS::evaluateInLocalScope() + void tst_QQmlDebugJS::evaluateInContext() + { + m_connection = new QQmlDebugConnection(); +- m_process = new QQmlDebugProcess( +- QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene", this); ++ m_process = new QQmlDebugProcess(TESTBINDIR "/qmlscene", this); + m_client = new QV4DebugClient(m_connection); + QScopedPointer engineClient(new QQmlEngineDebugClient(m_connection)); + m_process->start(QStringList() << QLatin1String(BLOCKMODE) << testFile(ONCOMPLETED_QMLFILE)); +diff --git a/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp b/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp +index 3557940..66e7027 100644 --- a/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp +++ b/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp -@@ -106,8 +106,7 @@ void tst_QQmlDebugService::checkPortRang +@@ -106,8 +106,7 @@ void tst_QQmlDebugService::checkPortRange() { QScopedPointer connection1(new QQmlDebugConnection()); QScopedPointer process1( @@ -63,7 +113,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ process1->start(QStringList() << QLatin1String("-qmljsdebugger=port:3782,3792") << testFile("test.qml")); -@@ -123,8 +122,7 @@ void tst_QQmlDebugService::checkPortRang +@@ -123,8 +122,7 @@ void tst_QQmlDebugService::checkPortRange() // Second instance QScopedPointer connection2(new QQmlDebugConnection()); QScopedPointer process2( @@ -73,6 +123,21 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ process2->start(QStringList() << QLatin1String("-qmljsdebugger=port:3782,3792") << testFile("test.qml")); +diff --git a/tests/auto/qml/debugger/qqmldebugtranslationservice/tst_qqmldebugtranslationservice.cpp b/tests/auto/qml/debugger/qqmldebugtranslationservice/tst_qqmldebugtranslationservice.cpp +index 01ee805..7bb422c 100644 +--- a/tests/auto/qml/debugger/qqmldebugtranslationservice/tst_qqmldebugtranslationservice.cpp ++++ b/tests/auto/qml/debugger/qqmldebugtranslationservice/tst_qqmldebugtranslationservice.cpp +@@ -66,7 +66,7 @@ QList tst_QQmlDebugTranslationService::createClients() + + void tst_QQmlDebugTranslationService::pluginConnection() + { +- auto executable = QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qml"; ++ auto executable = QStringLiteral(TESTBINDIR "/qml"); + auto services = "DebugTranslation"; + auto extraArgs = testFile(QMLFILE); + auto block = true; +diff --git a/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp b/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp +index c8915fb..9b574bc 100644 --- a/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp +++ b/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp @@ -82,7 +82,7 @@ private slots: @@ -84,6 +149,21 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ restrictServices ? QStringLiteral("EngineControl") : QString(), testFile(file), true); } +diff --git a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp +index 9830f1a..eedf904 100644 +--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp ++++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp +@@ -88,7 +88,7 @@ QQmlEngineDebugObjectReference tst_QQmlEngineDebugInspectorIntegration::findRoot + QQmlDebugTest::ConnectResult tst_QQmlEngineDebugInspectorIntegration::init(bool restrictServices) + { + return QQmlDebugTest::connectTo( +- QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qml", ++ TESTBINDIR "/qml", + restrictServices ? QStringLiteral("QmlDebugger,QmlInspector") : QString(), + testFile("qtquick2.qml"), true); + } +diff --git a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp +index b5f45f1..f03fd82 100644 --- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp +++ b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp @@ -64,7 +64,7 @@ private slots: @@ -95,17 +175,21 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ restrictServices ? QStringLiteral("QmlInspector") : QString(), testFile(qmlFile), true); } ---- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp -+++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp -@@ -88,7 +88,7 @@ QQmlEngineDebugObjectReference tst_QQmlE - QQmlDebugTest::ConnectResult tst_QQmlEngineDebugInspectorIntegration::init(bool restrictServices) +diff --git a/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp b/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp +index 2de525d..dd7bb51 100644 +--- a/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp ++++ b/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp +@@ -74,7 +74,7 @@ private slots: + + QQmlDebugTest::ConnectResult tst_QQmlPreview::startQmlProcess(const QString &qmlFile) { - return QQmlDebugTest::connectTo( -- QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qml", -+ TESTBINDIR "/qml", - restrictServices ? QStringLiteral("QmlDebugger,QmlInspector") : QString(), - testFile("qtquick2.qml"), true); +- return QQmlDebugTest::connectTo(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qml", ++ return QQmlDebugTest::connectTo(QStringLiteral(TESTBINDIR "/qml"), + QStringLiteral("QmlPreview"), testFile(qmlFile), true); } + +diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp +index c2a774b..c8a7d77 100644 --- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp +++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp @@ -203,8 +203,7 @@ private: @@ -118,9 +202,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ void checkProcessTerminated(); void checkTraceReceived(); void checkJsHeap(); +diff --git a/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp b/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp +index 3810f50..3b686df 100644 --- a/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp +++ b/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp -@@ -107,7 +107,7 @@ static bool generateCache(const QString +@@ -107,7 +107,7 @@ static bool generateCache(const QString &qmlFileName, QByteArray *capturedStderr QProcess proc; if (capturedStderr == nullptr) proc.setProcessChannelMode(QProcess::ForwardedChannels); @@ -129,6 +215,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ proc.setArguments(QStringList() << qmlFileName); proc.start(); if (!proc.waitForFinished()) +diff --git a/tests/auto/qml/qmlformat/tst_qmlformat.cpp b/tests/auto/qml/qmlformat/tst_qmlformat.cpp +index 413dc5f..6f4ac1f 100644 --- a/tests/auto/qml/qmlformat/tst_qmlformat.cpp +++ b/tests/auto/qml/qmlformat/tst_qmlformat.cpp @@ -84,7 +84,7 @@ private: @@ -140,6 +228,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ #ifdef Q_OS_WIN m_qmlformatPath += QLatin1String(".exe"); #endif +diff --git a/tests/auto/qml/qmllint/tst_qmllint.cpp b/tests/auto/qml/qmllint/tst_qmllint.cpp +index 8697495..a538d79 100644 --- a/tests/auto/qml/qmllint/tst_qmllint.cpp +++ b/tests/auto/qml/qmllint/tst_qmllint.cpp @@ -59,7 +59,7 @@ private: @@ -160,6 +250,21 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ QStringList args; args << QStringLiteral("-U") << testFile(fileToLint) << QStringLiteral("-I") << qmlImportDir +diff --git a/tests/auto/qml/qmlmin/tst_qmlmin.cpp b/tests/auto/qml/qmlmin/tst_qmlmin.cpp +index cc028d9..7c7fd95 100644 +--- a/tests/auto/qml/qmlmin/tst_qmlmin.cpp ++++ b/tests/auto/qml/qmlmin/tst_qmlmin.cpp +@@ -68,7 +68,7 @@ tst_qmlmin::tst_qmlmin() + void tst_qmlmin::initTestCase() + { + #if QT_CONFIG(process) && !defined(QTEST_CROSS_COMPILED) // sources not available when cross compiled +- qmlminPath = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/qmlmin"); ++ qmlminPath = QStringLiteral(TESTBINDIR "/qmlmin"); + #ifdef Q_OS_WIN + qmlminPath += QLatin1String(".exe"); + #endif +diff --git a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp +index 72356a4..7e6f089 100644 --- a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp +++ b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp @@ -62,7 +62,7 @@ tst_qmlplugindump::tst_qmlplugindump() @@ -171,69 +276,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ #if defined(Q_OS_WIN) qmlplugindumpPath += QLatin1String("/qmlplugindump.exe"); ---- a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp -+++ b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp -@@ -178,7 +178,7 @@ QQmlDebugTest::ConnectResult tst_QQmlDeb - bool blockMode, bool restrictServices) - { - const QString executable = qmlscene -- ? QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene" -+ ? TESTBINDIR "/qmlscene" - : debugJsServerPath("qqmldebugjs"); - return QQmlDebugTest::connectTo( - executable, restrictServices ? QStringLiteral("V8Debugger") : QString(), -@@ -471,7 +471,7 @@ void tst_QQmlDebugJS::setBreakpointInJav - - if (seedCache) { // Make sure there is a qmlc file that the engine should _not_ laod. - QProcess process; -- process.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene", -+ process.start(QStringLiteral(TESTBINDIR "/qmlscene"), - { testFile(QUITINJS_QMLFILE) }); - QTRY_COMPARE(process.state(), QProcess::NotRunning); - } -@@ -853,8 +853,7 @@ void tst_QQmlDebugJS::evaluateInLocalSco - void tst_QQmlDebugJS::evaluateInContext() - { - m_connection = new QQmlDebugConnection(); -- m_process = new QQmlDebugProcess( -- QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene", this); -+ m_process = new QQmlDebugProcess(TESTBINDIR "/qmlscene", this); - m_client = new QV4DebugClient(m_connection); - QScopedPointer engineClient(new QQmlEngineDebugClient(m_connection)); - m_process->start(QStringList() << QLatin1String(BLOCKMODE) << testFile(ONCOMPLETED_QMLFILE)); ---- a/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp -+++ b/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp -@@ -62,7 +62,7 @@ void tst_QV4Assembler::perfMapFile() - #if !defined(Q_OS_LINUX) || defined(Q_OS_ANDROID) - QSKIP("perf map files are only generated on linux"); - #else -- const QString qmljs = QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmljs"; -+ const QString qmljs = QStringLiteral(TESTBINDIR "/qmljs"); - QProcess process; - - QTemporaryFile infile; ---- a/tests/auto/qml/debugger/qqmldebugtranslationservice/tst_qqmldebugtranslationservice.cpp -+++ b/tests/auto/qml/debugger/qqmldebugtranslationservice/tst_qqmldebugtranslationservice.cpp -@@ -66,7 +66,7 @@ QList tst_QQmlDebugTr - - void tst_QQmlDebugTranslationService::pluginConnection() - { -- auto executable = QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qml"; -+ auto executable = QStringLiteral(TESTBINDIR "/qml"); - auto services = "DebugTranslation"; - auto extraArgs = testFile(QMLFILE); - auto block = true; ---- a/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp -+++ b/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp -@@ -74,7 +74,7 @@ private slots: - - QQmlDebugTest::ConnectResult tst_QQmlPreview::startQmlProcess(const QString &qmlFile) - { -- return QQmlDebugTest::connectTo(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qml", -+ return QQmlDebugTest::connectTo(QStringLiteral(TESTBINDIR "/qml"), - QStringLiteral("QmlPreview"), testFile(qmlFile), true); - } - +diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp +index 9198d3b..eaec4a1 100644 --- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp +++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp @@ -9249,7 +9249,7 @@ void tst_qqmlecmascript::hugeStack() @@ -245,9 +289,24 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ if (!QFile::exists(qmljs)) { QSKIP("Tets requires qmljs"); } +diff --git a/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp b/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp +index 5dd8e9d..c84ace2 100644 +--- a/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp ++++ b/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp +@@ -62,7 +62,7 @@ void tst_QV4Assembler::perfMapFile() + #if !defined(Q_OS_LINUX) || defined(Q_OS_ANDROID) + QSKIP("perf map files are only generated on linux"); + #else +- const QString qmljs = QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmljs"; ++ const QString qmljs = QStringLiteral(TESTBINDIR "/qmljs"); + QProcess process; + + QTemporaryFile infile; +diff --git a/tests/auto/quick/examples/tst_examples.cpp b/tests/auto/quick/examples/tst_examples.cpp +index fdefa85..cd77427 100644 --- a/tests/auto/quick/examples/tst_examples.cpp +++ b/tests/auto/quick/examples/tst_examples.cpp -@@ -167,8 +167,8 @@ void tst_examples::namingConvention(cons +@@ -167,8 +167,8 @@ void tst_examples::namingConvention(const QDir &d) void tst_examples::namingConvention() { QStringList examplesLocations; diff --git a/debian/patches/gcc_11.patch b/debian/patches/gcc_11.patch index 3fe03ebd..c26ec132 100644 --- a/debian/patches/gcc_11.patch +++ b/debian/patches/gcc_11.patch @@ -1,10 +1,20 @@ -Description: build fixes for GCC 11 +From: Debian Qt/KDE Maintainers +Date: Sat, 14 May 2022 17:42:41 +0800 +Subject: build fixes for GCC 11 + Origin: upstream, commits: https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=eb6525f126f680f9 https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=367293b18ab0d0a0 https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=db58b8518e157b76 Last-Update: 2021-08-18 +--- + src/3rdparty/masm/yarr/Yarr.h | 1 + + src/qml/compiler/qv4bytecodegenerator_p.h | 4 ++-- + src/qmldebug/qqmlprofilerevent_p.h | 1 + + 3 files changed, 4 insertions(+), 2 deletions(-) +diff --git a/src/3rdparty/masm/yarr/Yarr.h b/src/3rdparty/masm/yarr/Yarr.h +index ccf78f9..2955ea7 100644 --- a/src/3rdparty/masm/yarr/Yarr.h +++ b/src/3rdparty/masm/yarr/Yarr.h @@ -28,6 +28,7 @@ @@ -15,6 +25,8 @@ Last-Update: 2021-08-18 #include "YarrErrorCode.h" namespace JSC { namespace Yarr { +diff --git a/src/qml/compiler/qv4bytecodegenerator_p.h b/src/qml/compiler/qv4bytecodegenerator_p.h +index 1895a34..5244c44 100644 --- a/src/qml/compiler/qv4bytecodegenerator_p.h +++ b/src/qml/compiler/qv4bytecodegenerator_p.h @@ -186,13 +186,13 @@ QT_WARNING_POP @@ -33,6 +45,8 @@ Last-Update: 2021-08-18 return addJumpInstruction(data); } +diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h +index a7e37d1..01b2f58 100644 --- a/src/qmldebug/qqmlprofilerevent_p.h +++ b/src/qmldebug/qqmlprofilerevent_p.h @@ -48,6 +48,7 @@ diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch index cac797bf..1cba2318 100644 --- a/debian/patches/python3.patch +++ b/debian/patches/python3.patch @@ -1,13 +1,20 @@ -Description: make qtdeclarative build with Python 3 +From: Max Lin +Date: Sat, 14 May 2022 17:42:42 +0800 +Subject: make qtdeclarative build with Python 3 + Origin: OpenSUSE, https://build.opensuse.org/package/view_file/KDE:Qt:5.12/libqt5-qtdeclarative/qtdeclarative-switch-to-python3.patch -Author: Max Lin -Author: Antonio Larrosa Forwarded: not-yet Last-Update: 2020-01-01 +--- + src/3rdparty/masm/disassembler/udis86/itab.py | 4 ++-- + src/3rdparty/masm/disassembler/udis86/ud_optable.py | 12 ++++++------ + 2 files changed, 8 insertions(+), 8 deletions(-) +diff --git a/src/3rdparty/masm/disassembler/udis86/itab.py b/src/3rdparty/masm/disassembler/udis86/itab.py +index 07e20a6..3d50ad0 100644 --- a/src/3rdparty/masm/disassembler/udis86/itab.py +++ b/src/3rdparty/masm/disassembler/udis86/itab.py -@@ -268,13 +268,13 @@ class UdItabGenerator( ud_opcode.UdOpcod +@@ -268,13 +268,13 @@ class UdItabGenerator( ud_opcode.UdOpcodeTables ): opr = e[ 'operands' ] for i in range(len(opr)): if not (opr[i] in self.OperandDict.keys()): @@ -23,6 +30,8 @@ Last-Update: 2020-01-01 pfx_c.append( self.PrefixDict[p] ) if len(e['prefixes']) == 0: pfx_c.append( "P_none" ) +diff --git a/src/3rdparty/masm/disassembler/udis86/ud_optable.py b/src/3rdparty/masm/disassembler/udis86/ud_optable.py +index 5b5c55d..3a246c7 100644 --- a/src/3rdparty/masm/disassembler/udis86/ud_optable.py +++ b/src/3rdparty/masm/disassembler/udis86/ud_optable.py @@ -50,7 +50,7 @@ class UdOptableXmlParser: diff --git a/debian/patches/remove_youtube_iframe.patch b/debian/patches/remove_youtube_iframe.patch index a201215b..2fd930a7 100644 --- a/debian/patches/remove_youtube_iframe.patch +++ b/debian/patches/remove_youtube_iframe.patch @@ -1,11 +1,18 @@ -Description: replace YouTube iframe with YouTube link -Author: Dmitry Shachnev +From: Dmitry Shachnev +Date: Sat, 14 May 2022 17:42:41 +0800 +Subject: replace YouTube iframe with YouTube link + Forwarded: not-needed Last-Update: 2019-12-19 +--- + src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) +diff --git a/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc b/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc +index 7695bb5..9e9ef7a 100644 --- a/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc +++ b/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc -@@ -41,10 +41,8 @@ QObjectList or a \l QAbstractItemModel. +@@ -41,10 +41,8 @@ QObjectList or a \l QAbstractItemModel. The first three are useful for exposing simpler datasets, while QAbstractItemModel provides a more flexible solution for more complex models. diff --git a/debian/patches/riscv64-latomic.patch b/debian/patches/riscv64-latomic.patch index dafac610..4d895d37 100644 --- a/debian/patches/riscv64-latomic.patch +++ b/debian/patches/riscv64-latomic.patch @@ -1,11 +1,18 @@ -Description: link with -latomic on riscv64 -Author: Aurelien Jarno +From: Aurelien Jarno +Date: Sat, 14 May 2022 17:42:41 +0800 +Subject: link with -latomic on riscv64 + Forwarded: no Last-Update: 2020-01-01 +--- + src/qml/qml.pro | 3 +++ + 1 file changed, 3 insertions(+) +diff --git a/src/qml/qml.pro b/src/qml/qml.pro +index 7d5a92a..0ec1161 100644 --- a/src/qml/qml.pro +++ b/src/qml/qml.pro -@@ -20,6 +20,9 @@ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O +@@ -20,6 +20,9 @@ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 # Ensure this gcc optimization is switched off for mips platforms to avoid trouble with JIT. gcc:isEqual(QT_ARCH, "mips"): QMAKE_CXXFLAGS += -fno-reorder-blocks diff --git a/debian/patches/series b/debian/patches/series index 9024a8bd..a7ed0355 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,10 +1,7 @@ -# Backported patches gcc_11.patch tst_qmldiskcache_big_endian.patch support_apos_in_styled_text.patch fix_sweep_step.patch - -# Debian patches disableopengltests.patch fix_test_remove_qlibraryinfo.patch wait_for_window_exposed.patch diff --git a/debian/patches/support_apos_in_styled_text.patch b/debian/patches/support_apos_in_styled_text.patch index af8a0c6b..032e9dfc 100644 --- a/debian/patches/support_apos_in_styled_text.patch +++ b/debian/patches/support_apos_in_styled_text.patch @@ -1,10 +1,18 @@ -Description: Support ' in styled text and document it - This ensures that some translations really look ok. +From: Debian Qt/KDE Maintainers +Date: Sat, 14 May 2022 17:42:41 +0800 +Subject: Support ' in styled text and document it + +This ensures that some translations really look ok. Origin: https://invent.kde.org/qt/qt/qtdeclarative/-/merge_requests/3/diffs Forwarded: not-needed -Author: Albert Astals Cid Applied-Upstream: https://invent.kde.org/qt/qt/qtdeclarative/-/commit/0dda47d9f1a22567ad8f1266be2f0cd8a9226c7f +--- + src/quick/items/qquicktext.cpp | 2 +- + src/quick/util/qquickstyledtext.cpp | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) +diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp +index b18d03a..459dea8 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -2168,7 +2168,7 @@ void QQuickText::resetMaximumLineCount() @@ -16,9 +24,11 @@ Applied-Upstream: https://invent.kde.org/qt/qt/qtdeclarative/-/commit/0dda47d9f1 \endcode \c Text.StyledText parser is strict, requiring tags to be correctly nested. +diff --git a/src/quick/util/qquickstyledtext.cpp b/src/quick/util/qquickstyledtext.cpp +index 660852b..e81240d 100644 --- a/src/quick/util/qquickstyledtext.cpp +++ b/src/quick/util/qquickstyledtext.cpp -@@ -562,6 +562,8 @@ void QQuickStyledTextPrivate::parseEntit +@@ -562,6 +562,8 @@ void QQuickStyledTextPrivate::parseEntity(const QChar *&ch, const QString &textI textOut += QChar(60); else if (entity == QLatin1String("amp")) textOut += QChar(38); diff --git a/debian/patches/tst_qmldiskcache_big_endian.patch b/debian/patches/tst_qmldiskcache_big_endian.patch index b47043b7..23185cc8 100644 --- a/debian/patches/tst_qmldiskcache_big_endian.patch +++ b/debian/patches/tst_qmldiskcache_big_endian.patch @@ -1,10 +1,19 @@ -Description: make tst_qmldiskcache::regenerateAfterChange() pass on big endian systems +From: Debian Qt/KDE Maintainers +Date: Sat, 14 May 2022 17:42:41 +0800 +Subject: make tst_qmldiskcache::regenerateAfterChange() pass on big endian + systems + Origin: upstream, https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=dab0d62b655ce9a4 Last-Update: 2021-02-11 +--- + tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +diff --git a/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp b/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp +index 3c59f7b..997128a 100644 --- a/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp +++ b/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp -@@ -376,9 +376,8 @@ void tst_qmldiskcache::regenerateAfterCh +@@ -376,9 +376,8 @@ void tst_qmldiskcache::regenerateAfterChange() QCOMPARE(quint32(obj->nBindings), quint32(2)); QCOMPARE(quint32(obj->bindingTable()->type), quint32(QV4::CompiledData::Binding::Type_Number)); diff --git a/debian/patches/wait_for_window_exposed.patch b/debian/patches/wait_for_window_exposed.patch index 2989b689..8a95261b 100644 --- a/debian/patches/wait_for_window_exposed.patch +++ b/debian/patches/wait_for_window_exposed.patch @@ -1,10 +1,17 @@ -Description: use qWaitForWindowExposed instead of qWaitForWindowActive - The qWaitForWindowActive() function returns false when the test is - run inside Xvfb and there is no window manager. -Author: Dmitry Shachnev +From: Dmitry Shachnev +Date: Sat, 14 May 2022 17:42:41 +0800 +Subject: use qWaitForWindowExposed instead of qWaitForWindowActive + +The qWaitForWindowActive() function returns false when the test is +run inside Xvfb and there is no window manager. Forwarded: no Last-Update: 2019-04-21 +--- + tests/auto/quicktest/signalspy/tst_signalspy.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/tests/auto/quicktest/signalspy/tst_signalspy.cpp b/tests/auto/quicktest/signalspy/tst_signalspy.cpp +index 0806f43..32bbced 100644 --- a/tests/auto/quicktest/signalspy/tst_signalspy.cpp +++ b/tests/auto/quicktest/signalspy/tst_signalspy.cpp @@ -73,7 +73,7 @@ void tst_SignalSpy::testCount()