diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-08-15 12:22:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-08-15 12:22:30 +0100 |
commit | 3ad1879f00b279af69d6b9cd3ef97a2a7496d734 (patch) | |
tree | 497e5c46d6f6695b96866bc46abe1a2470a880b5 /dev-qt/qtwebengine | |
parent | 792e307954fd3b5b12c968741d76ea7cfe5206e4 (diff) |
gentoo auto-resync : 15:08:2024 - 12:22:30
Diffstat (limited to 'dev-qt/qtwebengine')
-rw-r--r-- | dev-qt/qtwebengine/Manifest | 15 | ||||
-rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-6.7.2-QTBUG-113574.patch | 41 | ||||
-rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-6.7.2-clang19.patch | 76 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild | 4 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 4 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 3 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 |
7 files changed, 11 insertions, 134 deletions
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 877cd2cf9d3f..88b871992115 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -2,16 +2,15 @@ AUX qtwebengine-5.15.13_p20240510-gcc15.patch 1308 BLAKE2B d206c6df9b88f706ade2f AUX qtwebengine-5.15.14_p20240510-icu-75.patch 5107 BLAKE2B fc61801f5bbf5583610afe5af8ed60a90f94a248c0aa16b94f6df96e239e9c1cfe1fc40da487d3a25fc600a798b33c5bf8384c6d6cfcd0ff9446c20aae5f8f84 SHA512 b812dc26e6135cd69df9ef3b9049509be9888e012394af3c496b03666e80c63f4c827916398d94f7499f73739ca70829108b60705d5b2329f3134dd695a029eb AUX qtwebengine-5.15.14_p20240510-re2.patch 915 BLAKE2B a29abbec923f78dd7baafdc36b42ed9e0467885ecc04349cbbcec6727628627e84e0172f01e24b34c231d437b75f992b7a173532695085773d899dc94085c66b SHA512 45af510bafc1c838fe273652813d4130ecdef30152f57506b5b6580131cdbcf510acc5ae7bb8d44ac90072c8be7d75b4e0c187240a6522e184db8a11a204f2fc AUX qtwebengine-5.15.2_p20210521-clang-libc++.patch 358 BLAKE2B a03de632ac4e01cf56c52af3a3bd5ff5bcfd525c67bf2e5d960904a9f3b53e1fa18f0e0df380c0cf84f17914fb313a028e26efaefe6ab5057f0d9a9cf2f6f0fd SHA512 6dc3864064d6084e70d4696fda744701c293ee62e9c9088e3247988ffb8085f30c632e94ac19aef715cbd211b21dfcb98691d5809e21cffd9f04bbb8b04cf0da -AUX qtwebengine-6.7.2-QTBUG-113574.patch 1696 BLAKE2B 10d4bca0527636a3934ccfdf6e52fca4ca369d07624c3b63377dc899a2f0313a936347d73dccf2f35d259f43c9c76bb7519b85339468b93b49862d3d5057f23b SHA512 bb2489a41da7b7a00fe58fee963b89e6ba8ece2c1a8f29e75169db7400a475473866c71bc78825875d007cac1e98175251b1f5fb4bdfbdd4318d32fc6f7871a2 -AUX qtwebengine-6.7.2-clang19.patch 3588 BLAKE2B f5accd76425b04c4cdc35b8e6917bc33a1e7977ca6465f14f2178078224f2c36c196c55241da3fdd880af77225ebb50b926bcc4cc2142fdb2f1e96802888db40 SHA512 6a4343558be1ada714d7cfa280e2ba4ef67afa179cbe71143ca577b263554d2d7d0fe9cafa7f6fdf6f234583edbc73cc1774c648beed6433fe1dd9e67c10b434 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-10.tar.xz 7940 BLAKE2B f3ed0e75731f29f37714ef7c0536f92a758bb1f204cf3b6aa3b9b32ab9baae27a7649d030bee5962964619692dd5888d089bf4437505d1c1c330cc4c05aca17e SHA512 db3a566a073daa34d678a06b51cf57e8818f2d42847dc9e606522040bbd3b75ae56fd41ce466880855cfdf558d680204dc5ccea8046749b18784e75aa12efe47 -DIST qtwebengine-6.8-patchset-2.tar.xz 7932 BLAKE2B 3642f619c66075e26703200818e833786a8686bf39258eee9bba95e234f79878f0b98680e8228a5b2cc39b02b0ecc36074ac96eb09f3bca145bb7aa9fd023310 SHA512 4a248d6e7bd052b5681a531fe503954aa519a8ed46cce2b3fafe8de603818f20e80a365e304f919817a6a0c12fdc517a0471f5c6dc499e648fd5405456c9fba3 +DIST qtwebengine-6.7-patchset-11.tar.xz 10004 BLAKE2B 10d96134cd02ca4665f72369817f55e2bf0eb209b5d7c4f6131cd3a1be193940c62f656a65081c77ac0dd7aa7bdda76d6ff3f994f8f6c815b249a33b797a10c2 SHA512 198f19d9e20f146878a6050cde435f4662c0d42a6ed21650bfadaab217b2e369284a1a11e5a01d096d3af3f0b34fe24f9bdc0195d37f7f74076b862503bb6c9f +DIST qtwebengine-6.7-patchset-12.tar.xz 9788 BLAKE2B 2465c43fe859ea6edbb1c14d82f9bd41e5bda5a32a9412e25a5eac385d2125d81e72a9f80f83b4c41da82b3fb96c31ad4603ad061077a927882d165ba5f3d7e4 SHA512 a50823e486106da69de7c6010cfdfd92d3312c574d00616ae83fe54de187ea3bd6d41310a9a3951c876432542ddea23a8391580beddf1b096fdf7c7dbab37e72 +DIST qtwebengine-6.8-patchset-3.tar.xz 9260 BLAKE2B 6d4e0bcc24ecc16ce92f6d4483268e81f0d9a9cb2a351a46cd93b9103a6cedd478f3004a67380f364523db9c7c152eb4b5cb39046edaf52b223490e32d9022a2 SHA512 10982a896e61b18153fd8b38431cfba6956dacda2efd3d08d89e9617a2c1fb2d1286d32213b50ccc25046bf539862b3ba4379824526e021a5e793df986888881 DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7 EBUILD qtwebengine-5.15.14_p20240510.ebuild 7758 BLAKE2B f1c2e30680f12164b8a1a55ecaecc6b7a786cd173ae3500825c7ef04ebd53bd579d2c74a7648ff65c3c302a0f2955313814e0fd1223d564fde76ff7e0039d6d5 SHA512 37591ca47d0df49df995be8af07da94f32ee3d5e03bf9acf987b9966092e48e481d8fac5c3af920265a4736e95f8200be24cf75683e577ef135249555ad6efa1 -EBUILD qtwebengine-6.7.2.ebuild 10423 BLAKE2B e1b9cbdd423c8b35ce079c646f923c56280c9c1f358d0d2caf50fa19e4a2f8dd4cd5c52d0957910ba3c721b7afbf81a90fd2f1930639aaf3e35462cbefccec8a SHA512 5366e44559d199e683de05f31e5447922bc85e6ea517ef1496b7f48bc031c3fb1de08121b6cc0a8afa5e9e356d5b8940745acc1fac9566bd9b48bd57242b4c59 -EBUILD qtwebengine-6.7.9999.ebuild 10425 BLAKE2B 0ecdd1a54222d3f145eada8799cb28a08973a474e2a674dae40fe7d73638cc65d7e81232ccda07b41cf54cbf0aaa023f7c685971da32aadcdb2153bf333b3e12 SHA512 c254dbbe9e8571fba122040fe5c08ca75ab927cf815e152b7dd17b2760a4f391700ac54875fb04d9b8230d8683e66e4af1ea236d4bee4f6c05df12991a1c2649 -EBUILD qtwebengine-6.8.9999.ebuild 10378 BLAKE2B c8dee36fb78c59a308c862e4a8c40b1cd5494db374bdf79afe7c282d5ed9ecf152b12cc14ba59e5e9134e18c8b9dc18eaa712850606ca7421ff94e26d2c3f63e SHA512 bfdc7fc7838283690bcb5b10640760827f504f0da67aabcd63291d8aa1496752523a85ab2b065be66540d01a8085dc478f8c67b550bbd1ca5338076e263f09a1 -EBUILD qtwebengine-6.9999.ebuild 10337 BLAKE2B dd9842294ee9618e5cb73bdb3f1b6f9ea98220cbc45317fac6aaa622b15f8d29ef3c768f2ddea2d57122cc7f206474d02bb3a50cb4f0cea2710011ed00c7086b SHA512 d535577cf79ea4b4586a0fa60c0f16989e753d21b580b66a67a21582cbc0c4715a3a05f46823f6c9d45dd2d0db016392c8ce24695202422fe01332dd00406c4a +EBUILD qtwebengine-6.7.2.ebuild 10336 BLAKE2B 1345fddaace77254f82ea205e093032f8667b6b0ff4614c15393d34cc5100c035e13103a7edf4a705c5d0e442e0a0d14a6b2c302b7bef93ca45ea0c2d12e90fc SHA512 635c6cab34d3b3bfd17a3773697146b72a5530a856027a11d52b8eba2bfbddf662bfae6197720acd4783c75a4e59d005ccf3dda12fbdcc8975814854a2398827 +EBUILD qtwebengine-6.7.9999.ebuild 10338 BLAKE2B f79388ad31417f6e45945dfa2a70f94e79de202d6e67dc389cb149da43ba503eb017ae00928f0bfcd8ff4701e1d019d22e8b8359130439de69f8eee1a2dae5c4 SHA512 56136d10466267629cbaff4c8884e8068ca2196a48a512b416dd3c180c0555c8effbfbf198c53ebc7411695792f699dbed23533a6ea8a9e44a06c4343f534b3b +EBUILD qtwebengine-6.8.9999.ebuild 10337 BLAKE2B 3ac9bb4b28f4882368bd264b121496064ae5cd43f7920100ff9d95219e29c94dfa34253890182f953a9f8c34f066b64e74087bc3753146bb5a78582cfe9be143 SHA512 ad7d17e8b97e7b60953b5290113719118fd133f777de0af8292238ccb9668383746aba2a00456d69401af3236d74de03725b3982f70e2d2450b3dd89cba8be72 +EBUILD qtwebengine-6.9999.ebuild 10337 BLAKE2B 3ac9bb4b28f4882368bd264b121496064ae5cd43f7920100ff9d95219e29c94dfa34253890182f953a9f8c34f066b64e74087bc3753146bb5a78582cfe9be143 SHA512 ad7d17e8b97e7b60953b5290113719118fd133f777de0af8292238ccb9668383746aba2a00456d69401af3236d74de03725b3982f70e2d2450b3dd89cba8be72 MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.2-QTBUG-113574.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.2-QTBUG-113574.patch deleted file mode 100644 index d8a9158c8a01..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-6.7.2-QTBUG-113574.patch +++ /dev/null @@ -1,41 +0,0 @@ -Backport of [1] from 6.8/6.9 for [2]. - -[1] https://codereview.qt-project.org/c/qt/qtwebengine/+/569910 -[2] https://bugreports.qt.io/browse/QTBUG-113574 - -From 21a9add47def34322b799683e1e1daff88dc4a06 Mon Sep 17 00:00:00 2001 -From: David Edmundson <davidedmundson@kde.org> -Date: Wed, 19 Jun 2024 10:37:45 +0100 -Subject: [PATCH] Use device pixel ratio of the window rather than the screen - -Window device pixel ratio can differ from the screen depending on the -platform. The window is the more authorative source with new events in -Qt to support that. - -In Chromium the rendering is still based off a screen factor, but each -view will have a completely independent set of screen variables, so we -can adjust the screen to match our current view. - -Chromium itself also alters the screen scale factor on a per window -basis for their own native Wayland backend or if recording a window. ---- a/src/core/render_widget_host_view_qt.cpp -+++ b/src/core/render_widget_host_view_qt.cpp -@@ -875,4 +875,9 @@ - - display::ScreenInfos newScreenInfos = screenInfosFromQtForUpdate(window->screen()); -+ -+ // We always want to use the scale from our current window -+ // This screen information is stored on a per-view basis -+ auto &screen = newScreenInfos.mutable_current(); -+ screen.device_scale_factor = window->devicePixelRatio(); - if (screen_infos_ == newScreenInfos) - return false; ---- a/src/core/render_widget_host_view_qt_delegate_item.cpp -+++ b/src/core/render_widget_host_view_qt_delegate_item.cpp -@@ -346,4 +346,6 @@ - onHide(); - } -+ } else if (change == QQuickItem::ItemDevicePixelRatioHasChanged) { -+ m_client->visualPropertiesChanged(); - } - } diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.2-clang19.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.2-clang19.patch deleted file mode 100644 index 3951fa56605a..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-6.7.2-clang19.patch +++ /dev/null @@ -1,76 +0,0 @@ -Patch status: fixed in >=chromium-127.0.6524.0 - -https://bugs.gentoo.org/937541 -https://github.com/google/perfetto/commit/e2f661907a717551235563389977b7468da6d45e -https://android-review.googlesource.com/c/platform/external/perfetto/+/3114454 -https://chromium-review.googlesource.com/c/chromium/src/+/5604664 ---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/hash_table.h -+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/hash_table.h -@@ -1647,5 +1647,5 @@ - } - table_ = temporary_table; -- Allocator::template BackingWriteBarrier(&table_); -+ Allocator::BackingWriteBarrier(&table_); - - HashTableBucketInitializer<Traits, Allocator, Value>::InitializeTable( -@@ -1701,5 +1701,5 @@ - // the current table has to be atomic to prevent races with concurrent marker. - AsAtomicPtr(&table_)->store(new_hash_table.table_, std::memory_order_relaxed); -- Allocator::template BackingWriteBarrier(&table_); -+ Allocator::BackingWriteBarrier(&table_); - table_size_ = new_table_size; - -@@ -1853,6 +1853,6 @@ - // there is *no* risk of data races when reading. - AtomicWriteSwap(table_, other.table_); -- Allocator::template BackingWriteBarrier(&table_); -- Allocator::template BackingWriteBarrier(&other.table_); -+ Allocator::BackingWriteBarrier(&table_); -+ Allocator::BackingWriteBarrier(&other.table_); - if (IsWeak<ValueType>::value) { - // Weak processing is omitted when no backing store is present. In case such ---- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/tracing/internal/track_event_data_source.h -+++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/tracing/internal/track_event_data_source.h -@@ -329,5 +329,5 @@ - - static void Flush() { -- Base::template Trace([](typename Base::TraceContext ctx) { ctx.Flush(); }); -+ Base::Trace([](typename Base::TraceContext ctx) { ctx.Flush(); }); - } - -@@ -335,6 +335,5 @@ - static bool IsEnabled() { - bool enabled = false; -- Base::template CallIfEnabled( -- [&](uint32_t /*instances*/) { enabled = true; }); -+ Base::CallIfEnabled([&](uint32_t /*instances*/) { enabled = true; }); - return enabled; - } -@@ -350,5 +349,5 @@ - const DynamicCategory& dynamic_category) { - bool enabled = false; -- Base::template Trace([&](typename Base::TraceContext ctx) { -+ Base::Trace([&](typename Base::TraceContext ctx) { - enabled = enabled || IsDynamicCategoryEnabled(&ctx, dynamic_category); - }); -@@ -497,5 +496,5 @@ - PERFETTO_DCHECK(track.uuid == desc.uuid()); - TrackRegistry::Get()->UpdateTrack(track, desc.SerializeAsString()); -- Base::template Trace([&](typename Base::TraceContext ctx) { -+ Base::Trace([&](typename Base::TraceContext ctx) { - TrackEventInternal::WriteTrackDescriptor( - track, ctx.tls_inst_->trace_writer.get(), ctx.GetIncrementalState(), -@@ -1048,5 +1047,5 @@ - using CatTraits = CategoryTraits<CategoryType>; - if (CatTraits::kIsDynamic) { -- Base::template TraceWithInstances(instances, std::move(lambda)); -+ Base::TraceWithInstances(instances, std::move(lambda)); - } else { - Base::template TraceWithInstances<CategoryTracePointTraits>( -@@ -1062,5 +1061,5 @@ - std::function<void(protos::pbzero::TrackDescriptor*)> callback) { - TrackRegistry::Get()->UpdateTrack(track, std::move(callback)); -- Base::template Trace([&](typename Base::TraceContext ctx) { -+ Base::Trace([&](typename Base::TraceContext ctx) { - TrackEventInternal::WriteTrackDescriptor( - track, ctx.tls_inst_->trace_writer.get(), ctx.GetIncrementalState(), diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild index 652140a1537f..a18dca6881d4 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.2.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.7-patchset-10.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-11.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -110,8 +110,6 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions - "${FILESDIR}"/${PN}-6.7.2-QTBUG-113574.patch - "${FILESDIR}"/${PN}-6.7.2-clang19.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild index 084612a1d845..4315b3198309 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.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.7-patchset-10.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-12.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -110,8 +110,6 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions - "${FILESDIR}"/${PN}-6.7.2-QTBUG-113574.patch - "${FILESDIR}"/${PN}-6.7.2-clang19.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild index 894e87964faf..937f5ca9c883 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.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.8-patchset-2.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-3.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -110,7 +110,6 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions - "${FILESDIR}"/${PN}-6.7.2-clang19.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index 66f2a52045b6..937f5ca9c883 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.8-patchset-2.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-3.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then |