diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-06-09 00:08:14 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-06-09 00:08:14 +0100 |
commit | 4fe228ee9aa3b9b825d54ace549a5517e153e8bd (patch) | |
tree | 90a261e3ea59b80722d70d3c42f3e40d16c9f8dd /dev-qt/qtwebengine | |
parent | adc09cc4e6ebf7931735c02c0c272b4b885c2b30 (diff) |
gentoo auto-resync : 09:06:2024 - 00:08:13
Diffstat (limited to 'dev-qt/qtwebengine')
-rw-r--r-- | dev-qt/qtwebengine/Manifest | 8 | ||||
-rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-6.7.0-clang18.patch | 96 | ||||
-rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch | 12 | ||||
-rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch | 30 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild | 333 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild | 2 |
6 files changed, 2 insertions, 479 deletions
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index cd4f7f0d2f28..9db45243b327 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -1,19 +1,13 @@ AUX qtwebengine-5.15.14_p20240510-icu-75.patch 5107 BLAKE2B fc61801f5bbf5583610afe5af8ed60a90f94a248c0aa16b94f6df96e239e9c1cfe1fc40da487d3a25fc600a798b33c5bf8384c6d6cfcd0ff9446c20aae5f8f84 SHA512 b812dc26e6135cd69df9ef3b9049509be9888e012394af3c496b03666e80c63f4c827916398d94f7499f73739ca70829108b60705d5b2329f3134dd695a029eb AUX qtwebengine-5.15.2_p20210521-clang-libc++.patch 358 BLAKE2B a03de632ac4e01cf56c52af3a3bd5ff5bcfd525c67bf2e5d960904a9f3b53e1fa18f0e0df380c0cf84f17914fb313a028e26efaefe6ab5057f0d9a9cf2f6f0fd SHA512 6dc3864064d6084e70d4696fda744701c293ee62e9c9088e3247988ffb8085f30c632e94ac19aef715cbd211b21dfcb98691d5809e21cffd9f04bbb8b04cf0da -AUX qtwebengine-6.7.0-clang18.patch 4862 BLAKE2B 0267bb9c9140cf9baa6264979297d1c218af2e68fde04cbf176b07d52a9e800f6758dad4b31372f9b8a09b7cfe3c6af2be556ea40b7fc07646d7a34f552bb720 SHA512 c13c38f7bbe6d40325fd41b56311cd94fe3a91f19795b2d59c420cb608251bba08146668d156e77f9ecf8e306b2da842b0440abea0b5f44455f1ab74ac245d44 -AUX qtwebengine-6.7.0-displaykey-header.patch 346 BLAKE2B d3591285c2c2b3b795818cc1da0a34307bafb01cdab2dd32df5645e83485ff1e332b257473f9475600d79557074b86bbd3bebfad4a740a2dd4dbff8189df4ea1 SHA512 346b1cf14d332af94c197558a41d12952575fb95ef97ed0b2ed35ac126f88809b30c2ac723fdd70e01253cd90c8b84347e5f7d1b03367d95eabb95ee4b667a78 -AUX qtwebengine-6.7.0-ninja1.12.patch 1173 BLAKE2B 11e1801ac32a984333bb8e81aed93471d3da330205508222e85140e1784654668dc1cf9e6a207d91f162568e0ff2d66c34c345084f62a4766745bd66f8927f94 SHA512 4cac6ac4abd17aa958db8c61026a80f4e363f7d8b4ed8fcc9660618e2fc2c7ff0eba03d3ca043755b28d9da65d819538b5f5982dff64ca1dea0043f7266ede36 DIST qtwebengine-5.15.13_p20240510.tar.xz 301422784 BLAKE2B b63acccb4740ddb3dd5c76ef9808d946eb2c93b10b45125622adcb5c5e951644ac54612e7aeb9e009e00c5ca8913d3f8b5dfa530c274fec87c4a8377bf1068fb SHA512 0ccc1be0825f4cf2387879241a21f033b5a0198da4e93f2e0533296ec485b103c1ab35aa71a2a9d9c16364979d45d3dd2e13f7e6d0e2a21f94d85294c5819eb3 DIST qtwebengine-5.15.14_p20240510-patchset.tar.xz 20780 BLAKE2B 516d4c628c4b027ab3a7159da006a57173be91de3eb4b7f308029953d4fd19fb3e790ca38e79d17fef75d8d9b392676650acb9285d5913f9ebecaa4136575c47 SHA512 492979d118d6bd9165ee194724e38b627d19c89dbe1daa6b2f55e4a8fc7676748a1eacb9623ee05e09140c2c4a2ac82ddafaef5c45630a117ce0ed14b240a474 -DIST qtwebengine-6.7-patchset-6.tar.xz 8140 BLAKE2B 773ee76ecf118ce45eb5dbebf4a574c3cff90f50cd87a469511688ed77db7a96012bec0dd03312bf2d366d709d95a2ac3432e9e0bd5a517b69a5bbd250a94420 SHA512 4db6abbd2a598f8194b9ba7035abad7228f6056fc5e5572329a9a0474f36135428b401edf5fa96e1ac866328d078b015fffd90949ef84f1cea9a1b39e5b9d5ff DIST qtwebengine-6.7-patchset-8.tar.xz 8320 BLAKE2B 88f31506865aeef02d6ad0c46dacd478f4c77330815648bf5377762b9f053f5a51b6426c1fbeef81fff5c3a9f4e853f8d51013d5df27fcd0ab0449ce369e18e5 SHA512 1d8e1f8e15a13c6f1675208ba1a329dfa335031e06577de39dc89464b40bd5cf7df7bce4f09f6e67a84c1c2f7aa1fbf6d2d94ea8c142ec5ea67bac8cef1b03b1 DIST qtwebengine-6.7-patchset-9.tar.xz 7440 BLAKE2B 061f39250450af3c8d4458649c80c18d0bf8448061e0bb91f8a0d7c630ff1cd2ee19a9528998c5a4a3ebab1e96ea0ba579cc0db5d879fe56a1239901942ba933 SHA512 4dabb56d6c74600f8d5a4ebb4356ffaaff1814eefe1cb268e33749fee034e9488e34043d0ce0893138ee01b023c09298c737bca3875a30be1bf862a145e244c7 DIST qtwebengine-6.8-patchset-1.tar.xz 7512 BLAKE2B 04eee1a1008f8a193dbb719e08c61e26a78cb68f3a0b9f7cc43b442bd2d851301682009ad7cd96df13da1c0aa7e9459b1b7024193379509abd4784e2547276e7 SHA512 591e5340435a8a40b6805d3db07b440bf185c694461382051c668e41f2ea5d04d5d7ab72602f557ee91a687d6187e919d662751e32dadaea8dc19de568e2c54e -DIST qtwebengine-everywhere-src-6.7.0.tar.xz 550907592 BLAKE2B e7787ab0a8b68657ca318de1c855f23b50d9aa3bda1bfcaa4ecd274ff0afb283c092256c28b566a9882cc5dccdaf2e3312836f4da6d4a85850f3202176d77933 SHA512 92bc8ffc69c6e00d55b647b332878e9b632257e78c38e9b3d0a5f4506d5df3c507e8ffa5916db2547b89c4c2641447fd9031a80e780e143c7ed58a7285e06e64 DIST qtwebengine-everywhere-src-6.7.1.tar.xz 550975920 BLAKE2B b0bbe1d62132bc75f830df7e40d885e976629e759de442702043c71b50a11e874d06c9450378c522894d5e29cc07e05111554758b5bb6aaeca59de1720d6550f SHA512 dc70048bf65ef610dd9cec7e233f1e5a387bde620e84ee5a8e517fc9c326220d58c80939454d55481ceff5ac5b82baaa9823255ea43eb4bb43e86beae68c7b8c EBUILD qtwebengine-5.15.14_p20240510.ebuild 7659 BLAKE2B d930e49649e91657fbe65668a0dfe41ebd4732d4901c36f59f562094d9cb9d339157bf0f5c4e8b530270a13c8a40449ac4800ce9a17a29069be1c7177c288452 SHA512 6c621d916a502e778fb9662dba61161eb55b6ab37bd1045d5a96924bc943428b3ef28512d7838b31b4bfaa0ac43e23b10a66d67fdce2505139325cc837dd756f -EBUILD qtwebengine-6.7.0.ebuild 10306 BLAKE2B cb7b3d848635ae03b3709659697a62b4bb4ba0579bc5b25ba9c25e5bf80872c7f75a5b727db63158ae1769dddb02c72885a316825d06d829f52a32b392513b37 SHA512 2579a2708318bd066933e05e1016fe323c6697314c7f00bf79f5c9463ad8a88795f3970508e4be5275e40893c836a296b6b15681a084ef0dd996dc1762c36da9 -EBUILD qtwebengine-6.7.1.ebuild 10262 BLAKE2B 28955b4c62ef1570d0aecb8d37a3c816f5680dcbcd3b845c6ad9a025274073c7e57821d9e6ce52fb98f25f755927922f4666e1fc7cfd8f19d09cb502c9f2ad16 SHA512 5c8bd6390acc5f2cb33220d4eaa8f8e39c9dd7029529f43e8a0b5a450b252bab1089bda46c7722ac5729ae64c2d471b17f20fde8ed417ae33a5982170cbbf763 +EBUILD qtwebengine-6.7.1.ebuild 10261 BLAKE2B 64a3514dcebc4318f884cfed6c2cf6f45068770beeaaabbcc0f44ef498815abbf2c123a6d6bc4816b197a7942577ebf24198995d0fee6bcc8c608cc661b161c6 SHA512 024c87e0edc1846aface1927786ed26a08bdebe9c4291d780d49dd7a817d5519c0c9b2e196046604ed95509f8678fecf273e36d5734c845115fb9e8e13e6acf2 EBUILD qtwebengine-6.7.9999.ebuild 10263 BLAKE2B 73307fa12fc848ce378f94c24c4af942603d0f374120fd7172eb7947223149eeafb24d1fcc475fa6aed53e0992130a0eb6802791183b0f1b73dd766a16b683cf SHA512 af7b738d2da7d433afbd33ae346df9ed90000ad3a87ef9a70208e1190df3f81f6d7dd44e345a336d420abe5ed722136eadca8e0486277837799796d0f60242aa EBUILD qtwebengine-6.8.9999.ebuild 10263 BLAKE2B a9f7610813951cc14c6cc300015d0903ea4ea3c286383ac03e42f304196e69724ebea3cf976b11b01a5fcc0456dbbe90dfc14e5e8f6b690c05b9f4428ab20cce SHA512 f72d82fef924cdc7c03498399b75fc6ca69453d406d60b5022d0360a37f5d4f36fa8b33e8010f9c0148cda0214ab2b508a0e37b2aa332eeddaee1ef80cc1bc78 EBUILD qtwebengine-6.9999.ebuild 10263 BLAKE2B a9f7610813951cc14c6cc300015d0903ea4ea3c286383ac03e42f304196e69724ebea3cf976b11b01a5fcc0456dbbe90dfc14e5e8f6b690c05b9f4428ab20cce SHA512 f72d82fef924cdc7c03498399b75fc6ca69453d406d60b5022d0360a37f5d4f36fa8b33e8010f9c0148cda0214ab2b508a0e37b2aa332eeddaee1ef80cc1bc78 diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-clang18.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-clang18.patch deleted file mode 100644 index c5ae8cc17c5a..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-clang18.patch +++ /dev/null @@ -1,96 +0,0 @@ -Patch status: fixed in >=chromium-122.0.6200.0 - -https://bugs.gentoo.org/925486 -https://webrtc-review.googlesource.com/c/src/+/332240 -https://webrtc.googlesource.com/src/+/267f9bdd5 -From: Tommi <tommi@webrtc.org> -Date: Thu, 21 Dec 2023 14:08:26 +0100 -Subject: [PATCH] Update LegacyStatsCollector to conform with Wc++11-narrowing ---- a/src/3rdparty/chromium/third_party/webrtc/pc/legacy_stats_collector.cc -+++ b/src/3rdparty/chromium/third_party/webrtc/pc/legacy_stats_collector.cc -@@ -189,7 +189,8 @@ - {StatsReport::kStatsValueNamePreemptiveExpandRate, - info.preemptive_expand_rate}, -- {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_output_energy}, -+ {StatsReport::kStatsValueNameTotalAudioEnergy, -+ static_cast<float>(info.total_output_energy)}, - {StatsReport::kStatsValueNameTotalSamplesDuration, -- info.total_output_duration}}; -+ static_cast<float>(info.total_output_duration)}}; - - const IntForAdd ints[] = { -@@ -245,7 +246,8 @@ - - const FloatForAdd floats[] = { -- {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_input_energy}, -+ {StatsReport::kStatsValueNameTotalAudioEnergy, -+ static_cast<float>(info.total_input_energy)}, - {StatsReport::kStatsValueNameTotalSamplesDuration, -- info.total_input_duration}}; -+ static_cast<float>(info.total_input_duration)}}; - - RTC_DCHECK_GE(info.audio_level, 0); -@@ -341,5 +343,6 @@ - {StatsReport::kStatsValueNameRenderDelayMs, info.render_delay_ms}, - {StatsReport::kStatsValueNameTargetDelayMs, info.target_delay_ms}, -- {StatsReport::kStatsValueNameFramesDecoded, info.frames_decoded}, -+ {StatsReport::kStatsValueNameFramesDecoded, -+ static_cast<int>(info.frames_decoded)}, - }; - -@@ -385,13 +388,17 @@ - {StatsReport::kStatsValueNameFirsReceived, info.firs_received}, - {StatsReport::kStatsValueNameFrameHeightSent, info.send_frame_height}, -- {StatsReport::kStatsValueNameFrameRateInput, round(info.framerate_input)}, -+ {StatsReport::kStatsValueNameFrameRateInput, -+ static_cast<int>(round(info.framerate_input))}, - {StatsReport::kStatsValueNameFrameRateSent, info.framerate_sent}, - {StatsReport::kStatsValueNameFrameWidthSent, info.send_frame_width}, -- {StatsReport::kStatsValueNameNacksReceived, info.nacks_received}, -+ {StatsReport::kStatsValueNameNacksReceived, -+ static_cast<int>(info.nacks_received)}, - {StatsReport::kStatsValueNamePacketsLost, info.packets_lost}, - {StatsReport::kStatsValueNamePacketsSent, info.packets_sent}, - {StatsReport::kStatsValueNamePlisReceived, info.plis_received}, -- {StatsReport::kStatsValueNameFramesEncoded, info.frames_encoded}, -- {StatsReport::kStatsValueNameHugeFramesSent, info.huge_frames_sent}, -+ {StatsReport::kStatsValueNameFramesEncoded, -+ static_cast<int>(info.frames_encoded)}, -+ {StatsReport::kStatsValueNameHugeFramesSent, -+ static_cast<int>(info.huge_frames_sent)}, - }; - -@@ -781,17 +788,23 @@ - - const Int64ForAdd int64s[] = { -- {StatsReport::kStatsValueNameBytesReceived, info.recv_total_bytes}, -- {StatsReport::kStatsValueNameBytesSent, info.sent_total_bytes}, -- {StatsReport::kStatsValueNamePacketsSent, info.sent_total_packets}, -- {StatsReport::kStatsValueNameRtt, info.rtt}, -+ {StatsReport::kStatsValueNameBytesReceived, -+ static_cast<int64_t>(info.recv_total_bytes)}, -+ {StatsReport::kStatsValueNameBytesSent, -+ static_cast<int64_t>(info.sent_total_bytes)}, -+ {StatsReport::kStatsValueNamePacketsSent, -+ static_cast<int64_t>(info.sent_total_packets)}, -+ {StatsReport::kStatsValueNameRtt, static_cast<int64_t>(info.rtt)}, - {StatsReport::kStatsValueNameSendPacketsDiscarded, -- info.sent_discarded_packets}, -+ static_cast<int64_t>(info.sent_discarded_packets)}, - {StatsReport::kStatsValueNameSentPingRequestsTotal, -- info.sent_ping_requests_total}, -+ static_cast<int64_t>(info.sent_ping_requests_total)}, - {StatsReport::kStatsValueNameSentPingRequestsBeforeFirstResponse, -- info.sent_ping_requests_before_first_response}, -- {StatsReport::kStatsValueNameSentPingResponses, info.sent_ping_responses}, -- {StatsReport::kStatsValueNameRecvPingRequests, info.recv_ping_requests}, -- {StatsReport::kStatsValueNameRecvPingResponses, info.recv_ping_responses}, -+ static_cast<int64_t>(info.sent_ping_requests_before_first_response)}, -+ {StatsReport::kStatsValueNameSentPingResponses, -+ static_cast<int64_t>(info.sent_ping_responses)}, -+ {StatsReport::kStatsValueNameRecvPingRequests, -+ static_cast<int64_t>(info.recv_ping_requests)}, -+ {StatsReport::kStatsValueNameRecvPingResponses, -+ static_cast<int64_t>(info.recv_ping_responses)}, - }; - for (const auto& i : int64s) diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch deleted file mode 100644 index 84dce821f80f..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch +++ /dev/null @@ -1,12 +0,0 @@ -TODO: merge with glx-headers patch in patchset, similar -issues that seem to stem from Qt's GLX restoration. - -https://bugs.gentoo.org/930107#c8 ---- a/src/3rdparty/chromium/ui/gl/gl_display.h -+++ b/src/3rdparty/chromium/ui/gl/gl_display.h -@@ -12,4 +12,5 @@ - - #include "ui/gl/gl_export.h" -+#include "ui/gl/gpu_preference.h" - - #if defined(USE_EGL) diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch deleted file mode 100644 index 2d12daccd224..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch +++ /dev/null @@ -1,30 +0,0 @@ -Patch status: pending being looked at upstream - -Issue[1][2][3] also exist in chromium itself[4], and unclear -why this started happening only with ninja-1.12.0 at the moment. - -Just a quickfix, likely not fully correct and seems there may -be further unresolved race issues. - -[1] https://bugs.gentoo.org/930107 -[2] https://bugreports.qt.io/browse/QTBUG-124375 -[3] https://github.com/ninja-build/ninja/issues/2417 -[4] https://bugs.gentoo.org/930112 ---- a/src/3rdparty/chromium/content/browser/BUILD.gn -+++ b/src/3rdparty/chromium/content/browser/BUILD.gn -@@ -198,2 +198,3 @@ - "//components/services/storage/public/mojom", -+ "//components/spellcheck:buildflags", - "//components/sqlite_proto", ---- a/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn -+++ b/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn -@@ -22,2 +22,3 @@ - "//content/public/browser", -+ "//components/web_cache/public/mojom", - "//extensions/common", ---- a/src/core/configure/BUILD.root.gn.in -+++ b/src/core/configure/BUILD.root.gn.in -@@ -235,2 +235,3 @@ - deps = [ -+ "//chrome/app:generated_resources", - "//components/zoom", diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild deleted file mode 100644 index f4f6d55fdf8c..000000000000 --- a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild +++ /dev/null @@ -1,333 +0,0 @@ -# Copyright 2021-2024 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.7-patchset-6.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] ) - !vaapi? ( media-libs/libvpx:= ) -" -DEPEND=" - ${RDEPEND} - media-libs/libglvnd - x11-base/xorg-proto - x11-libs/libxshmfence - screencast? ( media-libs/libepoxy[egl(+)] ) - pdfium? ( net-print/cups ) - 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.7.0-clang18.patch - "${FILESDIR}"/${PN}-6.7.0-ninja1.12.patch - "${FILESDIR}"/${PN}-6.7.0-displaykey-header.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=8G - 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 - -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet - -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, and even then it may not - # cooperate with new major ffmpeg versions (bug #831487) - -DQT_FEATURE_webengine_system_ffmpeg=OFF - - # use bundled re2 to avoid complications, may revisit - # (see discussions in https://github.com/gentoo/gentoo/pull/32281) - -DQT_FEATURE_webengine_system_re2=OFF - - # bundled is currently required when using vaapi (forced regardless) - $(qt_feature !vaapi webengine_system_libvpx) - - # 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 - -DINSTALL_GN=OFF - ) - - local mygnargs=( - # prefer no dlopen where possible - link_pulseaudio=true - rtc_link_pipewire=true - ) - - if use !custom-cflags; then - strip-flags # fragile - - 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 - - # Workaround for build failure with clang-18 and -march=native without - # avx512. Does not affect e.g. -march=skylake, only native (bug #931623). - # TODO: drop this when <=llvm-18.1.5-r1 >=18 been gone for some time - use amd64 && tc-is-clang && is-flagq -march=native && - [[ $(clang-major-version) -ge 18 ]] && - has_version '<sys-devel/llvm-18.1.5-r1' && - tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} && - append-flags -mevex512 - - export NINJA 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_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.7.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild index 75985162ac1c..9191f4cdc4da 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild @@ -14,7 +14,7 @@ SRC_URI+=" " if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm64" + KEYWORDS="amd64 arm64" fi IUSE=" |