diff options
author | V3n3RiX <venerix@koprulu.sector> | 2025-02-26 19:26:07 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2025-02-26 19:26:07 +0000 |
commit | acfd7c956a7b45da7af1452ec12e0b2d5e6ac65b (patch) | |
tree | 13151a7440c2560b01e3cf5bd56ad280482b88bf /dev-qt/qtwebengine | |
parent | 67dbd3ba144944fbf4b466be1b5fa0569b774e6f (diff) |
gentoo auto-resync : 26:02:2025 - 19:26:07
Diffstat (limited to 'dev-qt/qtwebengine')
-rw-r--r-- | dev-qt/qtwebengine/Manifest | 11 | ||||
-rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-6.8.1-QTBUG-131156.patch | 150 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.8.1-r1.ebuild | 336 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 6 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild | 25 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 23 |
6 files changed, 37 insertions, 514 deletions
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 5de47e434f8b..23da7d4084c7 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -4,20 +4,17 @@ AUX qtwebengine-5.15.14_p20240510-icu-75.patch 5107 BLAKE2B fc61801f5bbf5583610a AUX qtwebengine-5.15.14_p20240510-re2.patch 915 BLAKE2B a29abbec923f78dd7baafdc36b42ed9e0467885ecc04349cbbcec6727628627e84e0172f01e24b34c231d437b75f992b7a173532695085773d899dc94085c66b SHA512 45af510bafc1c838fe273652813d4130ecdef30152f57506b5b6580131cdbcf510acc5ae7bb8d44ac90072c8be7d75b4e0c187240a6522e184db8a11a204f2fc AUX qtwebengine-5.15.16_p20241115-py3.13-pipes.patch 848 BLAKE2B 7696eaf565511adcac5e74f7788633d1e83a88079548f1069c840da40e3ec5fef5fbfa0c019234a40dde14f6f43249792ad1bfc3d2ee8e5669d7fde7234a7ad2 SHA512 79588891105d8dce27e273d4113c31352c6b1035762ea6b1211be5f58299d9e2852b0b98bad34492d9af85e3ae1ca87407ffbf190159d64b0c6d7ba49e842bf8 AUX qtwebengine-5.15.2_p20210521-clang-libc++.patch 358 BLAKE2B a03de632ac4e01cf56c52af3a3bd5ff5bcfd525c67bf2e5d960904a9f3b53e1fa18f0e0df380c0cf84f17914fb313a028e26efaefe6ab5057f0d9a9cf2f6f0fd SHA512 6dc3864064d6084e70d4696fda744701c293ee62e9c9088e3247988ffb8085f30c632e94ac19aef715cbd211b21dfcb98691d5809e21cffd9f04bbb8b04cf0da -AUX qtwebengine-6.8.1-QTBUG-131156.patch 7291 BLAKE2B 90993c2406631001e1f75f32da495e9d6c91a81d92e30b3902da45a08fe18b36cdddaf7763d58cdd48ea9f25566da3d107807e71bd47c5422e54c9fcbf07cd72 SHA512 0f9d2e14fa2abfe73fa691d91ad57fe833a9b70627d737c49f6928111a4d0a1d294a2a38620b1368b3fad6a347eff408a521fbc2cf4ff317ebf5a63b62c1efb6 AUX qtwebengine-6.8.1-aarch64-xnnpack.patch 629 BLAKE2B 2809c1e159252c3131c318cd31fd6d7875a41ca477ffcc82b832838eeb0b89ed15baea25f95c894369b73fd41c7cfea0fcc880b5fc097b8e987b718300fb7d3b SHA512 b1e3330a2e6e8b352cf83b8c2e9b469772638d331b78c9f690208044a72a1bbefc5b3114affc5a512a8c0839ece197322a8382da8e8c3be18042a9c394034c31 AUX qtwebengine-6.8.1-cstdint.patch 1136 BLAKE2B 8dc976348896073cc6f884199d6ad13a0e5f377707e6046d84bfc7927b749729ebe1f1b0b2f2c930094201647bfd638405ebfe4dce5d3583844f2a95ead5169a SHA512 12e65e9f1ca2ef498e4fba4769dd5bd3c03935f6c2e69ab47ebfab1f5f4637616c4d2303fdb645f404a3348a5701a132a204bf55dd80b54497d18294800014a6 AUX qtwebengine-6.8.2-glibc2.41.patch 1062 BLAKE2B aa5f6ee4d1333bd9fba543855637f7264fb1abaf6fa62859733352768673cb72a84e4c2b47802392c9ea5eee75b8ce4d43b485683ef78b178d6fea379da401d4 SHA512 2128a7dd9703bbf562a0e966d55b5eed7e7288e715bb67f08d982aa3b95766e60a1c62f75b3291987ea8523ed9b8482110c8410c212783d907946ddbbe655f29 DIST qtwebengine-5.15.14_p20240510-patchset.tar.xz 20780 BLAKE2B 516d4c628c4b027ab3a7159da006a57173be91de3eb4b7f308029953d4fd19fb3e790ca38e79d17fef75d8d9b392676650acb9285d5913f9ebecaa4136575c47 SHA512 492979d118d6bd9165ee194724e38b627d19c89dbe1daa6b2f55e4a8fc7676748a1eacb9623ee05e09140c2c4a2ac82ddafaef5c45630a117ce0ed14b240a474 DIST qtwebengine-5.15.16_p20241115.tar.xz 301382752 BLAKE2B 08adfae6228a91f1f4b2a603a28881d9cf97f339d951217f3837d614ebb58aff9b0963220be04cc9a17869b6021a6d7687848bd8ccd1c8c49115a5e6944be84b SHA512 50e0bc7b4236859b4419f2f8eaf37e47c1994c30ca3bf584dd2f4996b5f8ba7cd31c8aae48c28f0fcd39c144490f5e451c7ecf5d340e7b10fa2e37666ef21100 DIST qtwebengine-6.8-patchset-7.tar.xz 9096 BLAKE2B 58a95b198a6c8180a71a4365e7c2e3bee2d3798ecff18b01fe23e228a4ceafe2aae43088f503a98fa2d5097271ec442985d993fb24e1b2d2c09014b3309bef4d SHA512 489caa5f7cc3d3091e5896c2eb4d489a40fc220738c2240ec406928c7c948ab8962817024c2fbe3c393294e70ef6ce8c02e47964952a3656ff6ebf7908069fc3 -DIST qtwebengine-6.9-patchset-1.tar.xz 8660 BLAKE2B c7d5e8bff9122e57ebba7402bff9600f1ad7a56af3100f8b355b9b9ed72b30bd54a4ce838c408a0c393ee07f2881b8ea51a5d88b311e780d97f182ef45a219c0 SHA512 a175ff9c757c37b9c784cecd0ef01095b75fd663258965a6d3575ed620257eac4afe7551bfaf48f25a993d97e20e0fc9a73add9d3c56b1bfa4f470a240af00dd -DIST qtwebengine-everywhere-src-6.8.1.tar.xz 566480152 BLAKE2B 6e4137f66363169ae0ab9014d0f60e0af0af70e310ecfa5770d9b73ddb0cb32cffc2a3b15ec89d390aeb323e5250d3ce42576ebd09f741a23b333c6bebc85a4a SHA512 1cab90353894032e23ccccb279e3d0b4269f049879e5033f979b15f28141fd2fb3cae2cd31812811f648ca5b6a115d14790506e07f44cb56475f5865360b0ea6 +DIST qtwebengine-6.9-patchset-2.tar.xz 7952 BLAKE2B e83c8da8834999003c61a641d36da691d017455f1d074471aad911e02f2bb180488d5ba9559fffb2413db853d7dd0ffc3a0f48b886b223485396e0e4cccae79f SHA512 a5ff0d5481eb15787c2c6f606f03b1c3ab952473d0118803b813f42982f6f9816e285ed9221a20b2285c725de8edbca235648a4c1a34f984fedbd874720df778 DIST qtwebengine-everywhere-src-6.8.2.tar.xz 566518084 BLAKE2B 312fda4150bdc1aee25625440baca45b532ecd7a1ce24d3dc3ba990cdf208c3ba42f159e02c881f38b56c29b75677d9001e6222d35b4c96fc39eecf65502e9c7 SHA512 27590ec53845fa36f48a5a0506d505995850027d85bf33fe0413733cbde5c2744e8ea49f445c91d84b8d43454b9f12c1cf7005d614bbcae1a29d432fdacdc0e4 EBUILD qtwebengine-5.15.16_p20241115.ebuild 7879 BLAKE2B ce3061b704385359455c0885efe935b9bf1f8e5627ba06a9fbafb1c95cfccdef6f39331868bbaf3d5794d708e7bb6c01cbef28c1880f45fb60d9e81cc73dcf53 SHA512 c31bca254f0962e39f763f49f22930d7c6d51a68169b72e9bf9afb111a01e40c15c82d86743f185480f092c85e8e17c51dc4e07ee7557ac449a00a8d3952be6f -EBUILD qtwebengine-6.8.1-r1.ebuild 10358 BLAKE2B 49ae9ccf4db903ac46ed602bb9a9eca4751eb1a2476ce4a3bc2d02a61529e8c6f1d892729c5b1393bc975d5d26a5840d4e0599029467e69ddfec5d606beeb631 SHA512 8ddb31bfdc1118d87d188bcd6d74d8fdca4800c6e0420d21740614587f62d9d8b1ebd3603c20ff52d6b6ecc6c673c4360f6c0c08a549f927889ba582be4a8f38 EBUILD qtwebengine-6.8.2-r1.ebuild 10355 BLAKE2B 97e6e0a2210d2f7c66aebf45de12c1104f842b660f84742fbaeff8130032268a2dbd0a7d98a33c768ac5fb14c12e6d7c28ee3c8a4e6c4ec8d85e74a2a6a18b58 SHA512 31c77831933cf1d74e6d709d90c0cc1bee0db8736a8143477c75e468f1982195f506d38d2c86815da9535247b0fc6f8ea9d4b8d7bb87353ca44153022b264c24 -EBUILD qtwebengine-6.8.9999.ebuild 10315 BLAKE2B 07cf9aa9c473e352c8df4c72ec695cb35ce2cbdb81636a6e4fc235e73b1d28606396e58d5e7eb2d0988819122e4b6dce35be53fec50c1a9f02bdbc7ac3225b8c SHA512 9786337792debf8400c8ad2b5bb06dad4acf585900c62b3346f33d0c9f3803f08a257fda66884a73028c8dc8fcdb2efb1354974c7f1612d85167291d2aff5746 -EBUILD qtwebengine-6.9.9999.ebuild 10164 BLAKE2B c61f384601077d468a778e86c38afed39f839924bb60c559e9114d97b5e5c2c92570eeaeca052e90af814a1ab4327d9c3ca93e502fc2ba8883aa79c42acff71e SHA512 aaed3d63c010c9313fc1a6b84f36c966a6428e7a1a7865d0e3aeb02d837a79efd58d0d51ea0d9b80644e146d50c39e6437b7794448efc4d93437cc9475db929b -EBUILD qtwebengine-6.9999.ebuild 10123 BLAKE2B bb2a7f1ef1f77f758908c6beaf39a59c00ce345de44c82f3909399af8d3f1bcb0106a85131ce79f302f7e0eba618d12154b47d5d8cb35b59c73f351da033f47b SHA512 ef7643215a7c350269bdfd8d092f9f794e3561c9ad627fd58ffdb270bc002f1436d010052eeeacd9cf8867efdc213b9206926d51b1251ef1ee86ebfbe3212c6c +EBUILD qtwebengine-6.8.9999.ebuild 10427 BLAKE2B b6367f71b635cabd4fe76c69a95cf7698e81d271cec4113084f1707ecb489f8b735a4a1c21955e00dce8fa47c05a8b14946278ee036fbf52207b071e1bf23306 SHA512 857647f9cfd0e4b6e5c2d0b619c274a8db4a738cc38b74f483da465b4a7e4339af3d9b1bce1402d04ee8c45533e2a23d2f2ce84a6ecd11a6c18a4a13d816a95e +EBUILD qtwebengine-6.9.9999.ebuild 10490 BLAKE2B 85283b6f64043b054bc3931993bcdf6444d2e6416cc9386e0e4a0c59d540cdbc7e3b716bf4832ebaeb6007d53b6c80fdd56e01354729e02b04a252dfb101f2fb SHA512 2985f86386eee23d27767537b0f3f6d4650775cda175c2d682a6f5a0bd553dcd0d70a54ce7bccbe2ab6a6a73ccd6e2448512029c3d8383a619c1812235da1010 +EBUILD qtwebengine-6.9999.ebuild 10447 BLAKE2B d6c57f76ac7ff1eed87b6f690268b0d3830238eb6f6fb9268ce019d04b625b20f99c7f1ebb816db961d77dbfaa946fcaf1cd0568cb09aebbb67f910e049a2211 SHA512 c56cb96bc2365e39a76c35f86a617f204826a77e7957cf466364e62d5a62d336669185875debd66393a9a63f6a58a5f4fb01c83a3d1ec9605da3eb1f8697e7c1 MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.8.1-QTBUG-131156.patch b/dev-qt/qtwebengine/files/qtwebengine-6.8.1-QTBUG-131156.patch deleted file mode 100644 index 2794fd37058e..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-6.8.1-QTBUG-131156.patch +++ /dev/null @@ -1,150 +0,0 @@ -Patch status: *should* be fixed in qtwebengine-6.8.2 - -Somewhat annoying issue for qutebrowser users[1][2] resulting in hints -not always being usable on some google-based sites (e.g. youtube). - -Note: as of the writing of this, [3] hasn't been merged upstream (yet) -and so the final version of this patch may differ. Was added here early -to avoid revbumping qtwebengine post-6.8.1 release, final version will -likely land in 6.8.2 instead. - -[1] https://github.com/qutebrowser/qutebrowser/issues/8197 -[2] https://bugreports.qt.io/browse/QTBUG-131156 -[3] https://codereview.qt-project.org/c/qt/qtwebengine/+/604899 ---- a/src/core/renderer_host/user_resource_controller_host.cpp -+++ b/src/core/renderer_host/user_resource_controller_host.cpp -@@ -43,8 +43,7 @@ - void UserResourceControllerHost::WebContentsObserverHelper::RenderFrameCreated(content::RenderFrameHost *renderFrameHost) - { -- content::WebContents *contents = web_contents(); - auto &remote = m_controllerHost->GetUserResourceControllerRenderFrame(renderFrameHost); -- const QList<UserScript> scripts = m_controllerHost->m_perContentsScripts.value(contents); -- for (const UserScript &script : scripts) -+ const auto scripts = m_controllerHost->m_perContentsScripts.constFind(web_contents()); -+ for (const UserScript &script : *scripts) - remote->AddScript(script.data()); - } -@@ -57,4 +56,10 @@ - remote->ClearScripts(); - } -+ if (newHost) { -+ auto &remote = m_controllerHost->GetUserResourceControllerRenderFrame(newHost); -+ const auto scripts = m_controllerHost->m_perContentsScripts.constFind(web_contents()); -+ for (const UserScript &script : *scripts) -+ remote->AddScript(script.data()); -+ } - } - ---- a/src/core/renderer_host/web_channel_ipc_transport_host.cpp -+++ b/src/core/renderer_host/web_channel_ipc_transport_host.cpp -@@ -108,4 +108,14 @@ - } - -+void WebChannelIPCTransportHost::RenderFrameHostChanged(content::RenderFrameHost *oldHost, content::RenderFrameHost *newHost) -+{ -+ if (oldHost) { -+ if (oldHost->IsRenderFrameLive()) -+ GetWebChannelIPCTransportRemote(oldHost)->ResetWorldId(); -+ } -+ if (newHost) // this might set it again, but that is harmless -+ setWorldId(newHost, m_worldId); -+} -+ - void WebChannelIPCTransportHost::RenderFrameDeleted(content::RenderFrameHost *rfh) - { ---- a/src/core/renderer_host/web_channel_ipc_transport_host.h -+++ b/src/core/renderer_host/web_channel_ipc_transport_host.h -@@ -46,4 +46,5 @@ - // WebContentsObserver - void RenderFrameCreated(content::RenderFrameHost *frame) override; -+ void RenderFrameHostChanged(content::RenderFrameHost *oldHost, content::RenderFrameHost *newHost) override; - void RenderFrameDeleted(content::RenderFrameHost *render_frame_host) override; - ---- a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp -+++ b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp -@@ -70,4 +70,5 @@ - void webChannelWithExistingQtObject(); - void navigation(); -+ void navigation2(); - void webChannelWithBadString(); - void webChannelWithJavaScriptDisabled(); -@@ -578,4 +579,79 @@ - } - -+void tst_QWebEngineScript::navigation2() -+{ -+ QWebEngineProfile profile("navigation2"); -+ QWebEnginePage page(&profile, nullptr); -+ QWebChannel channel; -+ page.setWebChannel(&channel); -+ QWebEngineScript s1; -+ s1.setInjectionPoint(QWebEngineScript::DocumentCreation); -+ // Check webchannel is installed before DocumentCreation scripts are run -+ // onload shouldn't have run, and neither should wasready -+ s1.setWorldId(QWebEngineScript::MainWorld); -+ s1.setSourceCode("document.passCreation = 0;" \ -+ "if (typeof qt !== undefined) document.passCreation++;" \ -+ "if (document.onloadran) document.passCreation++;" \ -+ "if (document.wasready) document.passCreation++;"); -+ page.scripts().insert(s1); -+ QWebEngineScript s2; -+ s2.setInjectionPoint(QWebEngineScript::DocumentReady); -+ // onload shouldn't have run -+ s2.setWorldId(QWebEngineScript::MainWorld); -+ s2.setSourceCode("document.passReady = 0;" \ -+ "if (typeof qt !== undefined) document.passReady++;" \ -+ "if (document.passCreation > 0) document.passReady++;" \ -+ "if (document.passDeferred > 0) document.passReady++;" \ -+ "if (document.onloadran) document.passReady++;" \ -+ "if (document.wasready) document.passReady++;"); -+ page.scripts().insert(s2); -+ QWebEngineScript s3; -+ s3.setInjectionPoint(QWebEngineScript::Deferred); -+ // all should have run -+ s3.setWorldId(QWebEngineScript::MainWorld); -+ s3.setSourceCode("document.passDeferred = 0;" \ -+ "if (typeof qt !== undefined) document.passDeferred++;" \ -+ "if (document.passCreation > 0) document.passDeferred++;" \ -+ "if (document.passReady > 0) document.passDeferred++;" \ -+ "if (document.onloadran) document.passDeferred++;" \ -+ "if (document.wasready) document.passDeferred++;"); -+ page.scripts().insert(s3); -+ -+ -+ QString html("<html><head><script>" \ -+ " document.onloadran = false; document.wasready = false;"\ -+ " document.addEventListener(\"readystatechange\", (x) => { "\ -+ " if (x.target.readyState === \"interactive\") document.wasready= true;"\ -+ " });"\ -+ " function bodyload() { document.onloadran = true; };"\ -+ "</script></head>" \ -+ "<body onload='bodyload()'><p>hello world</p></body></html>"); -+ page.setHtml(html, QUrl("about:blank")); -+ QTRY_COMPARE(evaluateJavaScriptSyncInWorld(&page, "document.passCreation", QWebEngineScript::MainWorld), -+ QVariant(1)); -+ QTRY_COMPARE(evaluateJavaScriptSyncInWorld(&page, "document.passReady", QWebEngineScript::MainWorld), -+ QVariant(3)); -+ QTRY_COMPARE(evaluateJavaScriptSyncInWorld(&page, "document.passDeferred", QWebEngineScript::MainWorld), -+ QVariant(5)); -+ -+ QString url2 = QStringLiteral("chrome://gpu/"); -+ page.setUrl(url2); -+ QTRY_COMPARE(evaluateJavaScriptSyncInWorld(&page, "document.passCreation", QWebEngineScript::MainWorld), -+ QVariant(1)); -+ QTRY_COMPARE(evaluateJavaScriptSyncInWorld(&page, "document.passReady", QWebEngineScript::MainWorld), -+ QVariant(2)); -+ QTRY_COMPARE(evaluateJavaScriptSyncInWorld(&page, "document.passDeferred", QWebEngineScript::MainWorld), -+ QVariant(3)); -+ -+ QString url3 = QStringLiteral("qrc:/resources/test_iframe_main.html"); -+ page.setUrl(url3); -+ QTRY_COMPARE(evaluateJavaScriptSyncInWorld(&page, "document.passCreation", QWebEngineScript::MainWorld), -+ QVariant(1)); -+ QTRY_COMPARE(evaluateJavaScriptSyncInWorld(&page, "document.passReady", QWebEngineScript::MainWorld), -+ QVariant(2)); -+ QTRY_COMPARE(evaluateJavaScriptSyncInWorld(&page, "document.passDeferred", QWebEngineScript::MainWorld), -+ QVariant(3)); -+} -+ - // Try to set TestObject::text to an invalid UTF-16 string. - // diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.1-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.1-r1.ebuild deleted file mode 100644 index 39e9490aeb43..000000000000 --- a/dev-qt/qtwebengine/qtwebengine-6.8.1-r1.ebuild +++ /dev/null @@ -1,336 +0,0 @@ -# Copyright 2021-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -PYTHON_REQ_USE="xml(+)" -inherit check-reqs flag-o-matic multiprocessing optfeature -inherit prefix python-any-r1 qt6-build toolchain-funcs - -DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" -SRC_URI+=" - https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-7.tar.xz -" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm64" -fi - -IUSE=" - accessibility +alsa bindist custom-cflags designer geolocation - +jumbo-build kerberos opengl pdfium pulseaudio qml screencast - +system-icu vaapi vulkan webdriver +widgets -" -REQUIRED_USE=" - designer? ( qml widgets ) -" - -# dlopen: krb5, libva, pciutils, udev -# gcc: for -latomic -RDEPEND=" - app-arch/snappy:= - dev-libs/expat - dev-libs/libevent:= - dev-libs/libxml2[icu] - dev-libs/libxslt - dev-libs/nspr - dev-libs/nss - ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?] - ~dev-qt/qtdeclarative-${PV}:6[widgets?] - ~dev-qt/qtwebchannel-${PV}:6[qml?] - media-libs/fontconfig - media-libs/freetype - media-libs/harfbuzz:= - media-libs/lcms:2 - media-libs/libjpeg-turbo:= - media-libs/libpng:= - media-libs/libwebp:= - media-libs/mesa[gbm(+)] - media-libs/openjpeg:2= - media-libs/opus - media-libs/tiff:= - sys-apps/dbus - sys-apps/pciutils - sys-devel/gcc:* - sys-libs/zlib:=[minizip] - virtual/libudev - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXtst - x11-libs/libdrm - x11-libs/libxcb:= - x11-libs/libxkbcommon - x11-libs/libxkbfile - alsa? ( media-libs/alsa-lib ) - designer? ( ~dev-qt/qttools-${PV}:6[designer] ) - geolocation? ( ~dev-qt/qtpositioning-${PV}:6 ) - kerberos? ( virtual/krb5 ) - pulseaudio? ( media-libs/libpulse[glib] ) - screencast? ( - dev-libs/glib:2 - media-video/pipewire:= - ) - system-icu? ( dev-libs/icu:= ) - vaapi? ( media-libs/libva:=[X] ) -" -DEPEND=" - ${RDEPEND} - media-libs/libglvnd - x11-base/xorg-proto - x11-libs/libXcursor - x11-libs/libXi - x11-libs/libxshmfence - opengl? ( media-libs/libglvnd[X] ) - screencast? ( media-libs/libepoxy[egl(+)] ) - test? ( - widgets? ( app-text/poppler[cxx(+)] ) - ) - vaapi? ( - vulkan? ( dev-util/vulkan-headers ) - ) -" -BDEPEND=" - $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]') - dev-util/gperf - net-libs/nodejs[ssl] - sys-devel/bison - sys-devel/flex -" - -PATCHES=( "${WORKDIR}"/patches/${PN} ) -[[ ${PV} == 6.9999 ]] || # too fragile for 6.9999, but keep for 6.x.9999 - PATCHES+=( "${WORKDIR}"/patches/chromium ) - -PATCHES+=( - # add extras as needed here, may merge in set if carries across versions - "${FILESDIR}"/${PN}-6.8.1-QTBUG-131156.patch - "${FILESDIR}"/${PN}-6.8.1-aarch64-xnnpack.patch - "${FILESDIR}"/${PN}-6.8.1-cstdint.patch -) - -python_check_deps() { - python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]" -} - -qtwebengine_check-reqs() { - [[ ${MERGE_TYPE} == binary ]] && return - - if is-flagq '-g?(gdb)?([1-9])'; then #307861 - ewarn - ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which" - ewarn "is non-trivial with ${PN}. May experience extended compilation" - ewarn "times, increased disk/memory usage, and potentially link failure." - ewarn - ewarn "If run into issues, please try disabling before reporting a bug." - fi - - local CHECKREQS_DISK_BUILD=9G - local CHECKREQS_DISK_USR=360M - - if ! has distcc ${FEATURES}; then #830661 - # assume ~2GB per job or 1.5GB if clang, possible with less - # depending on free memory and *FLAGS, but prefer being safe as - # users having OOM issues with qtwebengine been rather common - tc-is-clang && : 15 || : 20 - local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G - fi - - check-reqs_${EBUILD_PHASE_FUNC} #570534 -} - -pkg_pretend() { - qtwebengine_check-reqs -} - -pkg_setup() { - qtwebengine_check-reqs - python-any-r1_pkg_setup -} - -src_prepare() { - qt6-build_src_prepare - - # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix - hprefixify -w /Gentoo/ src/core/content_client_qt.cpp - - # store chromium versions, only used in postinst for a warning - local chromium - mapfile -t chromium < CHROMIUM_VERSION || die - [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] && - QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die - [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] && - QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die -} - -src_configure() { - local mycmakeargs=( - $(qt_feature pdfium qtpdf_build) - $(qt_feature qml qtpdf_quick_build) - $(qt_feature webdriver webenginedriver) - $(qt_feature widgets qtpdf_widgets_build) - $(usev pdfium -DQT_FEATURE_pdf_v8=ON) - - -DQT_FEATURE_qtwebengine_build=ON - $(qt_feature qml qtwebengine_quick_build) - $(qt_feature widgets qtwebengine_widgets_build) - - $(cmake_use_find_package designer Qt6Designer) - - $(qt_feature alsa webengine_system_alsa) - $(qt_feature !bindist webengine_proprietary_codecs) - $(qt_feature geolocation webengine_geolocation) - $(qt_feature jumbo-build webengine_jumbo_build) - $(qt_feature kerberos webengine_kerberos) - $(qt_feature pulseaudio webengine_system_pulseaudio) - $(qt_feature screencast webengine_webrtc_pipewire) - $(qt_feature system-icu webengine_system_icu) - $(qt_feature vaapi webengine_vaapi) - $(qt_feature vulkan webengine_vulkan) - -DQT_FEATURE_webengine_embedded_build=OFF - -DQT_FEATURE_webengine_extensions=ON - # TODO: it may be possible to make x11 optional since 6.8+ - -DQT_FEATURE_webengine_ozone_x11=ON - -DQT_FEATURE_webengine_pepper_plugins=ON - -DQT_FEATURE_webengine_printing_and_pdf=ON - -DQT_FEATURE_webengine_spellchecker=ON - -DQT_FEATURE_webengine_webchannel=ON - -DQT_FEATURE_webengine_webrtc=ON - - # needs a modified ffmpeg to be usable (bug #831487), and even then - # it is picky about codecs/version and system's can lead to unexpected - # issues (e.g. builds but some files don't play even with support) - -DQT_FEATURE_webengine_system_ffmpeg=OFF - - # use bundled re2 to avoid complications, Qt has also disabled - # this by default in 6.7.3+ (bug #913923) - -DQT_FEATURE_webengine_system_re2=OFF - - # system_libvpx=ON is intentionally ignored with USE=vaapi which leads - # to using system's being less tested, prefer disabling for now until - # vaapi can use it as well - -DQT_FEATURE_webengine_system_libvpx=OFF - - # not necessary to pass these (default), but in case detection fails - $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \ - freetype gbm glib harfbuzz lcms2 libevent libjpeg \ - libopenjpeg2 libpci libpng libtiff libwebp libxml \ - minizip opus poppler snappy zlib) - - # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON - # (see also BUILD_ONLY_GN option added in 6.8+ for the latter) - -DINSTALL_GN=OFF - ) - - local mygnargs=( - # prefer no dlopen where possible - $(usev pulseaudio link_pulseaudio=true) - $(usev screencast rtc_link_pipewire=true) - # reduce default disk space usage - symbol_level=0 - ) - - if use !custom-cflags; then - strip-flags # fragile - - # temporary workaround for bug #947356, should be fixed in Qt 6.9.x - append-cppflags -U_GLIBCXX_ASSERTIONS - - if is-flagq '-g?(gdb)?([2-9])'; then #914475 - replace-flags '-g?(gdb)?([2-9])' -g1 - ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)" - fi - - # Built helpers segfault when using (at least) -march=armv8-a+pauth - # (bug #920555, #920568 -- suspected gcc bug). For now, filter all - # for simplicity. Override with USE=custom-cflags if wanted, please - # report if above -march works again so can cleanup. - use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*' - fi - - export NINJAFLAGS=$(get_NINJAOPTS) - [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v" - - local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}" - einfo "Extra Gn args: ${EXTRA_GN}" - - qt6-build_src_configure -} - -src_compile() { - # tentatively work around a possible (rare) race condition (bug #921680) - cmake_build WebEngineCore_sync_all_public_headers - - cmake_src_compile -} - -src_test() { - if [[ ${EUID} == 0 ]]; then - # almost every tests fail, so skip entirely - ewarn "Skipping tests due to running as root (chromium refuses this configuration)." - return - fi - - local CMAKE_SKIP_TESTS=( - # fails with network sandbox - tst_certificateerror - tst_loadsignals - tst_qquickwebengineview - tst_qwebengineglobalsettings - tst_qwebengineview - # fails with offscreen rendering, may be worth retrying if the issue - # persist given these are rather major tests (or consider virtx) - tst_qmltests - tst_qwebenginepage - # certs verfication seems flaky and gives expiration warnings - tst_qwebengineclientcertificatestore - # test is misperformed when qtbase is built USE=-test? - tst_touchinput - # currently requires webenginedriver to be already installed - tst_webenginedriver - ) - - # prevent using the system's qtwebengine - # (use glob to avoid unnecessary complications with arch dir) - local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* ) - [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}" - local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess - local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales - local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]} - - # random failures in several tests without -j1 - qt6-build_src_test -j1 -} - -src_install() { - qt6-build_src_install - - [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472 - die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" - - if use test && use webdriver; then - rm -- "${D}${QT6_BINDIR}"/testbrowser || die - fi -} - -pkg_postinst() { - # plugin may also be found in $HOME if provided by chrome or firefox - use amd64 && - optfeature "Widevine DRM support (protected media playback)" \ - www-plugins/chrome-binary-plugins - - elog - elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with" - elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. Extensive as it is, the" - elog "list of backports is impossible to evaluate, but always bound to be behind" - elog "Chromium's release schedule." - elog - elog "In addition, various online services may deny service based on an outdated" - elog "user agent version (and/or other checks). Google is already known to do so." - elog - elog "tl;dr your web browsing experience will be compromised." -} diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild index 7bb880825551..b41603e45458 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild @@ -97,7 +97,7 @@ DEPEND=" BDEPEND=" $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]') dev-util/gperf - net-libs/nodejs[ssl] + net-libs/nodejs[icu,ssl] sys-devel/bison sys-devel/flex " @@ -110,6 +110,7 @@ PATCHES+=( # add extras as needed here, may merge in set if carries across versions "${FILESDIR}"/${PN}-6.8.1-aarch64-xnnpack.patch "${FILESDIR}"/${PN}-6.8.1-cstdint.patch + "${FILESDIR}"/${PN}-6.8.2-glibc2.41.patch ) python_check_deps() { @@ -261,7 +262,8 @@ src_configure() { } src_compile() { - # tentatively work around a possible (rare) race condition (bug #921680) + # tentatively work around a possible (rare) race condition (bug #921680), + # has good chances to be obsolete but keep for now as a safety cmake_build WebEngineCore_sync_all_public_headers cmake_src_compile diff --git a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild index ff0f8da7397d..0ad5fc92b2d8 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild @@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" SRC_URI+=" - https://dev.gentoo.org/~ionen/distfiles/${PN}-6.9-patchset-1.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.9-patchset-2.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -26,7 +26,7 @@ REQUIRED_USE=" designer? ( qml widgets ) " -# dlopen: krb5, libva, pciutils, udev +# dlopen: krb5, libva, pciutils # gcc: for -latomic RDEPEND=" app-arch/snappy:= @@ -54,7 +54,7 @@ RDEPEND=" sys-apps/pciutils sys-devel/gcc:* sys-libs/zlib:=[minizip] - virtual/libudev + virtual/libudev:= x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage @@ -94,7 +94,7 @@ DEPEND=" BDEPEND=" $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]') dev-util/gperf - net-libs/nodejs[ssl] + net-libs/nodejs[icu,ssl] sys-devel/bison sys-devel/flex " @@ -105,7 +105,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions - "${FILESDIR}"/${PN}-6.8.1-cstdint.patch + "${FILESDIR}"/${PN}-6.8.2-glibc2.41.patch ) python_check_deps() { @@ -124,8 +124,8 @@ qtwebengine_check-reqs() { ewarn "If run into issues, please try disabling before reporting a bug." fi - local CHECKREQS_DISK_BUILD=9G - local CHECKREQS_DISK_USR=360M + local CHECKREQS_DISK_BUILD=10G + local CHECKREQS_DISK_USR=400M if ! has distcc ${FEATURES}; then #830661 # assume ~2GB per job or 1.5GB if clang, possible with less @@ -170,6 +170,10 @@ src_configure() { $(qt_feature widgets qtpdf_widgets_build) $(usev pdfium -DQT_FEATURE_pdf_v8=ON) + # TODO?: since 6.9.0, dependency checks have been adjusted to make it + # easier for webengine to be optional which could be useful if *only* + # need QtPdf (rare at the moment), would require all revdeps to depend + # on qtwebengine[webengine(+)] -DQT_FEATURE_qtwebengine_build=ON $(qt_feature qml qtwebengine_quick_build) $(qt_feature widgets qtwebengine_widgets_build) @@ -214,8 +218,8 @@ src_configure() { # given qtbase's force_system_libs does not affect these right now $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \ freetype gbm glib harfbuzz lcms2 libevent libjpeg \ - libopenjpeg2 libpci libpng libtiff libwebp libxml \ - minizip opus snappy zlib) + libopenjpeg2 libpci libpng libtiff libudev libwebp \ + libxml minizip opus snappy zlib) # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON # (see also BUILD_ONLY_GN option added in 6.8+ for the latter) @@ -255,7 +259,8 @@ src_configure() { } src_compile() { - # tentatively work around a possible (rare) race condition (bug #921680) + # tentatively work around a possible (rare) race condition (bug #921680), + # has good chances to be obsolete but keep for now as a safety cmake_build WebEngineCore_sync_all_public_headers cmake_src_compile diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index 0bf290e666e8..beee970f5761 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" SRC_URI+=" - https://dev.gentoo.org/~ionen/distfiles/${PN}-6.9-patchset-1.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.9-patchset-2.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -26,7 +26,7 @@ REQUIRED_USE=" designer? ( qml widgets ) " -# dlopen: krb5, libva, pciutils, udev +# dlopen: krb5, libva, pciutils # gcc: for -latomic RDEPEND=" app-arch/snappy:= @@ -54,7 +54,7 @@ RDEPEND=" sys-apps/pciutils sys-devel/gcc:* sys-libs/zlib:=[minizip] - virtual/libudev + virtual/libudev:= x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage @@ -94,7 +94,7 @@ DEPEND=" BDEPEND=" $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]') dev-util/gperf - net-libs/nodejs[ssl] + net-libs/nodejs[icu,ssl] sys-devel/bison sys-devel/flex " @@ -123,8 +123,8 @@ qtwebengine_check-reqs() { ewarn "If run into issues, please try disabling before reporting a bug." fi - local CHECKREQS_DISK_BUILD=9G - local CHECKREQS_DISK_USR=360M + local CHECKREQS_DISK_BUILD=10G + local CHECKREQS_DISK_USR=400M if ! has distcc ${FEATURES}; then #830661 # assume ~2GB per job or 1.5GB if clang, possible with less @@ -169,6 +169,10 @@ src_configure() { $(qt_feature widgets qtpdf_widgets_build) $(usev pdfium -DQT_FEATURE_pdf_v8=ON) + # TODO?: since 6.9.0, dependency checks have been adjusted to make it + # easier for webengine to be optional which could be useful if *only* + # need QtPdf (rare at the moment), would require all revdeps to depend + # on qtwebengine[webengine(+)] -DQT_FEATURE_qtwebengine_build=ON $(qt_feature qml qtwebengine_quick_build) $(qt_feature widgets qtwebengine_widgets_build) @@ -213,8 +217,8 @@ src_configure() { # given qtbase's force_system_libs does not affect these right now $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \ freetype gbm glib harfbuzz lcms2 libevent libjpeg \ - libopenjpeg2 libpci libpng libtiff libwebp libxml \ - minizip opus snappy zlib) + libopenjpeg2 libpci libpng libtiff libudev libwebp \ + libxml minizip opus snappy zlib) # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON # (see also BUILD_ONLY_GN option added in 6.8+ for the latter) @@ -254,7 +258,8 @@ src_configure() { } src_compile() { - # tentatively work around a possible (rare) race condition (bug #921680) + # tentatively work around a possible (rare) race condition (bug #921680), + # has good chances to be obsolete but keep for now as a safety cmake_build WebEngineCore_sync_all_public_headers cmake_src_compile |