diff options
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/Manifest.gz | bin | 11228 -> 11224 bytes | |||
| -rw-r--r-- | dev-qt/qtwebengine/Manifest | 3 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-6.5.0-userscripts-loading.patch | 112 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.5.0-r2.ebuild (renamed from dev-qt/qtwebengine/qtwebengine-6.5.0-r1.ebuild) | 5 |
4 files changed, 118 insertions, 2 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz Binary files differindex 0090b5b34cd2..b5a691bf7294 100644 --- a/dev-qt/Manifest.gz +++ b/dev-qt/Manifest.gz diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index b1dd9919f1cb..6b7da803d399 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -2,6 +2,7 @@ AUX qtwebengine-5.15.2-enable-ppc64.patch 1249 BLAKE2B b8b9957bbf848ee8b19e4a7d4 AUX qtwebengine-5.15.2_p20210521-clang-libc++.patch 358 BLAKE2B a03de632ac4e01cf56c52af3a3bd5ff5bcfd525c67bf2e5d960904a9f3b53e1fa18f0e0df380c0cf84f17914fb313a028e26efaefe6ab5057f0d9a9cf2f6f0fd SHA512 6dc3864064d6084e70d4696fda744701c293ee62e9c9088e3247988ffb8085f30c632e94ac19aef715cbd211b21dfcb98691d5809e21cffd9f04bbb8b04cf0da AUX qtwebengine-5.15.9_p20230421-gcc-13.patch 5591 BLAKE2B 6de2f080457870720f948d2ce69ef9ee218b8481f5ef478ea5333029c8792dfe6d5983ec3ca7bb51659f0ed4edf77c90ded6614a19f719db165e1963a35484f6 SHA512 c5d246ecd0329900c17c4e6635806a425eb38d2c7cca1ceb71acd583fa391675ba58c325ba333aa5142d28aa8b8e7284e41606b0e79c1a36457abc8da32b09f8 AUX qtwebengine-6.5.0-gcc-13-build.patch 17896 BLAKE2B b8aaecb917e3375027ec0a7feffe0842c2e393c597362ef01317ae05744baa837942d9021aaa152505a46af325add61d22d3218b8a32b1b5a80e539d3b88ff5b SHA512 fa7ff29cee454741916b83732b86738e10925c62826e3f5db18c6becd99d27b2523622bd787706df876c0df7fd3b385c59e7e7133bc0e393a4e323a3a0cd1e11 +AUX qtwebengine-6.5.0-userscripts-loading.patch 3711 BLAKE2B 6ad83d8db818f9b5e4a9212b60e3e042b260059cf29bf95a2ee221383bcc7bc14e7ac7f4d55d0f73a80cdd797b94b0930a0d461e7aea8139018f60784e286139 SHA512 c6ebf4a4d33dfc82cab60551e20d6c607baf4c773c80fc9649af92bed10af3209f77db5b6864339db1211aae857ff53b46d8daae91823e8ab3c3408aea15f9e1 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e DIST qtwebengine-5.15.8_p20230313-patchset.tar.xz 45904 BLAKE2B 9f58b9808fd445a06e6a2cd6d5f7bc9782bd6de13138fdebc9e81bd9f69e7ae673a71bd3ed6b011a47e84cc64b5b703a7cfc8d5f740eaaa663da1db8ef9ef05b SHA512 21b0b853358260fa1bdc96c97c5b2af7007c744d10abeebf9f0e708a0cd7dece583d86c0554a4e327a0d615bb403b0d328acaa6622b50d7a8059bc0802edbcec DIST qtwebengine-5.15.8_p20230313.tar.xz 298163692 BLAKE2B 653e2577ea7e670fdffec2cf2db5392621109571b430b9b66c7bc23739a14eb36ffa5f989ec2b98d77e718b0a69bd2b3948f0340fd9e86aaf10372c8b13286ee SHA512 34062e54f95f441420b41ede88d0f0f98445677d301eedbe0be2e57cc5c280d4e564abb99ccf754eb2c0efaccc21ff4e34bc20163c970b4d5309ca85c5f37577 @@ -11,5 +12,5 @@ DIST qtwebengine-everywhere-src-6.5.0.tar.xz 411792556 BLAKE2B 42aa5023462ee2db6 EBUILD qtwebengine-5.15.8_p20230313.ebuild 8252 BLAKE2B 5490ebd0c7ec96948f6ecc0a5305f1d09fc87dd16498a0ea70e3a88f7b9902fc5f4221a83fe883ec54c305b7cd0d75fceb9580ed1d41a56fb04d3d4ecc8b8596 SHA512 92aac8358b6777bfe1fbac3329b79fb862673cb119a446cf31732bbc09f454e08652c0bfb92ed5f10120dce1c405e614c7d91629baeaf4f087cb182f9a37103b EBUILD qtwebengine-5.15.9_p20230421.ebuild 8459 BLAKE2B 10e0a6afaffe1816d1ffe41f610fcee68844512a6a5e6e182912a4fb9973dc68ff328a67e6e8b747d8b52d88d526760eda22b58d9468d90206cdc7d17139ee95 SHA512 eeb1aac96f891e018d07b08f790c9dd10eaea38e8e46e4e79b80b90b070516096bcf092d9af9d2730e43467518aa224e54c9bb3d70836c1f64e2c16582ad8ee0 EBUILD qtwebengine-6.4.3.ebuild 7634 BLAKE2B b7a9e50c5653c8fbe50d180e48de9c52c6135ffe23869d58b9b703b52e667c24afe918b365fe9c0397834d4688d54fca1432985f6f5b848a3d21416ce880f3a6 SHA512 a10a58f330d9dbb480107cfe67fe79747c98fb70451c14e87430759ce49e902cad791cdd919cf1218baeba67dabe3a1835d64d70495f5522758e7657bdaa4d0f -EBUILD qtwebengine-6.5.0-r1.ebuild 7504 BLAKE2B ff533e29743165c07e619fa0247219310965a21a7c455d014f22e60d5867e087cf6ab09798048c241e8cb9587115892687d9584d2ab368246cd48b9a49985195 SHA512 244779092fbb1e3d4f99669fcdedb6791662bb4da31d89729f7118fc0c5e390610d0a6e7caf5e343502daa4dff7e5a0a4fb4cfebce24c5364aa1d815ca2db3fb +EBUILD qtwebengine-6.5.0-r2.ebuild 7558 BLAKE2B 672b105ee7b36d4c327687d7fe44b24df085b0787a7477ec23387543830c0d83ba8833fb65c9a98bdca61111f636932bb412e69c3e09a151c38a9af5b80e6fbd SHA512 c7fa13dfbdd0d4c90d0ccc5285460e0368b54e90d66c276d12a5a929bf6de281b065692a27fee57c8c6d5e2d1ee049a94693ac8dd5e5623d047d1512dd14ef73 MISC metadata.xml 1258 BLAKE2B 450cb9e683a52475729881c910e7b0b79587d3d672d4eb90613b91194ec19ab7c0fb86bf4ff4bf631686ed3cad49859eed07405b1f7d6129f40b5f4edba68e43 SHA512 971dbe74479e6bf3ed3cda00724bb4a60d6382c4020ee6ce3a730646a69af0a66785fb135706a2a0cc00ff3190674e724aa3def03f43c8e9ed5e5d317ae271f0 diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.0-userscripts-loading.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.0-userscripts-loading.patch new file mode 100644 index 000000000000..6a5802829bb4 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.0-userscripts-loading.patch @@ -0,0 +1,112 @@ +https://github.com/qutebrowser/qutebrowser/issues/7662 +https://bugreports.qt.io/browse/QTBUG-113109 + +https://codereview.qt-project.org/c/qt/qtwebengine/+/474114 +From: Allan Sandfeld Jensen <allan.jensen@qt.io> +Date: Mon, 24 Apr 2023 17:33:17 +0200 +Subject: [PATCH] Fix user script management when subframes are present + +Only the main frames should administer scripts associated with it. + +Pick-to: 6.5 +Fixes: QTBUG-113109 +Change-Id: Ibda66f55ef99da632134a9de1425797262faba9b +--- a/src/core/renderer/user_resource_controller.cpp ++++ b/src/core/renderer/user_resource_controller.cpp +@@ -289,10 +289,11 @@ + FrameUserScriptMap::iterator it = m_frameUserScriptMap.find(renderFrame); + if (it == m_frameUserScriptMap.end()) // ASSERT maybe? + return; +- for (uint64_t id : std::as_const(it.value())) { +- m_scripts.remove(id); ++ if (renderFrame->IsMainFrame()) { ++ for (uint64_t id : std::as_const(it.value())) ++ m_scripts.remove(id); + } +- m_frameUserScriptMap.remove(renderFrame); ++ m_frameUserScriptMap.erase(it); + } + + void UserResourceController::addScriptForFrame(const QtWebEngineCore::UserScriptData &script, +@@ -304,7 +305,8 @@ + + if (!(*it).contains(script.scriptId)) + (*it).append(script.scriptId); +- m_scripts.insert(script.scriptId, script); ++ if (!frame || frame->IsMainFrame()) ++ m_scripts.insert(script.scriptId, script); + } + + void UserResourceController::removeScriptForFrame(const QtWebEngineCore::UserScriptData &script, +@@ -315,7 +317,8 @@ + return; + + (*it).removeOne(script.scriptId); +- m_scripts.remove(script.scriptId); ++ if (!frame || frame->IsMainFrame()) ++ m_scripts.remove(script.scriptId); + } + + void UserResourceController::clearScriptsForFrame(content::RenderFrame *frame) +@@ -323,8 +326,10 @@ + FrameUserScriptMap::iterator it = m_frameUserScriptMap.find(frame); + if (it == m_frameUserScriptMap.end()) + return; +- for (uint64_t id : std::as_const(it.value())) +- m_scripts.remove(id); ++ if (!frame || frame->IsMainFrame()) { ++ for (uint64_t id : std::as_const(it.value())) ++ m_scripts.remove(id); ++ } + + m_frameUserScriptMap.remove(frame); + } +--- a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp ++++ b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp +@@ -76,6 +76,7 @@ + void scriptsInNestedIframes(); + void matchQrcUrl(); + void injectionOrder(); ++ void reloadWithSubframes(); + }; + + void tst_QWebEngineScript::domEditing() +@@ -694,6 +695,38 @@ + QTRY_COMPARE(page.log, expected); + } + ++void tst_QWebEngineScript::reloadWithSubframes() ++{ ++ class Page : public QWebEnginePage ++ { ++ public: ++ Page() : QWebEnginePage() {} ++ QVector<QString> log; ++ ++ protected: ++ void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel, const QString &message, int, ++ const QString &) override ++ { ++ log.append(message); ++ } ++ } page; ++ ++ QWebEngineScript s; ++ s.setInjectionPoint(QWebEngineScript::DocumentCreation); ++ s.setSourceCode(QStringLiteral("console.log('Hello');")); ++ page.scripts().insert(s); ++ ++ page.setHtml(QStringLiteral("<body>" ++ " <h1>Test scripts working on reload </h1>" ++ " <iframe src='about://blank'>" ++ " </iframe>" ++ "</body>")); ++ QTRY_COMPARE(page.log.size(), 1); ++ ++ page.triggerAction(QWebEnginePage::Reload); ++ QTRY_COMPARE(page.log.size(), 2); ++} ++ + QTEST_MAIN(tst_QWebEngineScript) + + #include "tst_qwebenginescript.moc" diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.0-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.0-r2.ebuild index f8bac25f51b1..912effe24979 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.5.0-r1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.5.0-r2.ebuild @@ -87,7 +87,10 @@ DEPEND="${RDEPEND} media-libs/libglvnd " -PATCHES=( "${FILESDIR}/${PN}-6.5.0-gcc-13-build.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-6.5.0-gcc-13-build.patch" + "${FILESDIR}/${PN}-6.5.0-userscripts-loading.patch" +) python_check_deps() { python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]" |