From b2175c0c1575b3d2cf6a72185c3bbf099bd87982 Mon Sep 17 00:00:00 2001 From: Quentin Retornaz Date: Mon, 22 Jan 2024 22:42:59 +0100 Subject: [PATCH] www-client/ungoogled-chromium: 120.0.6099.224 Bug: #287 Signed-off-by: Quentin Retornaz --- www-client/ungoogled-chromium/Manifest | 2 + .../files/chromium-120-libstdc++.patch | 549 ++++++ ...ngoogled-chromium-120.0.6099.224_p1.ebuild | 1648 +++++++++++++++++ 3 files changed, 2199 insertions(+) create mode 100644 www-client/ungoogled-chromium/files/chromium-120-libstdc++.patch create mode 100644 www-client/ungoogled-chromium/ungoogled-chromium-120.0.6099.224_p1.ebuild diff --git a/www-client/ungoogled-chromium/Manifest b/www-client/ungoogled-chromium/Manifest index 417c1e413..92beb4313 100644 --- a/www-client/ungoogled-chromium/Manifest +++ b/www-client/ungoogled-chromium/Manifest @@ -1,4 +1,5 @@ DIST chromium-119.0.6045.199.tar.xz 3324886804 BLAKE2B 49ca40a8c7d3ebe685f3784de48df2f04caa424615af41b3f7ec3eee446a0b8ae5c1e3b54f983017a1d7a923e4d86a80425e404898e051eda75c93988c2a6ef9 SHA512 4f7607e1c2d1f1aa3095a56ed18aff118db1ecfdbb2fd18ad097877f2fe58415bd2f6f528a1039d63297f676c4ff53287632181fa882a44012304d3abee0937d +DIST chromium-120.0.6099.224.tar.xz 3299542904 BLAKE2B 70c7ab27796f00e18f3c90565ef8b9d8a3daa8c2637f71a207cb95ecdcaf47f95ffed6e51c249595d2af1c3c17bebdba249ba7861b866580c316fad6e1935340 SHA512 64a91dd3683b2b3b982c1a12ba6cb946b32a6dd0d76040036892061fa1d3e889fd61253fd7e05847e3076715e4ab9e7e5f6ff3764bec68c1486c1873d534fb52 DIST chromium-120.0.6099.62.tar.xz 3282639264 BLAKE2B 1ae0c228936d5a9d64f83a9734fe4ffc33ce5428c16c0dd1fa74d690a0bb10d22c8ab2812eda3dfd2831fb5c98dfe2c4397ae978a744d427af87a1549965a331 SHA512 1b57b60e2c8f14ba5d96580a9a4ab43ed5471c7a9b865cf49bfb1c524a3ed3d93cfd9f53d95e9830162d29644d8306b42ed6c2f3c0f05881b82e24e4b89a6330 DIST chromium-patches-119-3.tar.bz2 8345 BLAKE2B 70b10a231a71ce8ffc5e4f52450113c46f921a9f08eb95d4adbea0738cfab33fba763c54997a7ef6f36e35df850409062a330eeb8535679b800672de5697ca21 SHA512 a1897ea92a9a686bdf93c4ec379ed1c4c5febe1bdaba908ddb2ec0169d8e08b076d2a6ea1e88dd2d0a22dc4972dbfcbab2d3166e95e55ed9c566235e301a6050 DIST chromium-patches-120.tar.bz2 8630 BLAKE2B aa815521d027036757e5316478c2974e107185662d4c6a200bc7f448558730a3cb11e0a6e28d6a48ff60379813eed10d91c04917002228cf97c8448423cc0994 SHA512 1af05a17c54ea2f23b6f18b40c21304a94076eda4f9dcdf34ff93e1a729ae5a6b69816d32b5855b1cbb412eefaefb3d343fce05afd99347dcf9302a1d47ad3e6 @@ -7,3 +8,4 @@ DIST chromium_118.0.5993.70-1raptor0~deb11u1.debian.tar.xz 1677024 BLAKE2B 82cdb DIST cromite-dcbb3d0a3ba13fc2dcf1538fb5bdd2071c66234b.tar.gz 15333850 BLAKE2B 282afea4385ffd284187e2bbcc901174efd7b6e05076b2fa70446a480285b6968b09676fbb611e1128ea034780e8d98306fd5127bd17d0cac51695d3090b46e7 SHA512 37a711a255aae63384b43dc1c4f60612f7c35156fcc1b4d16334dc43f274c77d7a5a4b416e3cccbe279aff775122b05064aa7e41b752bb98c6b9bfc3bba72da0 DIST ungoogled-chromium-0d41e31bb75e6171a36f4797d3719fe7a99ceae7.tar.gz 665361 BLAKE2B 08b6e07f68fd0ffc56a163d7b7da3667a5069e8f29af05d0f314ece7a4043895308aa708b225a07c043423e3b9ef0cc998005d193122ab1a8f4e64760e38bec7 SHA512 a5c511c9c4a050202ab2b0a8e5fd4793da88dfabbaa3038a8f3ffd487ec3af307743a550e899a02716a76cc7ba1aaaf1cbf13b183154267100e3d0e41835c2df DIST ungoogled-chromium-119.0.6045.199-1.tar.gz 660433 BLAKE2B 3461195e2af7d8d05d3f6fec5047d30beeec4183169a11cec406c3e82ca4ff63a6b5b0068d996f3c310692b0197fa3ef6d8be14c4accfc51d0cbfd7c708ae74b SHA512 a4bfe96dd38f544af26d27a56ff9a4ac55fcc8029f098c627d00a5f0960d73163d82af17ae470042a92d3d8daa939402210061cf4edbfa94d444cc29055e3b0a +DIST ungoogled-chromium-df372661ba3de7ac563c12227f9ec6e6fe221d84.tar.gz 665918 BLAKE2B 2706e4e34adfe70058f0f98ad6e1c47fb252f8e251f522101ceaf58e90ec8b9ee7b4fb7c26e0e20de9a3828b7d9111d6b290ff1d4b7888835984e9fa02ad1603 SHA512 5fb2186812e42011776944dc5bbbac79027ff977a643efe6238d5744d3e02af9108e76d7dfbb25382febf45913a49f6ee0ef5eaa2a8cefddbd5f62fa37fd797b diff --git a/www-client/ungoogled-chromium/files/chromium-120-libstdc++.patch b/www-client/ungoogled-chromium/files/chromium-120-libstdc++.patch new file mode 100644 index 000000000..fcf8e2b97 --- /dev/null +++ b/www-client/ungoogled-chromium/files/chromium-120-libstdc++.patch @@ -0,0 +1,549 @@ +diff -r -u chromium-120.0.6099.129old/chrome/browser/ui/web_applications/diagnostics/web_app_icon_diagnostic.cc chromium-120.0.6099.129/chrome/browser/ui/web_applications/diagnostics/web_app_icon_diagnostic.cc +--- chromium-120.0.6099.129old/chrome/browser/ui/web_applications/diagnostics/web_app_icon_diagnostic.cc 2023-12-21 01:48:57.497598400 +0100 ++++ chromium-120.0.6099.129/chrome/browser/ui/web_applications/diagnostics/web_app_icon_diagnostic.cc 2023-12-21 18:25:13.975084961 +0100 +@@ -37,7 +37,7 @@ + if (!downloaded_icon_sizes.empty()) + icon_size_ = *downloaded_icon_sizes.begin(); + +- result_.emplace(); ++ result_.emplace(web_app::WebAppIconDiagnostic::Result{}); + result_->has_empty_downloaded_icon_sizes = downloaded_icon_sizes.empty(); + result_->has_generated_icon_flag = app_->is_generated_icon(); + +diff -r -u chromium-120.0.6099.129old/components/viz/service/display/surface_aggregator.cc chromium-120.0.6099.129/components/viz/service/display/surface_aggregator.cc +--- chromium-120.0.6099.129old/components/viz/service/display/surface_aggregator.cc 2023-12-21 01:49:05.646315300 +0100 ++++ chromium-120.0.6099.129/components/viz/service/display/surface_aggregator.cc 2023-12-21 15:28:15.668850824 +0100 +@@ -2228,7 +2228,7 @@ + root_surface_id_ = surface_id; + + // Start recording new stats for this aggregation. +- stats_.emplace(); ++ stats_.emplace(AggregateStatistics{}); + + base::ElapsedTimer prewalk_timer; + ResolvedFrameData* resolved_frame = GetResolvedFrame(surface_id); +diff -r -u chromium-120.0.6099.129old/gpu/command_buffer/service/shared_image/shared_image_backing.cc chromium-120.0.6099.129/gpu/command_buffer/service/shared_image/shared_image_backing.cc +--- chromium-120.0.6099.129old/gpu/command_buffer/service/shared_image/shared_image_backing.cc 2023-12-21 01:49:08.186538700 +0100 ++++ chromium-120.0.6099.129/gpu/command_buffer/service/shared_image/shared_image_backing.cc 2023-12-21 15:59:04.210747172 +0100 +@@ -343,7 +343,7 @@ + + void SharedImageBacking::OnWriteSucceeded() { + AutoLock auto_lock(this); +- scoped_write_uma_.emplace(); ++ scoped_write_uma_.emplace(gpu::SharedImageBacking::ScopedWriteUMA{}); + } + + size_t SharedImageBacking::GetEstimatedSize() const { +diff -r -u chromium-120.0.6099.129old/gpu/command_buffer/service/shared_image/shared_image_backing.h chromium-120.0.6099.129/gpu/command_buffer/service/shared_image/shared_image_backing.h +--- chromium-120.0.6099.129old/gpu/command_buffer/service/shared_image/shared_image_backing.h 2023-12-21 01:49:08.186538700 +0100 ++++ chromium-120.0.6099.129/gpu/command_buffer/service/shared_image/shared_image_backing.h 2023-12-21 15:57:27.336515319 +0100 +@@ -340,8 +340,8 @@ + public: + ScopedWriteUMA() = default; + +- ScopedWriteUMA(const ScopedWriteUMA&) = delete; +- ScopedWriteUMA& operator=(const ScopedWriteUMA&) = delete; ++ ScopedWriteUMA(const ScopedWriteUMA&) = default; ++ ScopedWriteUMA& operator=(const ScopedWriteUMA&) = default; + + ~ScopedWriteUMA() { + UMA_HISTOGRAM_BOOLEAN("GPU.SharedImage.ContentConsumed", +diff -r -u chromium-120.0.6099.129old/mojo/public/cpp/bindings/lib/multiplex_router.cc chromium-120.0.6099.129/mojo/public/cpp/bindings/lib/multiplex_router.cc +--- chromium-120.0.6099.129old/mojo/public/cpp/bindings/lib/multiplex_router.cc 2023-12-21 01:49:10.754764600 +0100 ++++ chromium-120.0.6099.129/mojo/public/cpp/bindings/lib/multiplex_router.cc 2023-12-21 13:19:27.412481231 +0100 +@@ -870,7 +870,7 @@ + DCHECK(!exclusive_sync_wait_); + + scoped_refptr keep_alive(this); +- exclusive_sync_wait_.emplace(); ++ exclusive_sync_wait_.emplace(ExclusiveSyncWaitInfo{}); + exclusive_sync_wait_->interface_id = interface_id; + exclusive_sync_wait_->request_id = request_id; + while (!exclusive_sync_wait_->finished) { +Only in chromium-120.0.6099.129old: out +diff -r -u chromium-120.0.6099.129old/third_party/blink/renderer/core/loader/history_item.cc chromium-120.0.6099.129/third_party/blink/renderer/core/loader/history_item.cc +--- chromium-120.0.6099.129old/third_party/blink/renderer/core/loader/history_item.cc 2023-12-21 01:49:14.663108300 +0100 ++++ chromium-120.0.6099.129/third_party/blink/renderer/core/loader/history_item.cc 2023-12-21 20:42:57.958387030 +0100 +@@ -182,26 +182,26 @@ + + void HistoryItem::SetVisualViewportScrollOffset(const ScrollOffset& offset) { + if (!view_state_) +- view_state_ = absl::make_optional(); ++ view_state_.emplace(blink::HistoryItem::ViewState{}); + view_state_->visual_viewport_scroll_offset_ = offset; + } + + void HistoryItem::SetScrollOffset(const ScrollOffset& offset) { + if (!view_state_) +- view_state_ = absl::make_optional(); ++ view_state_.emplace(blink::HistoryItem::ViewState{}); + view_state_->scroll_offset_ = offset; + } + + void HistoryItem::SetPageScaleFactor(float scale_factor) { + if (!view_state_) +- view_state_ = absl::make_optional(); ++ view_state_.emplace(blink::HistoryItem::ViewState{}); + view_state_->page_scale_factor_ = scale_factor; + } + + void HistoryItem::SetScrollAnchorData( + const ScrollAnchorData& scroll_anchor_data) { + if (!view_state_) +- view_state_ = absl::make_optional(); ++ view_state_.emplace(blink::HistoryItem::ViewState{}); + view_state_->scroll_anchor_data_ = scroll_anchor_data; + } + +diff -r -u chromium-120.0.6099.129old/third_party/blink/renderer/core/paint/fragment_data_iterator.h chromium-120.0.6099.129/third_party/blink/renderer/core/paint/fragment_data_iterator.h +--- chromium-120.0.6099.129old/third_party/blink/renderer/core/paint/fragment_data_iterator.h 2023-12-21 01:49:14.711112500 +0100 ++++ chromium-120.0.6099.129/third_party/blink/renderer/core/paint/fragment_data_iterator.h 2023-12-21 20:29:18.456481304 +0100 +@@ -21,7 +21,7 @@ + + public: + explicit FragmentDataIteratorBase(Head& head) : fragment_head_(head) {} +- explicit FragmentDataIteratorBase(nullptr_t) {} ++ explicit FragmentDataIteratorBase(std::nullptr_t) {} + + Data* GetFragmentData() const { + return !IsDone() ? &fragment_head_.at(idx_) : nullptr; +diff -r -u chromium-120.0.6099.129old/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc chromium-120.0.6099.129/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc +--- chromium-120.0.6099.129old/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc 2023-12-21 01:49:15.027140400 +0100 ++++ chromium-120.0.6099.129/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc 2023-12-21 21:10:26.330108830 +0100 +@@ -101,7 +101,7 @@ + void MediaControlTimelineElement::SetPosition(double current_time, + bool suppress_aria) { + if (is_live_ && !live_anchor_time_ && current_time != 0) { +- live_anchor_time_.emplace(); ++ live_anchor_time_.emplace(LiveAnchorTime{}); + live_anchor_time_->clock_time_ = base::TimeTicks::Now(); + live_anchor_time_->media_time_ = MediaElement().currentTime(); + } +diff -r -u chromium-120.0.6099.129old/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.cc chromium-120.0.6099.129/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.cc +--- chromium-120.0.6099.129old/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.cc 2023-12-21 01:49:15.351168900 +0100 ++++ chromium-120.0.6099.129/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.cc 2023-12-21 21:37:22.972189479 +0100 +@@ -70,7 +70,7 @@ + to_2d_translation_root_ += translation; + + if (parent.plane_root_transform_) { +- plane_root_transform_.emplace(); ++ plane_root_transform_.emplace(PlaneRootTransform{}); + plane_root_transform_->plane_root = parent.plane_root(); + plane_root_transform_->to_plane_root = parent.to_plane_root(); + plane_root_transform_->to_plane_root.Translate(translation.x(), +@@ -98,7 +98,7 @@ + // as the 2d translation root. + plane_root_transform_ = absl::nullopt; + } else { +- plane_root_transform_.emplace(); ++ plane_root_transform_.emplace(PlaneRootTransform{}); + plane_root_transform_->plane_root = parent.plane_root(); + plane_root_transform_->to_plane_root.MakeIdentity(); + parent.ApplyToPlaneRoot(plane_root_transform_->to_plane_root); +@@ -140,7 +140,7 @@ + parent_node->UpdateScreenTransform(); + const auto& parent = parent_node->GetTransformCache(); + +- screen_transform_.emplace(); ++ screen_transform_.emplace(ScreenTransform{}); + parent.ApplyToScreen(screen_transform_->to_screen); + if (node.FlattensInheritedTransform()) + screen_transform_->to_screen.Flatten(); +diff -r -u chromium-120.0.6099.129old/third_party/webrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc chromium-120.0.6099.129/third_party/webrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc +--- chromium-120.0.6099.129old/third_party/webrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc 2023-12-21 01:50:33.282024000 +0100 ++++ chromium-120.0.6099.129/third_party/webrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc 2023-12-21 12:58:14.181419565 +0100 +@@ -508,7 +508,7 @@ + if (!enabled.Get()) { + return config; + } +- config.emplace(); ++ config.emplace(Config{}); + config->bandwidth_rampup_upper_bound_factor = + bandwidth_rampup_upper_bound_factor.Get(); + config->rampup_acceleration_max_factor = rampup_acceleration_max_factor.Get(); +diff -r -u chromium-120.0.6099.129old/ui/gfx/x/generated_protos/randr.cc chromium-120.0.6099.129/ui/gfx/x/generated_protos/randr.cc +--- chromium-120.0.6099.129old/ui/gfx/x/generated_protos/randr.cc 2023-12-21 01:49:42.901592300 +0100 ++++ chromium-120.0.6099.129/ui/gfx/x/generated_protos/randr.cc 2023-12-21 13:34:10.540992483 +0100 +@@ -304,7 +304,7 @@ + // data + auto data_expr = subCode; + if (CaseEq(data_expr, RandR::Notify::CrtcChange)) { +- data.cc.emplace(); ++ data.cc.emplace(RandR::NotifyEvent::Cc{}); + auto& timestamp = (*data.cc).timestamp; + auto& window = (*data.cc).window; + auto& crtc = (*data.cc).crtc; +@@ -348,7 +348,7 @@ + Read(&height, &buf); + } + if (CaseEq(data_expr, RandR::Notify::OutputChange)) { +- data.oc.emplace(); ++ data.oc.emplace(RandR::NotifyEvent::Oc{}); + auto& timestamp = (*data.oc).timestamp; + auto& config_timestamp = (*data.oc).config_timestamp; + auto& window = (*data.oc).window; +@@ -393,7 +393,7 @@ + subpixel_order = static_cast(tmp6); + } + if (CaseEq(data_expr, RandR::Notify::OutputProperty)) { +- data.op.emplace(); ++ data.op.emplace(RandR::NotifyEvent::Op{}); + auto& window = (*data.op).window; + auto& output = (*data.op).output; + auto& atom = (*data.op).atom; +@@ -421,7 +421,7 @@ + Pad(&buf, 11); + } + if (CaseEq(data_expr, RandR::Notify::ProviderChange)) { +- data.pc.emplace(); ++ data.pc.emplace(RandR::NotifyEvent::Pc{}); + auto& timestamp = (*data.pc).timestamp; + auto& window = (*data.pc).window; + auto& provider = (*data.pc).provider; +@@ -439,7 +439,7 @@ + Pad(&buf, 16); + } + if (CaseEq(data_expr, RandR::Notify::ProviderProperty)) { +- data.pp.emplace(); ++ data.pp.emplace(RandR::NotifyEvent::Pp{}); + auto& window = (*data.pp).window; + auto& provider = (*data.pp).provider; + auto& atom = (*data.pp).atom; +@@ -465,7 +465,7 @@ + Pad(&buf, 11); + } + if (CaseEq(data_expr, RandR::Notify::ResourceChange)) { +- data.rc.emplace(); ++ data.rc.emplace(RandR::NotifyEvent::Rc{}); + auto& timestamp = (*data.rc).timestamp; + auto& window = (*data.rc).window; + +@@ -479,7 +479,7 @@ + Pad(&buf, 20); + } + if (CaseEq(data_expr, RandR::Notify::Lease)) { +- data.lc.emplace(); ++ data.lc.emplace(RandR::NotifyEvent::Lc{}); + auto& timestamp = (*data.lc).timestamp; + auto& window = (*data.lc).window; + auto& lease = (*data.lc).lease; +diff -r -u chromium-120.0.6099.129old/ui/gfx/x/generated_protos/xinput.cc chromium-120.0.6099.129/ui/gfx/x/generated_protos/xinput.cc +--- chromium-120.0.6099.129old/ui/gfx/x/generated_protos/xinput.cc 2023-12-21 01:49:42.905592700 +0100 ++++ chromium-120.0.6099.129/ui/gfx/x/generated_protos/xinput.cc 2023-12-21 16:46:52.355006508 +0100 +@@ -566,7 +566,7 @@ + // data + auto data_expr = type; + if (CaseEq(data_expr, Input::DeviceClassType::Key)) { +- data.key.emplace(); ++ data.key.emplace(Input::DeviceClass::Key()); + uint16_t num_keys{}; + auto& keys = (*data.key).keys; + size_t keys_len = keys.size(); +@@ -582,7 +582,7 @@ + } + } + if (CaseEq(data_expr, Input::DeviceClassType::Button)) { +- data.button.emplace(); ++ data.button.emplace(Input::DeviceClass::Button{}); + uint16_t num_buttons{}; + auto& state = (*data.button).state; + size_t state_len = state.size(); +@@ -607,7 +607,7 @@ + } + } + if (CaseEq(data_expr, Input::DeviceClassType::Valuator)) { +- data.valuator.emplace(); ++ data.valuator.emplace(Input::DeviceClass::Valuator{}); + auto& number = (*data.valuator).number; + auto& label = (*data.valuator).label; + auto& min = (*data.valuator).min; +@@ -670,7 +670,7 @@ + Pad(&buf, 3); + } + if (CaseEq(data_expr, Input::DeviceClassType::Scroll)) { +- data.scroll.emplace(); ++ data.scroll.emplace(Input::DeviceClass::Scroll{}); + auto& number = (*data.scroll).number; + auto& scroll_type = (*data.scroll).scroll_type; + auto& flags = (*data.scroll).flags; +@@ -705,7 +705,7 @@ + } + } + if (CaseEq(data_expr, Input::DeviceClassType::Touch)) { +- data.touch.emplace(); ++ data.touch.emplace(Input::DeviceClass::Touch{}); + auto& mode = (*data.touch).mode; + auto& num_touches = (*data.touch).num_touches; + +@@ -718,7 +718,7 @@ + Read(&num_touches, &buf); + } + if (CaseEq(data_expr, Input::DeviceClassType::Gesture)) { +- data.gesture.emplace(); ++ data.gesture.emplace(Input::DeviceClass::Gesture{}); + auto& num_touches = (*data.gesture).num_touches; + + // num_touches +@@ -2205,7 +2205,7 @@ + // info + auto info_expr = class_id; + if (CaseEq(info_expr, Input::InputClass::Key)) { +- info.key.emplace(); ++ info.key.emplace(Input::InputInfo::Key{}); + auto& min_keycode = (*info.key).min_keycode; + auto& max_keycode = (*info.key).max_keycode; + auto& num_keys = (*info.key).num_keys; +@@ -2223,14 +2223,14 @@ + Pad(&buf, 2); + } + if (CaseEq(info_expr, Input::InputClass::Button)) { +- info.button.emplace(); ++ info.button.emplace(Input::InputInfo::Button{}); + auto& num_buttons = (*info.button).num_buttons; + + // num_buttons + Read(&num_buttons, &buf); + } + if (CaseEq(info_expr, Input::InputClass::Valuator)) { +- info.valuator.emplace(); ++ info.valuator.emplace(Input::InputInfo::Valuator{}); + uint8_t axes_len{}; + auto& mode = (*info.valuator).mode; + auto& motion_size = (*info.valuator).motion_size; +@@ -3843,7 +3843,7 @@ + // data + auto data_expr = class_id; + if (CaseEq(data_expr, Input::FeedbackClass::Keyboard)) { +- data.keyboard.emplace(); ++ data.keyboard.emplace(x11::Input::FeedbackState::Keyboard{}); + auto& pitch = (*data.keyboard).pitch; + auto& duration = (*data.keyboard).duration; + auto& led_mask = (*data.keyboard).led_mask; +@@ -3885,7 +3885,7 @@ + } + } + if (CaseEq(data_expr, Input::FeedbackClass::Pointer)) { +- data.pointer.emplace(); ++ data.pointer.emplace(x11::Input::FeedbackState::Pointer{}); + auto& accel_num = (*data.pointer).accel_num; + auto& accel_denom = (*data.pointer).accel_denom; + auto& threshold = (*data.pointer).threshold; +@@ -3903,7 +3903,7 @@ + Read(&threshold, &buf); + } + if (CaseEq(data_expr, Input::FeedbackClass::String)) { +- data.string.emplace(); ++ data.string.emplace(x11::Input::FeedbackState::String{}); + auto& max_symbols = (*data.string).max_symbols; + uint16_t num_keysyms{}; + auto& keysyms = (*data.string).keysyms; +@@ -3923,7 +3923,7 @@ + } + } + if (CaseEq(data_expr, Input::FeedbackClass::Integer)) { +- data.integer.emplace(); ++ data.integer.emplace(x11::Input::FeedbackState::Integer{}); + auto& resolution = (*data.integer).resolution; + auto& min_value = (*data.integer).min_value; + auto& max_value = (*data.integer).max_value; +@@ -3938,7 +3938,7 @@ + Read(&max_value, &buf); + } + if (CaseEq(data_expr, Input::FeedbackClass::Led)) { +- data.led.emplace(); ++ data.led.emplace(x11::Input::FeedbackState::Led{}); + auto& led_mask = (*data.led).led_mask; + auto& led_values = (*data.led).led_values; + +@@ -3949,7 +3949,7 @@ + Read(&led_values, &buf); + } + if (CaseEq(data_expr, Input::FeedbackClass::Bell)) { +- data.bell.emplace(); ++ data.bell.emplace(x11::Input::FeedbackState::Bell{}); + auto& percent = (*data.bell).percent; + auto& pitch = (*data.bell).pitch; + auto& duration = (*data.bell).duration; +@@ -4769,7 +4769,7 @@ + // data + auto data_expr = class_id; + if (CaseEq(data_expr, Input::InputClass::Key)) { +- data.key.emplace(); ++ data.key.emplace(x11::Input::InputState::Key{}); + auto& num_keys = (*data.key).num_keys; + auto& keys = (*data.key).keys; + size_t keys_len = keys.size(); +@@ -4787,7 +4787,7 @@ + } + } + if (CaseEq(data_expr, Input::InputClass::Button)) { +- data.button.emplace(); ++ data.button.emplace(x11::Input::InputState::Button{}); + auto& num_buttons = (*data.button).num_buttons; + auto& buttons = (*data.button).buttons; + size_t buttons_len = buttons.size(); +@@ -4805,7 +4805,7 @@ + } + } + if (CaseEq(data_expr, Input::InputClass::Valuator)) { +- data.valuator.emplace(); ++ data.valuator.emplace(x11::Input::InputState::Valuator{}); + uint8_t num_valuators{}; + auto& mode = (*data.valuator).mode; + auto& valuators = (*data.valuator).valuators; +@@ -5076,7 +5076,7 @@ + // data + auto data_expr = control_id; + if (CaseEq(data_expr, Input::DeviceControl::resolution)) { +- data.resolution.emplace(); ++ data.resolution.emplace(x11::Input::DeviceState::Resolution{}); + uint32_t num_valuators{}; + auto& resolution_values = (*data.resolution).resolution_values; + size_t resolution_values_len = resolution_values.size(); +@@ -5110,7 +5110,7 @@ + } + } + if (CaseEq(data_expr, Input::DeviceControl::abs_calib)) { +- data.abs_calib.emplace(); ++ data.abs_calib.emplace(x11::Input::DeviceState::AbsCalib{}); + auto& min_x = (*data.abs_calib).min_x; + auto& max_x = (*data.abs_calib).max_x; + auto& min_y = (*data.abs_calib).min_y; +@@ -5145,7 +5145,7 @@ + Read(&button_threshold, &buf); + } + if (CaseEq(data_expr, Input::DeviceControl::core)) { +- data.core.emplace(); ++ data.core.emplace(x11::Input::DeviceState::Core{}); + auto& status = (*data.core).status; + auto& iscore = (*data.core).iscore; + +@@ -5159,7 +5159,7 @@ + Pad(&buf, 2); + } + if (CaseEq(data_expr, Input::DeviceControl::enable)) { +- data.enable.emplace(); ++ data.enable.emplace(x11::Input::DeviceState::Enable{}); + auto& enable = (*data.enable).enable; + + // enable +@@ -5169,7 +5169,7 @@ + Pad(&buf, 3); + } + if (CaseEq(data_expr, Input::DeviceControl::abs_area)) { +- data.abs_area.emplace(); ++ data.abs_area.emplace(x11::Input::DeviceState::AbsArea{}); + auto& offset_x = (*data.abs_area).offset_x; + auto& offset_y = (*data.abs_area).offset_y; + auto& width = (*data.abs_area).width; +@@ -6661,7 +6661,7 @@ + // data + auto data_expr = type; + if (CaseEq(data_expr, Input::DeviceClassType::Key)) { +- data.key.emplace(); ++ data.key.emplace(x11::Input::DeviceClass::Key{}); + uint16_t num_keys{}; + auto& keys = (*data.key).keys; + size_t keys_len = keys.size(); +@@ -6677,7 +6677,7 @@ + } + } + if (CaseEq(data_expr, Input::DeviceClassType::Button)) { +- data.button.emplace(); ++ data.button.emplace(x11::Input::DeviceClass::Button{}); + uint16_t num_buttons{}; + auto& state = (*data.button).state; + size_t state_len = state.size(); +@@ -6702,7 +6702,7 @@ + } + } + if (CaseEq(data_expr, Input::DeviceClassType::Valuator)) { +- data.valuator.emplace(); ++ data.valuator.emplace(x11::Input::DeviceClass::Valuator{}); + auto& number = (*data.valuator).number; + auto& label = (*data.valuator).label; + auto& min = (*data.valuator).min; +@@ -6765,7 +6765,7 @@ + Pad(&buf, 3); + } + if (CaseEq(data_expr, Input::DeviceClassType::Scroll)) { +- data.scroll.emplace(); ++ data.scroll.emplace(x11::Input::DeviceClass::Scroll{}); + auto& number = (*data.scroll).number; + auto& scroll_type = (*data.scroll).scroll_type; + auto& flags = (*data.scroll).flags; +@@ -6800,7 +6800,7 @@ + } + } + if (CaseEq(data_expr, Input::DeviceClassType::Touch)) { +- data.touch.emplace(); ++ data.touch.emplace(x11::Input::DeviceClass::Touch{}); + auto& mode = (*data.touch).mode; + auto& num_touches = (*data.touch).num_touches; + +@@ -6813,7 +6813,7 @@ + Read(&num_touches, &buf); + } + if (CaseEq(data_expr, Input::DeviceClassType::Gesture)) { +- data.gesture.emplace(); ++ data.gesture.emplace(x11::Input::DeviceClass::Gesture{}); + auto& num_touches = (*data.gesture).num_touches; + + // num_touches +diff -r -u chromium-120.0.6099.129old/ui/gfx/x/generated_protos/xkb.cc chromium-120.0.6099.129/ui/gfx/x/generated_protos/xkb.cc +--- chromium-120.0.6099.129old/ui/gfx/x/generated_protos/xkb.cc 2023-12-21 01:49:42.905592700 +0100 ++++ chromium-120.0.6099.129/ui/gfx/x/generated_protos/xkb.cc 2023-12-21 14:20:44.946209813 +0100 +@@ -2345,7 +2345,7 @@ + // map + auto map_expr = present; + if (CaseAnd(map_expr, Xkb::MapPart::KeyTypes)) { +- map.types_rtrn.emplace(); ++ map.types_rtrn.emplace(std::vector{}); + auto& types_rtrn = *map.types_rtrn; + size_t types_rtrn_len = types_rtrn.size(); + +@@ -5284,7 +5284,7 @@ + if (CaseAnd(replies_expr, Xkb::GBNDetail::Types) || + CaseAnd(replies_expr, Xkb::GBNDetail::ClientSymbols) || + CaseAnd(replies_expr, Xkb::GBNDetail::ServerSymbols)) { +- replies.types.emplace(); ++ replies.types.emplace(Xkb::GetKbdByNameReply::Types{}); + auto& getmap_type = (*replies.types).getmap_type; + auto& typeDeviceID = (*replies.types).typeDeviceID; + auto& getmap_sequence = (*replies.types).getmap_sequence; +@@ -5716,7 +5716,7 @@ + } + } + if (CaseAnd(replies_expr, Xkb::GBNDetail::CompatMap)) { +- replies.compat_map.emplace(); ++ replies.compat_map.emplace(Xkb::GetKbdByNameReply::CompatMap{}); + auto& compatmap_type = (*replies.compat_map).compatmap_type; + auto& compatDeviceID = (*replies.compat_map).compatDeviceID; + auto& compatmap_sequence = (*replies.compat_map).compatmap_sequence; +@@ -5840,7 +5840,7 @@ + } + } + if (CaseAnd(replies_expr, Xkb::GBNDetail::IndicatorMaps)) { +- replies.indicator_maps.emplace(); ++ replies.indicator_maps.emplace(Xkb::GetKbdByNameReply::IndicatorMaps{}); + auto& indicatormap_type = (*replies.indicator_maps).indicatormap_type; + auto& indicatorDeviceID = (*replies.indicator_maps).indicatorDeviceID; + auto& indicatormap_sequence = +@@ -5934,7 +5934,7 @@ + } + if (CaseAnd(replies_expr, Xkb::GBNDetail::KeyNames) || + CaseAnd(replies_expr, Xkb::GBNDetail::OtherNames)) { +- replies.key_names.emplace(); ++ replies.key_names.emplace(Xkb::GetKbdByNameReply::KeyNames{}); + auto& keyname_type = (*replies.key_names).keyname_type; + auto& keyDeviceID = (*replies.key_names).keyDeviceID; + auto& keyname_sequence = (*replies.key_names).keyname_sequence; +@@ -6193,7 +6193,7 @@ + } + } + if (CaseAnd(replies_expr, Xkb::GBNDetail::Geometry)) { +- replies.geometry.emplace(); ++ replies.geometry.emplace(Xkb::GetKbdByNameReply::Geometry{}); + auto& geometry_type = (*replies.geometry).geometry_type; + auto& geometryDeviceID = (*replies.geometry).geometryDeviceID; + auto& geometry_sequence = (*replies.geometry).geometry_sequence; diff --git a/www-client/ungoogled-chromium/ungoogled-chromium-120.0.6099.224_p1.ebuild b/www-client/ungoogled-chromium/ungoogled-chromium-120.0.6099.224_p1.ebuild new file mode 100644 index 000000000..e99d396d3 --- /dev/null +++ b/www-client/ungoogled-chromium/ungoogled-chromium-120.0.6099.224_p1.ebuild @@ -0,0 +1,1648 @@ +# Copyright 2009-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="xml(+)" + +CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he + hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr + sv sw ta te th tr uk ur vi zh-CN zh-TW" + +inherit check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils +inherit python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs xdg-utils + +# Use following environment variables to customise the build +# EXTRA_GN — pass extra options to gn +# NINJAOPTS="-k0 -j8" useful to populate ccache even if ebuild is still failing +# UGC_SKIP_PATCHES — space-separated list of patches to skip +# UGC_KEEP_BINARIES — space-separated list of binaries to keep +# UGC_SKIP_SUBSTITUTION — space-separated list of files to skip domain substitution + +DESCRIPTION="Modifications to Chromium for removing Google integration and enhancing privacy" +HOMEPAGE="https://github.com/ungoogled-software/ungoogled-chromium" +PATCHSET_PPC64="118.0.5993.70-1raptor0~deb11u1" +PATCH_V="${PV%%\.*}" +SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV/_*}.tar.xz + https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2 + ppc64? ( + https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_${PATCHSET_PPC64}.debian.tar.xz + https://deps.gentoo.zip/chromium-ppc64le-gentoo-patches-1.tar.xz + ) +" + +LICENSE="BSD uazo-bromite? ( GPL-3 )" +SLOT="0" +# KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE_SYSTEM_LIBS="abseil-cpp av1 brotli crc32c double-conversion ffmpeg +harfbuzz +icu +jsoncpp +libevent +libusb libvpx +openh264 openjpeg +png re2 +snappy woff2 +zstd" +IUSE="+X bluetooth cfi +clang convert-dict cups cpu_flags_arm_neon custom-cflags debug enable-driver gtk4 hangouts headless hevc kerberos nvidia +official optimize-thinlto optimize-webui override-data-dir pax-kernel pgo +proprietary-codecs pulseaudio qt5 qt6 screencast selinux thinlto uazo-bromite vaapi wayland widevine" +RESTRICT=" + !system-ffmpeg? ( proprietary-codecs? ( bindist ) ) + !system-openh264? ( bindist ) + uazo-bromite? ( bindist ) +" +REQUIRED_USE=" + thinlto? ( clang ) + optimize-thinlto? ( thinlto ) + cfi? ( thinlto ) + pgo? ( clang ) + x86? ( !thinlto !widevine ) + screencast? ( wayland ) + !headless? ( || ( X wayland ) ) + !proprietary-codecs? ( !hevc ) + hevc? ( system-ffmpeg ) + vaapi? ( !system-av1 !system-libvpx ) + qt6? ( qt5 ) +" + +UGC_COMMIT_ID="df372661ba3de7ac563c12227f9ec6e6fe221d84" +# UGC_PR_COMMITS=( +# c917e096342e5b90eeea91ab1f8516447c8756cf +# 5794e9d12bf82620d5f24505798fecb45ca5a22d +# ) + +UAZO_BROMITE_COMMIT_ID="dcbb3d0a3ba13fc2dcf1538fb5bdd2071c66234b" + +# CHROMIUM_COMMITS=( +# 5a8dfcaf84b5af5aeb738702651e98bfc43d6d45 +# ) + +UGC_PV="${PV/_p/-}" +UGC_PF="${PN}-${UGC_PV}" +UGC_URL="https://github.com/ungoogled-software/${PN}/archive/" + +if [ -z "$UGC_COMMIT_ID" ]; then + UGC_URL="${UGC_URL}${UGC_PV}.tar.gz -> ${UGC_PF}.tar.gz" + UGC_WD="${WORKDIR}/${UGC_PF}" +else + UGC_URL="${UGC_URL}${UGC_COMMIT_ID}.tar.gz -> ${PN}-${UGC_COMMIT_ID}.tar.gz" + UGC_WD="${WORKDIR}/ungoogled-chromium-${UGC_COMMIT_ID}" +fi + +SRC_URI+="${UGC_URL} +" + +if [ ! -z "${UGC_PR_COMMITS[*]}" ]; then + for i in "${UGC_PR_COMMITS[@]}"; do + SRC_URI+="https://github.com/ungoogled-software/${PN}/commit/$i.patch?full_index=true -> ${PN}-$i.patch + " + done +fi + +if [ ! -z "${CHROMIUM_COMMITS[*]}" ]; then + for i in "${CHROMIUM_COMMITS[@]}"; do + SRC_URI+="https://github.com/chromium/chromium/commit/${i/-}.patch?full_index=true -> chromium-${i/-}.patch + " + done +fi + +SRC_URI+="uazo-bromite? ( https://github.com/uazo/cromite/archive/${UAZO_BROMITE_COMMIT_ID}.tar.gz -> cromite-${UAZO_BROMITE_COMMIT_ID}.tar.gz ) +" + +for i in ${IUSE_SYSTEM_LIBS}; do + [[ $i =~ ^(\+)?(.*)$ ]] + IUSE+=" ${BASH_REMATCH[1]}system-${BASH_REMATCH[2]}" +done + +COMMON_X_DEPEND=" + x11-libs/libXcomposite:= + x11-libs/libXcursor:= + x11-libs/libXdamage:= + x11-libs/libXfixes:= + >=x11-libs/libXi-1.6.0:= + x11-libs/libXrandr:= + x11-libs/libXrender:= + x11-libs/libXtst:= + x11-libs/libxshmfence:= +" + +COMMON_SNAPSHOT_DEPEND=" + system-abseil-cpp? ( >=dev-cpp/abseil-cpp-20230125.2 ) + system-brotli? ( >=app-arch/brotli-9999 ) + system-crc32c? ( dev-libs/crc32c ) + system-double-conversion? ( dev-libs/double-conversion ) + system-woff2? ( media-libs/woff2 ) + system-snappy? ( app-arch/snappy ) + system-jsoncpp? ( dev-libs/jsoncpp ) + system-libevent? ( dev-libs/libevent ) + system-openjpeg? ( media-libs/openjpeg:2= ) + system-re2? ( >=dev-libs/re2-0.2019.08.01:= ) + system-libvpx? ( >=media-libs/libvpx-1.13.0:=[postproc] ) + system-libusb? ( virtual/libusb:1 ) + system-icu? ( >=dev-libs/icu-71.1:= ) + >=dev-libs/libxml2-2.9.4-r3:=[icu] + dev-libs/nspr:= + >=dev-libs/nss-3.26:= + dev-libs/libxslt:= + media-libs/fontconfig:= + >=media-libs/freetype-2.11.0-r1:= + system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) + media-libs/libjpeg-turbo:= + system-png? ( media-libs/libpng:= ) + system-zstd? ( >=app-arch/zstd-1.5.5:= ) + >=media-libs/libwebp-0.4.0:= + media-libs/mesa:=[gbm(+)] + >=media-libs/openh264-1.6.0:= + system-av1? ( + >=media-libs/dav1d-1.0.0:= + >=media-libs/libaom-3.7.0:= + ) + sys-libs/zlib:= + x11-libs/libdrm:= + !headless? ( + dev-libs/glib:2 + >=media-libs/alsa-lib-1.0.19:= + pulseaudio? ( + || ( + media-libs/libpulse + >=media-sound/apulse-0.1.9 + ) + ) + sys-apps/pciutils:= + kerberos? ( virtual/krb5 ) + vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) + X? ( + x11-libs/libX11:= + x11-libs/libXext:= + x11-libs/libxcb:= + ) + x11-libs/libxkbcommon:= + wayland? ( + dev-libs/libffi:= + screencast? ( media-video/pipewire:= ) + ) + ) +" + +COMMON_DEPEND=" + ${COMMON_SNAPSHOT_DEPEND} + app-arch/bzip2:= + dev-libs/expat:= + system-ffmpeg? ( + >=media-video/ffmpeg-4.3:= + || ( + media-video/ffmpeg[-samba] + >=net-fs/samba-4.5.10-r1[-debug(-)] + ) + >=media-libs/opus-1.3.1:= + ) + net-misc/curl[ssl] + sys-apps/dbus:= + media-libs/flac:= + sys-libs/zlib:=[minizip] + !headless? ( + X? ( ${COMMON_X_DEPEND} ) + >=app-accessibility/at-spi2-core-2.46.0:2 + media-libs/mesa:=[X?,wayland?] + cups? ( >=net-print/cups-1.3.11:= ) + virtual/udev + x11-libs/cairo:= + x11-libs/gdk-pixbuf:2 + x11-libs/pango:= + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtwidgets:5 + ) + qt6? ( dev-qt/qtbase:6[gui,widgets] ) + ) +" + +RDEPEND="${COMMON_DEPEND} + !headless? ( + || ( + x11-libs/gtk+:3[X?,wayland?] + gui-libs/gtk:4[X?,wayland?] + ) + qt5? ( dev-qt/qtgui:5[X?,wayland?] ) + qt6? ( dev-qt/qtbase:6[X?,wayland?] ) + ) + virtual/ttf-fonts + selinux? ( sec-policy/selinux-chromium ) + !override-data-dir? ( + !www-client/chromium + !www-client/chromium-bin + !www-client/ungoogled-chromium-bin + !www-client/cromite[-override-data-dir] + ) +" + +DEPEND="${COMMON_DEPEND} + !headless? ( + gtk4? ( gui-libs/gtk:4[X?,wayland?] ) + !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) + ) +" + +BDEPEND=" + ${COMMON_SNAPSHOT_DEPEND} + ${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + >=app-arch/gzip-1.7 + !headless? ( + qt5? ( dev-qt/qtcore:5 ) + qt6? ( dev-qt/qtbase:6 ) + ) + dev-lang/perl + >=dev-build/gn-0.2114 + >=dev-util/gperf-3.0.3 + >=dev-build/ninja-1.7.2 + dev-vcs/git + >=net-libs/nodejs-7.6.0[inspector] + >=sys-devel/bison-2.4.3 + sys-devel/flex + virtual/pkgconfig + clang? ( + pgo? ( >=sys-devel/clang-17 >=sys-devel/lld-17 ) + !pgo? ( sys-devel/clang sys-devel/lld ) + ) + cfi? ( sys-devel/clang-runtime[sanitize] ) +" + +if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then + EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; +fi + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS=" +Some web pages may require additional fonts to display properly. +Try installing some of the following packages if some characters +are not displayed properly: +- media-fonts/arphicfonts +- media-fonts/droid +- media-fonts/ipamonafont +- media-fonts/noto +- media-fonts/ja-ipafonts +- media-fonts/takao-fonts +- media-fonts/wqy-microhei +- media-fonts/wqy-zenhei + +To fix broken icons on the Downloads page, you should install an icon +theme that covers the appropriate MIME types, and configure this as your +GTK+ icon theme. + +For native file dialogs in KDE, install kde-apps/kdialog. + +To make password storage work with your desktop environment you may +have install one of the supported credentials management applications: +- app-crypt/libsecret (GNOME) +- kde-frameworks/kwallet (KDE) +If you have one of above packages installed, but don't want to use +them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS +in /etc/chromium/default. +" + +S="${WORKDIR}/chromium-${PV/_*}" + +python_check_deps() { + python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]" +} + +pre_build_checks() { + # Check build requirements: bugs #471810, #541816, #914220 + # We're going to start doing maths here on the size of an unpacked source tarball, + # this should make updates easier as chromium continues to balloon in size. + local BASE_DISK=18 + local EXTRA_DISK=1 + local CHECKREQS_MEMORY="4G" + tc-is-cross-compiler && EXTRA_DISK=2 + if use thinlto || use pgo; then + CHECKREQS_MEMORY="9G" + tc-is-cross-compiler && EXTRA_DISK=4 + use pgo && EXTRA_DISK=8 + fi + if is-flagq '-g?(gdb)?([1-9])'; then + if use custom-cflags; then + EXTRA_DISK=13 + fi + CHECKREQS_MEMORY="16G" + fi + CHECKREQS_DISK_BUILD="$((BASE_DISK + EXTRA_DISK))G" + check-reqs_${EBUILD_PHASE_FUNC} +} + +pkg_pretend() { + if has_version "sys-libs/libcxx"; then + ewarn + ewarn "You have sys-libs/libcxx, please be aware that system-*" + ewarn "and some other c++ dependencies need to be compiled" + ewarn "with the same library as ungoogled-chromium itself" + ewarn "dev-libs/jsoncpp is most problematic, see #58 #49 #119 for details" + ewarn + fi + if use cfi; then + ewarn + ewarn "Building with cfi is only possible if building with -stdlib=libc++" + ewarn "Make sure all dependencies are also built this way, see #40" + ewarn + fi + if use uazo-bromite; then + ewarn + ewarn "uazo-bromite patches are very experimental and unstable" + ewarn "Please consider testing them and giving feedback upstream:" + ewarn "https://github.com/uazo/cromite/issues" + ewarn "Not all patches are applied, let me know if any other are worthy of inclusion" + ewarn + fi + if use system-abseil-cpp; then + ewarn + ewarn "Chromium code is not very friendly to system abseil-cpp, see #218" + ewarn "If you know how to fix this, feel free to submit a PR" + ewarn + [[ -z "${NODIE}" ]] && die "The build will fail!" + fi + pre_build_checks + + if use headless; then + local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "qt6" "vaapi" "wayland") + for myiuse in ${headless_unused_flags[@]}; do + use ${myiuse} && ewarn "Ignoring USE=${myiuse} since USE=headless is set." + done + fi +} + +pkg_setup() { + pre_build_checks + + chromium_suid_sandbox_check_kernel_config +} + +src_prepare() { + # Calling this here supports resumption via FEATURES=keepwork + python_setup + + if ! use custom-cflags; then #See #25 #92 + sed -i '/default_stack_frames/Q' ${WORKDIR}/chromium-patches-${PATCH_V}/chromium-*-compiler.patch || die + fi + + # disable global media controls, crashes with libstdc++ + sed -i -e \ + "/\"GlobalMediaControlsCastStartStop\"/,+4{s/ENABLED/DISABLED/;}" \ + "chrome/browser/media/router/media_router_feature.cc" || die + + local PATCHES=( + "${WORKDIR}/chromium-patches-${PATCH_V}" + "${FILESDIR}/chromium-cross-compile.patch" + "${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch" + "${FILESDIR}/chromium-108-EnumTable-crash.patch" + "${FILESDIR}/chromium-109-system-openh264.patch" + "${FILESDIR}/chromium-109-system-zlib.patch" + "${FILESDIR}/chromium-111-InkDropHost-crash.patch" + "${FILESDIR}/perfetto-system-zlib.patch" + "${FILESDIR}/gtk-fix-prefers-color-scheme-query.diff" + "${FILESDIR}/restore-x86-r2.patch" + ) + + if [ ! -z "${CHROMIUM_COMMITS[*]}" ]; then + for i in "${CHROMIUM_COMMITS[@]}"; do + if [[ $i = -* ]]; then + eapply -R "${DISTDIR}/chromium-${i/-}.patch" || die + else + PATCHES+=( "${DISTDIR}/chromium-$i.patch" ) + fi + done + fi + + if use ppc64 ; then + local p + for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series | grep "^ppc64le" || die); do + if [[ ! $p =~ "fix-breakpad-compile.patch" ]]; then + eapply "${WORKDIR}/debian/patches/${p}" + fi + done + PATCHES+=( "${WORKDIR}/ppc64le" ) + fi + + if has_version ">=dev-libs/icu-74.1" && use system-icu ; then + PATCHES+=( "${FILESDIR}/chromium-119.0.6045.159-icu-74.patch" ) + fi + + default + + if use uazo-bromite ; then + BR_PA_PATH="${WORKDIR}/cromite-${UAZO_BROMITE_COMMIT_ID}/build/patches" + + #! conflicting patches + sed -i '/kMediaFoundationClearKeyCdmPathForTesting/,+8d' "${BR_PA_PATH}/00Disable-speechSynthesis-getVoices-API.patch" || die + + BROMITE_PATCHES=( + "${BR_PA_PATH}/Battery-API-return-nothing.patch" + "${BR_PA_PATH}/Multiple-fingerprinting-mitigations.patch" + "${BR_PA_PATH}/Add-flag-to-configure-maximum-connections-per-host.patch" + "${BR_PA_PATH}/Add-a-proxy-configuration-page.patch" + "${BR_PA_PATH}/Offer-builtin-autocomplete-for-chrome-flags.patch" + "${BR_PA_PATH}/Enable-StrictOriginIsolation-and-SitePerProcess.patch" + "${BR_PA_PATH}/Disable-requests-for-single-word-Omnibar-searches.patch" + "${BR_PA_PATH}/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch" + "${BR_PA_PATH}/Hardening-against-incognito-mode-detection.patch" + "${BR_PA_PATH}/Client-hints-overrides.patch" + "${BR_PA_PATH}/Disable-idle-detection.patch" + "${BR_PA_PATH}/Disable-TLS-resumption.patch" + "${BR_PA_PATH}/Remove-navigator.connection-info.patch" + + "${BR_PA_PATH}/AudioBuffer-AnalyserNode-fp-mitigations.patch" + "${BR_PA_PATH}/00Fonts-fingerprinting-mitigation.patch" + + "${BR_PA_PATH}/bromite-build-utils.patch" + "${BR_PA_PATH}/Content-settings-infrastructure.patch" + "${BR_PA_PATH}/Add-autoplay-site-setting.patch" + "${BR_PA_PATH}/Site-setting-for-images.patch" + "${BR_PA_PATH}/JIT-site-settings.patch" + "${BR_PA_PATH}/Add-webGL-site-setting.patch" + "${BR_PA_PATH}/Add-webRTC-site-settings.patch" + "${BR_PA_PATH}/Viewport-Protection-flag.patch" + "${BR_PA_PATH}/Viewport-Protection-Site-Setting.patch" + "${BR_PA_PATH}/Timezone-customization.patch" + "${BR_PA_PATH}/00Disable-speechSynthesis-getVoices-API.patch" + "${BR_PA_PATH}/00Remove-support-for-device-memory-and-cpu-recovery.patch" + "${BR_PA_PATH}/00Disable-Feeback-Collector.patch" + "${BR_PA_PATH}/00Disable-remote-altsvc-for-h3-connections.patch" + ) + for i in "${BROMITE_PATCHES[@]}"; do + if [[ "$i" =~ "Add-autoplay-site-setting.patch" ]] || + [[ "$i" =~ "JIT-site-settings.patch" ]] || + [[ "$i" =~ "Site-setting-for-images.patch" ]]; then + einfo "Git binary patch: ${i##*/}" + git apply -p1 < "$i" || die + else + # einfo "${i##*/}" + eapply "$i" + fi + done + fi + + mkdir -p third_party/node/linux/node-linux-x64/bin || die + ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die + + # adjust python interpreter version + sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die + + cp "${FILESDIR}/libusb.gn" build/linux/unbundle || die + sed -i '/^REPLACEMENTS.*$/{s++REPLACEMENTS = {"libusb":"third_party/libusb/BUILD.gn",+;h};${x;/./{x;q0};x;q1}' \ + build/linux/unbundle/replace_gn_files.py || die + sed -i '/^.*deps.*third_party\/jsoncpp.*$/{s++public_deps \+= [ "//third_party/jsoncpp" ]+;h};${x;/./{x;q0};x;q1}' \ + third_party/webrtc/rtc_base/BUILD.gn || die + + use bluetooth || eapply "${FILESDIR}/disable-bluez.patch" + + use convert-dict && eapply "${FILESDIR}/chromium-ucf-dict-utility.patch" + + if use hevc; then + sed -i '/^bool IsHevcProfileSupported(const VideoType& type) {$/{s++bool IsHevcProfileSupported(const VideoType\& type) { return true;+;h};${x;/./{x;q0};x;q1}' \ + media/base/supported_types.cc || die + fi + + if use override-data-dir; then + sed -i '/"chromium";/{s++"ungoogled-chromium";+;h};${x;/./{x;q0};x;q1}' \ + chrome/common/chrome_paths_linux.cc || die + fi + + if use system-abseil-cpp; then + eapply "${FILESDIR}/chromium-system-abseil.patch" + cp -f /usr/include/absl/base/options.h third_party/abseil-cpp/absl/base/options.h + sed -i '/^#define ABSL_OPTION_USE_STD_OPTIONAL.*$/{s++#define ABSL_OPTION_USE_STD_OPTIONAL 0+;h};${x;/./{x;q0};x;q1}' \ + third_party/abseil-cpp/absl/base/options.h || die + fi + + use system-brotli && eapply "${FILESDIR}/chromium-system-brotli.patch" + + use system-ffmpeg && eapply "${FILESDIR}/chromium-99-opus.patch" + + if use system-ffmpeg; then + if has_version "/dev/null + for i in "${UGC_PR_COMMITS[@]}"; do + eapply "${DISTDIR}/${PN}-$i.patch" + done + popd >/dev/null + fi + + # From here we adapt ungoogled-chromium's patches to our needs + local ugc_pruning_list="${UGC_WD}/pruning.list" + local ugc_patch_series="${UGC_WD}/patches/series" + local ugc_substitution_list="${UGC_WD}/domain_substitution.list" + + local ugc_unneeded=( + # GN bootstrap + extra/debian/gn/parallel + ) + + if use uazo-bromite ; then + einfo "Using bromite fingerprinting patches instead" + ugc_unneeded+=( + extra/bromite/fingerprinting-flags-client-rects-and-measuretext + extra/bromite/flag-max-connections-per-host + extra/bromite/flag-fingerprinting-canvas-image-data-noise + extra/ungoogled-chromium/add-components-ungoogled + ) + fi + + local ugc_p ugc_dir + for p in "${ugc_unneeded[@]}"; do + einfo "Removing ${p}.patch" + sed -i "\!${p}.patch!d" "${ugc_patch_series}" || die + done + + if [ ! -z "${UGC_SKIP_PATCHES}" ]; then + for p in ${UGC_SKIP_PATCHES}; do + ewarn "Removing ${p}" + sed -i "\!${p}!d" "${ugc_patch_series}" || die + done + fi + + if [ ! -z "${UGC_KEEP_BINARIES}" ]; then + for p in ${UGC_KEEP_BINARIES}; do + ewarn "Keeping binary ${p}" + sed -i "\!${p}!d" "${ugc_pruning_list}" || die + done + fi + + if [ ! -z "${UGC_SKIP_SUBSTITUTION}" ]; then + for p in ${UGC_SKIP_SUBSTITUTION}; do + ewarn "No substitutions in ${p}" + sed -i "\!${p}!d" "${ugc_substitution_list}" || die + done + fi + + ebegin "Pruning binaries" + "${UGC_WD}/utils/prune_binaries.py" -q . "${UGC_WD}/pruning.list" + eend $? || die + + ebegin "Applying ungoogled-chromium patches" + "${UGC_WD}/utils/patches.py" -q apply . "${UGC_WD}/patches" + eend $? || die + + ebegin "Applying domain substitution" + "${UGC_WD}/utils/domain_substitution.py" -q apply -r "${UGC_WD}/domain_regex.list" -f "${UGC_WD}/domain_substitution.list" . + eend $? || die + + local keeplibs=( + base/third_party/cityhash + ) + use system-double-conversion || keeplibs+=( + base/third_party/double_conversion + ) + keeplibs+=( + base/third_party/dynamic_annotations + base/third_party/icu + base/third_party/nspr + base/third_party/superfasthash + base/third_party/symbolize + base/third_party/valgrind + base/third_party/xdg_mime + base/third_party/xdg_user_dirs + buildtools/third_party/libc++ + buildtools/third_party/libc++abi + chrome/third_party/mozilla_security_manager + courgette/third_party + net/third_party/mozilla_security_manager + net/third_party/nss + net/third_party/quic + net/third_party/uri_template + third_party/abseil-cpp/absl/base + ) + use system-abseil-cpp || keeplibs+=( + third_party/abseil-cpp + ) + keeplibs+=( + third_party/angle + third_party/angle/src/common/third_party/xxhash + third_party/angle/src/third_party/ceval + ) + use nvidia || keeplibs+=( + third_party/angle/src/third_party/libXNVCtrl + ) + keeplibs+=( + third_party/angle/src/third_party/volk + third_party/anonymous_tokens + third_party/apple_apsl + third_party/axe-core + third_party/blink + third_party/bidimapper + third_party/boringssl + third_party/boringssl/src/third_party/fiat + third_party/breakpad + third_party/breakpad/breakpad/src/third_party/curl + ) + use system-brotli || keeplibs+=( + third_party/brotli + ) + keeplibs+=( + third_party/catapult + third_party/catapult/common/py_vulcanize/third_party/rcssmin + third_party/catapult/common/py_vulcanize/third_party/rjsmin + third_party/catapult/third_party/beautifulsoup4-4.9.3 + third_party/catapult/third_party/html5lib-1.1 + third_party/catapult/third_party/polymer + third_party/catapult/third_party/six + third_party/catapult/tracing/third_party/d3 + third_party/catapult/tracing/third_party/gl-matrix + third_party/catapult/tracing/third_party/jpeg-js + third_party/catapult/tracing/third_party/jszip + third_party/catapult/tracing/third_party/mannwhitneyu + third_party/catapult/tracing/third_party/oboe + third_party/catapult/tracing/third_party/pako + third_party/ced + third_party/cld_3 + third_party/closure_compiler + third_party/content_analysis_sdk + third_party/cpuinfo + third_party/crashpad + third_party/crashpad/crashpad/third_party/lss + third_party/crashpad/crashpad/third_party/zlib + ) + use system-crc32c || keeplibs+=( + third_party/crc32c + ) + keeplibs+=( + third_party/cros_system_api + third_party/d3 + third_party/dawn + third_party/dawn/third_party/gn/webgpu-cts + third_party/dawn/third_party/khronos + third_party/depot_tools + third_party/devscripts + third_party/devtools-frontend + third_party/devtools-frontend/src/front_end/third_party/acorn + third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json + third_party/devtools-frontend/src/front_end/third_party/axe-core + third_party/devtools-frontend/src/front_end/third_party/chromium + third_party/devtools-frontend/src/front_end/third_party/codemirror + third_party/devtools-frontend/src/front_end/third_party/csp_evaluator + third_party/devtools-frontend/src/front_end/third_party/diff + third_party/devtools-frontend/src/front_end/third_party/i18n + third_party/devtools-frontend/src/front_end/third_party/intl-messageformat + third_party/devtools-frontend/src/front_end/third_party/lighthouse + third_party/devtools-frontend/src/front_end/third_party/lit + third_party/devtools-frontend/src/front_end/third_party/lodash-isequal + third_party/devtools-frontend/src/front_end/third_party/marked + third_party/devtools-frontend/src/front_end/third_party/puppeteer + third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt + third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/rxjs + third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data + third_party/devtools-frontend/src/front_end/third_party/wasmparser + third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n + third_party/devtools-frontend/src/third_party + third_party/distributed_point_functions + third_party/dom_distiller_js + third_party/eigen3 + third_party/emoji-segmenter + third_party/farmhash + third_party/fdlibm + third_party/fft2d + third_party/flatbuffers + third_party/fp16 + third_party/freetype + third_party/fusejs + third_party/fxdiv + third_party/highway + third_party/liburlpattern + third_party/libzip + third_party/gemmlowp + third_party/google_input_tools + third_party/google_input_tools/third_party/closure_library + third_party/google_input_tools/third_party/closure_library/third_party/closure + third_party/googletest + third_party/hunspell + third_party/iccjpeg + third_party/inspector_protocol + third_party/ipcz + third_party/jinja2 + ) + use system-jsoncpp || keeplibs+=( + third_party/jsoncpp + ) + keeplibs+=( + third_party/jstemplate + third_party/khronos + third_party/leveldatabase + third_party/libaddressinput + third_party/libavif + ) + use system-libevent || keeplibs+=( + third_party/libevent + ) + keeplibs+=( + third_party/libgav1 + third_party/libjingle + third_party/libphonenumber + third_party/libsecret + third_party/libsrtp + third_party/libsync + third_party/libudev + ) + use system-libusb || keeplibs+=( + third_party/libusb + ) + keeplibs+=( + third_party/libva_protected_content + ) + use system-libvpx || keeplibs+=( + third_party/libvpx + third_party/libvpx/source/libvpx/third_party/x86inc + ) + keeplibs+=( + third_party/libwebm + third_party/libx11 + third_party/libxcb-keysyms + third_party/libxml/chromium + third_party/libyuv + third_party/llvm + third_party/lottie + third_party/lss + third_party/lzma_sdk + third_party/mako + third_party/maldoca + third_party/maldoca/src/third_party/tensorflow_protos + third_party/maldoca/src/third_party/zlibwrapper + third_party/markupsafe + third_party/material_color_utilities + third_party/mesa + third_party/metrics_proto + third_party/minigbm + third_party/modp_b64 + third_party/nasm + third_party/nearby + third_party/neon_2_sse + third_party/node + third_party/omnibox_proto + third_party/one_euro_filter + third_party/openscreen + third_party/openscreen/src/third_party/ + third_party/openscreen/src/third_party/tinycbor/src/src + third_party/ots + third_party/pdfium + third_party/pdfium/third_party/agg23 + third_party/pdfium/third_party/base + third_party/pdfium/third_party/bigint + third_party/pdfium/third_party/freetype + third_party/pdfium/third_party/lcms + ) + use system-openjpeg || keeplibs+=( + third_party/pdfium/third_party/libopenjpeg + ) + keeplibs+=( + third_party/pdfium/third_party/libtiff + third_party/perfetto + third_party/perfetto/protos/third_party/chromium + third_party/pffft + third_party/ply + third_party/polymer + third_party/private-join-and-compute + third_party/private_membership + third_party/protobuf + third_party/pthreadpool + third_party/puffin + third_party/pyjson5 + third_party/pyyaml + third_party/qcms + third_party/rnnoise + third_party/s2cellid + third_party/securemessage + third_party/selenium-atoms + third_party/shell-encryption + third_party/simplejson + third_party/skia + third_party/skia/include/third_party/vulkan + third_party/skia/third_party/vulkan + third_party/smhasher + ) + use system-snappy || keeplibs+=( + third_party/snappy + ) + keeplibs+=( + third_party/sqlite + third_party/swiftshader + third_party/swiftshader/third_party/astc-encoder + third_party/swiftshader/third_party/llvm-subzero + third_party/swiftshader/third_party/marl + third_party/swiftshader/third_party/subzero + third_party/swiftshader/third_party/SPIRV-Headers/include/spirv + third_party/swiftshader/third_party/SPIRV-Tools + third_party/tensorflow_models + third_party/tensorflow-text + third_party/tflite + third_party/tflite/src/third_party/eigen3 + third_party/tflite/src/third_party/fft2d + third_party/tflite/src/third_party/xla/third_party/tsl + third_party/ruy + third_party/six + third_party/ukey2 + third_party/utf + third_party/vulkan + third_party/wayland + third_party/webdriver + third_party/webgpu-cts + third_party/webrtc + third_party/webrtc/common_audio/third_party/ooura + third_party/webrtc/common_audio/third_party/spl_sqrt_floor + third_party/webrtc/modules/third_party/fft + third_party/webrtc/modules/third_party/g711 + third_party/webrtc/modules/third_party/g722 + third_party/webrtc/rtc_base/third_party/base64 + third_party/webrtc/rtc_base/third_party/sigslot + third_party/widevine + ) + use system-woff2 || keeplibs+=( + third_party/woff2 + ) + keeplibs+=( + third_party/wuffs + third_party/x11proto + third_party/xcbproto + third_party/xnnpack + third_party/zxcvbn-cpp + third_party/zlib/google + url/third_party/mozilla + v8/src/third_party/siphash + v8/src/third_party/valgrind + v8/src/third_party/utf8-decoder + v8/third_party/glibc + v8/third_party/inspector_protocol + v8/third_party/v8 + + # gyp -> gn leftovers + third_party/speech-dispatcher + third_party/usb_ids + third_party/xdg-utils + ) + if ! use system-harfbuzz; then + keeplibs+=( third_party/harfbuzz-ng ) + fi + if ! use system-ffmpeg; then + keeplibs+=( third_party/ffmpeg third_party/opus ) + fi + if ! use system-icu; then + keeplibs+=( third_party/icu ) + fi + if ! use system-png; then + keeplibs+=( third_party/libpng ) + fi + if ! use system-zstd; then + keeplibs+=( third_party/zstd ) + fi + if ! use system-av1; then + keeplibs+=( + third_party/dav1d + third_party/libaom + third_party/libaom/source/libaom/third_party/fastfeat + third_party/libaom/source/libaom/third_party/SVT-AV1 + third_party/libaom/source/libaom/third_party/vector + third_party/libaom/source/libaom/third_party/x86inc + ) + fi + if ! use system-openh264; then + keeplibs+=( third_party/openh264 ) + fi + if ! use system-re2; then + keeplibs+=( third_party/re2 ) + fi + if use arm64 || use ppc64 ; then + keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 ) + fi + if use uazo-bromite ; then + keeplibs+=( third_party/ungoogled ) + fi + # we need to generate ppc64 stuff because upstream does not ship it yet + # it has to be done before unbundling. + if use ppc64; then + pushd third_party/libvpx >/dev/null || die + mkdir -p source/config/linux/ppc64 || die + # requires git and clang, bug #832803 + sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g" \ + generate_gni.sh || die + ./generate_gni.sh || die + popd >/dev/null || die + + pushd third_party/ffmpeg >/dev/null || die + cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die + cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die + popd >/dev/null || die + fi + + ebegin "Removing bundled libraries" + # Remove most bundled libraries. Some are still needed. + build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove + eend $? || die + + # bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries + mkdir -p buildtools/third_party/eu-strip/bin || die + ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die + + ebegin "Fix compatibility with libstdc++" + eapply "${FILESDIR}/chromium-120-libstdc++.patch" +} + +src_configure() { + # Calling this here supports resumption via FEATURES=keepwork + python_setup + + local myconf_gn="" + + # Make sure the build system will use the right tools, bug #340795. + tc-export AR CC CXX NM + + if use clang && ! tc-is-clang ; then + einfo "Enforcing the use of clang due to USE=clang ..." + if tc-is-cross-compiler; then + CC="${CBUILD}-clang -target ${CHOST} --sysroot ${ESYSROOT}" + CXX="${CBUILD}-clang++ -target ${CHOST} --sysroot ${ESYSROOT}" + BUILD_CC=${CBUILD}-clang + BUILD_CXX=${CBUILD}-clang++ + else + CC=${CHOST}-clang + CXX=${CHOST}-clang++ + fi + strip-unsupported-flags + elif ! use clang && ! tc-is-gcc ; then + einfo "Enforcing the use of gcc due to USE=-clang ..." + CC=${CHOST}-gcc + CXX=${CHOST}-g++ + strip-unsupported-flags + fi + + if tc-is-clang; then + myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" + else + myconf_gn+=" is_clang=false" + fi + + # Force lld for lto or pgo builds only, otherwise disable, bug 641556 + if use thinlto || use pgo || use nvidia; then + myconf_gn+=" use_lld=true" + else + myconf_gn+=" use_lld=false" + fi + + if use thinlto || use pgo; then + AR=llvm-ar + NM=llvm-nm + if tc-is-cross-compiler; then + BUILD_AR=llvm-ar + BUILD_NM=llvm-nm + fi + fi + + # Define a custom toolchain for GN + myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" + + if tc-is-cross-compiler; then + tc-export BUILD_{AR,CC,CXX,NM} + myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\"" + myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\"" + myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\"" + myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\"" + + # setup cups-config, build system only uses --libs option + if use cups; then + mkdir "${T}/cups-config" || die + cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die + export PATH="${PATH}:${T}/cups-config" + fi + + # Don't inherit PKG_CONFIG_PATH from environment + local -x PKG_CONFIG_PATH= + else + myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\"" + fi + + # Disable rust for now; it's only used for testing and we don't need the additional bdep + myconf_gn+=" enable_rust=false" + + # GN needs explicit config for Debug/Release as opposed to inferring it from build directory. + myconf_gn+=" is_debug=$(usex debug true false)" + + # enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138. + # DCHECK is fatal by default, make it configurable at runtime, #bug 807881. + myconf_gn+=" dcheck_always_on=$(usex debug true false)" + myconf_gn+=" dcheck_is_configurable=$(usex debug true false)" + + myconf_gn+=" enable_iterator_debugging=$(usex debug true false)" + + if use debug; then + myconf_gn+=" symbol_level=2" + myconf_gn+=" blink_symbol_level=2" + myconf_gn+=" v8_symbol_level=2" + else + myconf_gn+=" symbol_level=0" + myconf_gn+=" blink_symbol_level=0" + myconf_gn+=" v8_symbol_level=0" + fi + + # Component build isn't generally intended for use by end users. It's mostly useful + # for development and debugging. + myconf_gn+=" is_component_build=false" + + # Disable nacl, we can't build without pnacl (http://crbug.com/269560). + myconf_gn+=" enable_nacl=false" + + local gn_system_libraries=( + flac + fontconfig + freetype + libdrm + libjpeg + libwebp + libxml + libxslt + zlib + ) + if use system-abseil-cpp; then + gn_system_libraries+=( + absl_algorithm + absl_base + absl_cleanup + absl_container + absl_debugging + absl_flags + absl_functional + absl_hash + absl_log + absl_log_internal + absl_memory + absl_meta + absl_numeric + absl_random + absl_status + absl_strings + absl_synchronization + absl_time + absl_types + absl_utility + ) + fi + if use system-brotli; then + gn_system_libraries+=( brotli ) + fi + if use system-crc32c; then + gn_system_libraries+=( crc32c ) + fi + if use system-double-conversion; then + gn_system_libraries+=( double-conversion ) + fi + if use system-woff2; then + gn_system_libraries+=( woff2 ) + fi + if use nvidia; then + gn_system_libraries+=( libXNVCtrl ) + fi + if use system-ffmpeg; then + gn_system_libraries+=( ffmpeg opus ) + fi + if use system-jsoncpp; then + gn_system_libraries+=( jsoncpp ) + fi + if use system-icu; then + gn_system_libraries+=( icu ) + fi + if use system-png; then + gn_system_libraries+=( libpng ) + myconf_gn+=" use_system_libpng=true" + fi + if use system-zstd; then + gn_system_libraries+=( zstd ) + fi + if use system-av1; then + gn_system_libraries+=( dav1d libaom ) + fi + if use system-libusb; then + gn_system_libraries+=( libusb ) + fi + if use system-libvpx; then + gn_system_libraries+=( libvpx ) + fi + if use system-libevent; then + gn_system_libraries+=( libevent ) + fi + use system-openh264 && gn_system_libraries+=( + openh264 + ) + use system-re2 && gn_system_libraries+=( + re2 + ) + use system-snappy && gn_system_libraries+=( + snappy + ) + build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die + + # See dependency logic in third_party/BUILD.gn + myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)" + + # Optional dependencies. + myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)" + myconf_gn+=" enable_widevine=$(usex widevine true false)" + + if use headless; then + myconf_gn+=" use_cups=false" + myconf_gn+=" use_kerberos=false" + myconf_gn+=" use_pulseaudio=false" + myconf_gn+=" use_vaapi=false" + myconf_gn+=" rtc_use_pipewire=false" + else + myconf_gn+=" use_cups=$(usex cups true false)" + myconf_gn+=" use_kerberos=$(usex kerberos true false)" + myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)" + myconf_gn+=" use_vaapi=$(usex vaapi true false)" + myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)" + myconf_gn+=" gtk_version=$(usex gtk4 4 3)" + fi + + # TODO: link_pulseaudio=true for GN. + + myconf_gn+=" disable_fieldtrial_testing_config=true" + + myconf_gn+=" use_bluez=$(usex bluetooth true false)" + + myconf_gn+=" is_cfi=$(usex cfi true false)" + + if use cfi; then + myconf_gn+=" use_cfi_icall=true" + myconf_gn+=" use_cfi_cast=true" + fi + + if use pgo; then + myconf_gn+=" chrome_pgo_phase=2" + myconf_gn+=" v8_enable_builtins_optimization=true" + else + myconf_gn+=" chrome_pgo_phase=0" + fi + + myconf_gn+=" optimize_webui=$(usex optimize-webui true false)" + myconf_gn+=" use_system_freetype=$(usex system-harfbuzz true false)" + myconf_gn+=" use_system_libopenjpeg2=$(usex system-openjpeg true false)" + myconf_gn+=" enable_pdf=true" + myconf_gn+=" use_system_lcms2=true" + myconf_gn+=" enable_print_preview=true" + myconf_gn+=" enable_platform_hevc=$(usex hevc true false)" + myconf_gn+=" enable_hevc_parser_and_hw_decoder=$(usex hevc true false)" + + # Ungoogled flags + myconf_gn+=" build_with_tflite_lib=false" + myconf_gn+=" enable_mdns=false" + myconf_gn+=" enable_mse_mpeg2ts_stream_parser=$(usex proprietary-codecs true false)" + myconf_gn+=" enable_reading_list=false" + myconf_gn+=" enable_remoting=false" + myconf_gn+=" enable_reporting=false" + myconf_gn+=" enable_service_discovery=false" + myconf_gn+=" exclude_unwind_tables=true" + myconf_gn+=" google_api_key=\"\"" + myconf_gn+=" google_default_client_id=\"\"" + myconf_gn+=" google_default_client_secret=\"\"" + myconf_gn+=" safe_browsing_mode=0" + myconf_gn+=" use_official_google_api_keys=false" + myconf_gn+=" use_unofficial_version_number=false" + + # myconf_gn+=" enable_swiftshader=false" + + # Additional flags + myconf_gn+=" perfetto_use_system_zlib=true" + myconf_gn+=" use_system_zlib=true" + myconf_gn+=" use_system_libjpeg=true" + myconf_gn+=" rtc_build_examples=false" + + # Never use bundled gold binary. Disable gold linker flags for now. + # Do not use bundled clang. + # Trying to use gold results in linker crash. + myconf_gn+=" use_gold=false use_sysroot=false use_custom_libcxx=false" + + # Disable pseudolocales, only used for testing + myconf_gn+=" enable_pseudolocales=false" + + # Disable code formating of generated files + myconf_gn+=" blink_enable_generated_code_formatting=false" + + ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" + myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)" + myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\"" + + local myarch="$(tc-arch)" + + # Avoid CFLAGS problems, bug #352457, bug #390147. + if ! use custom-cflags; then + filter-flags "-O*" "-Wl,-O*" #See #25 + strip-flags + + # Prevent linker from running out of address space, bug #471810 . + if use x86; then + filter-flags "-g*" + fi + + # Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646. + if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then + filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a + fi + + if tc-is-gcc; then + # https://bugs.gentoo.org/904455 + local -x CPP="$(tc-getCXX) -E" + local gcc_version="$(gcc-version)" + local need_gcc_fix=false + # Drop this complexity as gcc versions age out of ::gentoo + if ver_test "${gcc_version}" -lt 12.3; then + need_gcc_fix=true + elif ver_test "${gcc_version}" -ge 13 && ver_test "${gcc_version}" -lt 13.2; then + need_gcc_fix=true + fi + [[ ${need_gcc_fix} = true ]] && append-cxxflags "$(test-flags-CXX -fno-tree-vectorize)" + # https://bugs.gentoo.org/912381 + filter-lto + fi + fi + + if [[ $myarch = amd64 ]] ; then + myconf_gn+=" target_cpu=\"x64\"" + ffmpeg_target_arch=x64 + elif [[ $myarch = x86 ]] ; then + myconf_gn+=" target_cpu=\"x86\"" + ffmpeg_target_arch=ia32 + + # This is normally defined by compiler_cpu_abi in + # build/config/compiler/BUILD.gn, but we patch that part out. + append-flags -msse2 -mfpmath=sse -mmmx + elif [[ $myarch = arm64 ]] ; then + myconf_gn+=" target_cpu=\"arm64\"" + ffmpeg_target_arch=arm64 + elif [[ $myarch = arm ]] ; then + myconf_gn+=" target_cpu=\"arm\"" + ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm) + elif [[ $myarch = ppc64 ]] ; then + myconf_gn+=" target_cpu=\"ppc64\"" + ffmpeg_target_arch=ppc64 + else + die "Failed to determine target arch, got '$myarch'." + fi + + if use thinlto; then + # We need to change the default value of import-instr-limit in + # LLVM to limit the text size increase. The default value is + # 100, and we change it to 30 to reduce the text size increase + # from 25% to 10%. The performance number of page_cycler is the + # same on two of the thinLTO configurations, we got 1% slowdown + # on speedometer when changing import-instr-limit from 100 to 30. + # append-ldflags "-Wl,-plugin-opt,-import-instr-limit=30" + sed -i '/import_instr_limit = 5/{s++import_instr_limit = 30+;h};${x;/./{x;q0};x;q1}' \ + build/config/compiler/BUILD.gn || die + + append-ldflags "-Wl,--thinlto-jobs=$(makeopts_jobs)" + fi + + # Make sure that -Werror doesn't get added to CFLAGS by the build system. + # Depending on GCC version the warnings are different and we don't want + # the build to fail because of that. + myconf_gn+=" treat_warnings_as_errors=false" + + # Disable fatal linker warnings, bug 506268. + myconf_gn+=" fatal_linker_warnings=false" + + # Disable external code space for V8 for ppc64. It is disabled for ppc64 + # by default, but cross-compiling on amd64 enables it again. + if tc-is-cross-compiler; then + if ! use amd64 && ! use arm64; then + myconf_gn+=" v8_enable_external_code_space=false" + fi + fi + + # Only enabled for clang, but gcc has endian macros too + myconf_gn+=" v8_use_libm_trig_functions=true" + + # Bug 491582. + export TMPDIR="${WORKDIR}/temp" + mkdir -p -m 755 "${TMPDIR}" || die + + # https://bugs.gentoo.org/654216 + addpredict /dev/dri/ #nowarn + + # Disable unknown warning message from clang. + if tc-is-clang; then + append-flags -Wno-unknown-warning-option + if tc-is-cross-compiler; then + export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option" + export BUILD_CFLAGS+=" -Wno-unknown-warning-option" + fi + fi + + # Explicitly disable ICU data file support for system-icu/headless builds. + if use system-icu || use headless; then + myconf_gn+=" icu_use_data_file=false" + fi + + # Don't need nocompile checks and GN crashes with our config + myconf_gn+=" enable_nocompile_tests=false enable_nocompile_tests_new=false" + + # Enable ozone wayland and/or headless support + myconf_gn+=" use_ozone=true ozone_auto_platforms=false" + myconf_gn+=" ozone_platform_headless=true" + if use headless; then + myconf_gn+=" ozone_platform=\"headless\"" + myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false" + myconf_gn+=" use_glib=false use_gio=false" + myconf_gn+=" use_pangocairo=false use_alsa=false" + myconf_gn+=" use_libpci=false use_udev=false" + myconf_gn+=" enable_print_preview=false" + myconf_gn+=" enable_remoting=false" + else + myconf_gn+=" use_system_libdrm=true" + myconf_gn+=" use_system_minigbm=true" + myconf_gn+=" use_xkbcommon=true" + if use qt5 || use qt6; then + local cbuild_libdir=$(get_libdir) + if tc-is-cross-compiler; then + # Hack to workaround get_libdir not being able to handle CBUILD, bug #794181 + local cbuild_libdir=$($(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libxslt) + cbuild_libdir=${cbuild_libdir:2} + cbuild_libdir=${cbuild_libdir/% } + fi + if use qt5; then + if tc-is-cross-compiler; then + myconf_gn+=" moc_qt5_path=\"${EPREFIX}/${cbuild_libdir}/qt5/bin\"" + else + myconf_gn+=" moc_qt5_path=\"$(qt5_get_bindir)\"" + fi + fi + if use qt6; then + myconf_gn+=" moc_qt6_path=\"${EPREFIX}/usr/${cbuild_libdir}/qt6/libexec\"" + fi + + myconf_gn+=" use_qt=true" + myconf_gn+=" use_qt6=$(usex qt6 true false)" + else + myconf_gn+=" use_qt=false" + fi + myconf_gn+=" ozone_platform_x11=$(usex X true false)" + myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)" + myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")" + use wayland && myconf_gn+=" use_system_libffi=true" + fi + + # Results in undefined references in chrome linking, may require CFI to work + if use arm64; then + myconf_gn+=" arm_control_flow_integrity=\"none\"" + fi + + # Enable official builds + myconf_gn+=" is_official_build=$(usex official true false)" + myconf_gn+=" use_thin_lto=$(usex thinlto true false)" + myconf_gn+=" thin_lto_enable_optimizations=$(usex optimize-thinlto true false)" + if use official; then + # Allow building against system libraries in official builds + sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ + tools/generate_shim_headers/generate_shim_headers.py || die + else + myconf_gn+=" devtools_skip_typecheck=false" + fi + + # user CXXFLAGS might overwrite -march=armv8-a+crc+crypto, bug #851639 + if use arm64 && tc-is-gcc; then + sed -i '/^#if HAVE_ARM64_CRC32C/a #pragma GCC target ("+crc+crypto")' \ + third_party/crc32c/src/src/crc32c_arm64.cc || die + fi + + # skipping typecheck is only supported on amd64, bug #876157 + if ! use amd64; then + myconf_gn+=" devtools_skip_typecheck=false" + fi + + # Facilitate deterministic builds (taken from build/config/compiler/BUILD.gn) + append-cflags -Wno-builtin-macro-redefined + append-cxxflags -Wno-builtin-macro-redefined + append-cppflags "-D__DATE__= -D__TIME__= -D__TIMESTAMP__=" + + local flags + einfo "Building with the following compiler settings:" + for flags in C{C,XX} AR NM RANLIB {C,CXX,CPP,LD}FLAGS \ + EXTRA_GN UGC_{SKIP_{PATCHES,SUBSTITUTION},KEEP_BINARIES} ; do + einfo " ${flags} = \"${!flags}\"" + done + + einfo "Configuring Chromium ..." + set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release + echo "$@" + "$@" || die + + # The "if" below should not be executed unless testing + if [ ! -z "${NODIE}" ]; then + # List all args + # gn args --list out/Release + + # Quick compiler check + eninja -C out/Release protoc torque + fi +} + +src_compile() { + # Final link uses lots of file descriptors. + ulimit -n 2048 + + # Calling this here supports resumption via FEATURES=keepwork + python_setup + + # Don't inherit PYTHONPATH from environment, bug #789021, #812689 + local -x PYTHONPATH= + + use convert-dict && eninja -C out/Release convert_dict + + # Build mksnapshot and pax-mark it. + if use pax-kernel; then + local x + for x in mksnapshot v8_context_snapshot_generator; do + if tc-is-cross-compiler; then + eninja -C out/Release "host/${x}" + pax-mark m "out/Release/host/${x}" + else + eninja -C out/Release "${x}" + pax-mark m "out/Release/${x}" + fi + done + fi + + # Even though ninja autodetects number of CPUs, we respect + # user's options, for debugging with -j 1 or any other reason. + eninja -C out/Release chrome + + use enable-driver && eninja -C out/Release chromedriver + #use suid && eninja -C out/Release chrome_sandbox + + pax-mark m out/Release/chrome + + use enable-driver && mv out/Release/chromedriver{.unstripped,} + + rm -f out/Release/locales/*.pak.info || die + + # Build manpage; bug #684550 + sed -e 's|@@PACKAGE@@|chromium-browser|g; + s|@@MENUNAME@@|Chromium|g;' \ + chrome/app/resources/manpage.1.in > \ + out/Release/chromium-browser.1 || die + + # Build desktop file; bug #706786 + sed -e 's|@@MENUNAME@@|Chromium|g; + s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g; + s|@@PACKAGE@@|chromium-browser|g; + s|\(^Exec=\)/usr/bin/|\1|g;' \ + chrome/installer/linux/common/desktop.template > \ + out/Release/chromium-browser-chromium.desktop || die + + # Build vk_swiftshader_icd.json; bug #827861 + sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \ + third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \ + out/Release/vk_swiftshader_icd.json || die +} + +src_install() { + local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" + exeinto "${CHROMIUM_HOME}" + doexe out/Release/chrome + + if use convert-dict; then + newexe "${FILESDIR}/update-dicts.sh" update-dicts.sh + doexe out/Release/convert_dict + fi + + #if use suid; then + # newexe out/Release/chrome_sandbox chrome-sandbox + # fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" + #fi + + use enable-driver && doexe out/Release/chromedriver + #doexe out/Release/chrome_crashpad_handler + + ozone_auto_session () { + use X && use wayland && ! use headless && echo true || echo false + } + local sedargs=( -e + "s:/usr/lib/:/usr/$(get_libdir)/:g; + s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g" + ) + sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die + if has_version ">=media-sound/apulse-0.1.9" ; then + sed -i 's/exec -a "chromium-browser"/exec -a "chromium-browser" apulse/' chromium-launcher.sh || die + fi + doexe chromium-launcher.sh + + # It is important that we name the target "chromium-browser", + # xdg-utils expect it; bug #355517. + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser + # keep the old symlink around for consistency + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium + + use enable-driver && dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver + + # Allow users to override command-line options, bug #357629. + insinto /etc/chromium + newins "${FILESDIR}/chromium.default" "default" + + pushd out/Release/locales > /dev/null || die + chromium_remove_language_paks + popd + + insinto "${CHROMIUM_HOME}" + doins out/Release/*.bin + doins out/Release/*.pak + ( + shopt -s nullglob + local files=(out/Release/*.so out/Release/*.so.[0-9]) + [[ ${#files[@]} -gt 0 ]] && doins "${files[@]}" + ) + + # Install bundled xdg-utils, avoids installing X11 libraries with USE="-X wayland" + doins out/Release/xdg-{settings,mime} + + if ! use system-icu && ! use headless; then + doins out/Release/icudtl.dat + fi + + doins -r out/Release/locales + #doins -r out/Release/MEIPreload + + # Install vk_swiftshader_icd.json; bug #827861 + doins out/Release/vk_swiftshader_icd.json + + if [[ -d out/Release/swiftshader ]]; then + insinto "${CHROMIUM_HOME}/swiftshader" + doins out/Release/swiftshader/*.so + fi + + use widevine && dosym WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so /usr/$(get_libdir)/chromium-browser/libwidevinecdm.so + + # Install icons + local branding size + for size in 16 24 32 48 64 128 256 ; do + case ${size} in + 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; + *) branding="chrome/app/theme/chromium" ;; + esac + newicon -s ${size} "${branding}/product_logo_${size}.png" \ + chromium-browser.png + done + + # Install desktop entry + domenu out/Release/chromium-browser-chromium.desktop + + # Install GNOME default application entry (bug #303100). + insinto /usr/share/gnome-control-center/default-apps + newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml + + # Install manpage; bug #684550 + doman out/Release/chromium-browser.1 + dosym chromium-browser.1 /usr/share/man/man1/chromium.1 + + readme.gentoo_create_doc +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update + readme.gentoo_print_elog + + if ! use headless; then + if use vaapi; then + elog "VA-API is disabled by default at runtime. You have to enable it" + elog "by adding --enable-features=VaapiVideoDecoder and " + elog "--disable-features=UseChromeOSDirectVideoDecoder to CHROMIUM_FLAGS" + elog "in /etc/chromium/default." + fi + if use screencast; then + elog "Screencast is disabled by default at runtime. Either enable it" + elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer" + elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer" + elog "to CHROMIUM_FLAGS in /etc/chromium/default." + fi + if use gtk4; then + elog "Chromium prefers GTK3 over GTK4 at runtime. To override this" + elog "behaviour you need to pass --gtk-version=4, e.g. by adding it" + elog "to CHROMIUM_FLAGS in /etc/chromium/default." + fi + if use widevine; then + elog "widevine requires binary plugins, which are distributed separately" + elog "Make sure you have www-plugins/chrome-binary-plugins installed" + fi + if use qt5 && use qt6; then + elog "Chromium automatically selects Qt5 or Qt6 based on your desktop" + elog "environment. To override you need to pass --qt-version=5 or" + elog "--qt-version=6, e.g. by adding it to CHROMIUM_FLAGS in" + elog "/etc/chromium/default." + fi + fi +}