Skip to content

Commit

Permalink
www/ungoogled-chromium: update to 120.0.6099.129
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert Nagy authored and Robert Nagy committed Dec 23, 2023
1 parent 9a43e1f commit 2b72ddf
Show file tree
Hide file tree
Showing 362 changed files with 41,239 additions and 1,793 deletions.
3 changes: 1 addition & 2 deletions www/ungoogled-chromium/Makefile
@@ -1,6 +1,5 @@
PORTNAME= ungoogled-chromium
PORTVERSION= 119.0.6045.199
PORTREVISION= 1
PORTVERSION= 120.0.6099.129
UGVERSION= ${DISTVERSION}-1
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
Expand Down
14 changes: 7 additions & 7 deletions www/ungoogled-chromium/distinfo
@@ -1,9 +1,9 @@
TIMESTAMP = 1701295347
SHA256 (chromium-119.0.6045.199.tar.xz) = b1ae62beb7907d99802b74821d5198bd54a7456df1116d317da653bde8ce6388
SIZE (chromium-119.0.6045.199.tar.xz) = 3324886804
SHA256 (ungoogled-chromium-119.0.6045.199-1.tar.gz) = c9f8747c4e96d2d62b67909895606c546fa7986e184ce1d924a25ca1c11e69e8
SIZE (ungoogled-chromium-119.0.6045.199-1.tar.gz) = 660433
SHA256 (chromium-119.0.6045.199-testdata.tar.xz) = e71ca534121263aa89b2d91823aada57fa16e4ccf2cf61dadbba53c06f453757
SIZE (chromium-119.0.6045.199-testdata.tar.xz) = 271055096
TIMESTAMP = 1703336363
SHA256 (chromium-120.0.6099.129.tar.xz) = be36d5abecfafdc68d9b27b0bee65136316610a295e844b99483a7520b245f85
SIZE (chromium-120.0.6099.129.tar.xz) = 3283749920
SHA256 (ungoogled-chromium-120.0.6099.129-1.tar.gz) = 632265238aea25b1c0076e99b4de2f5e53bbafccbb89356d4586c4415dae6ff9
SIZE (ungoogled-chromium-120.0.6099.129-1.tar.gz) = 665271
SHA256 (chromium-120.0.6099.129-testdata.tar.xz) = 44d4507584fd340704dfd314bd9b651c3887e97835b5ca86bcb1dbe20665bed1
SIZE (chromium-120.0.6099.129-testdata.tar.xz) = 274371756
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
16 changes: 8 additions & 8 deletions www/ungoogled-chromium/files/patch-BUILD.gn
@@ -1,4 +1,4 @@
--- BUILD.gn.orig 2023-11-04 07:08:51 UTC
--- BUILD.gn.orig 2023-12-23 12:33:28 UTC
+++ BUILD.gn
@@ -61,7 +61,7 @@ declare_args() {
root_extra_deps = []
Expand All @@ -17,7 +17,7 @@
"//net:net_unittests",
"//sandbox:sandbox_unittests",
"//services:services_unittests",
@@ -417,7 +416,7 @@ group("gn_all") {
@@ -415,7 +414,7 @@ group("gn_all") {
}
}

Expand All @@ -26,7 +26,7 @@
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
@@ -609,6 +608,15 @@ group("gn_all") {
@@ -607,6 +606,15 @@ group("gn_all") {
}
}

Expand All @@ -42,7 +42,7 @@
if (is_mac) {
deps += [
"//third_party/breakpad:dump_syms",
@@ -658,7 +666,7 @@ group("gn_all") {
@@ -656,7 +664,7 @@ group("gn_all") {
host_os == "win") {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
Expand All @@ -51,7 +51,7 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}

@@ -1086,7 +1094,7 @@ if (use_blink && !is_cronet_build) {
@@ -1077,7 +1085,7 @@ if (use_blink && !is_cronet_build) {
]
}

Expand All @@ -60,7 +60,7 @@
script_test("chrome_wpt_tests") {
script = "//third_party/blink/tools/run_wpt_tests.py"
args = [
@@ -1159,7 +1167,7 @@ if (use_blink && !is_cronet_build) {
@@ -1150,7 +1158,7 @@ if (use_blink && !is_cronet_build) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}

Expand All @@ -69,7 +69,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
@@ -1168,7 +1176,7 @@ if (use_blink && !is_cronet_build) {
@@ -1159,7 +1167,7 @@ if (use_blink && !is_cronet_build) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}

Expand All @@ -78,7 +78,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}

@@ -1629,7 +1637,7 @@ group("chromium_builder_perf") {
@@ -1624,7 +1632,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}

Expand Down
@@ -1,6 +1,6 @@
--- apps/ui/views/app_window_frame_view.cc.orig 2022-10-01 07:40:07 UTC
--- apps/ui/views/app_window_frame_view.cc.orig 2023-12-23 12:33:28 UTC
+++ apps/ui/views/app_window_frame_view.cc
@@ -137,7 +137,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient
@@ -149,7 +149,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient
gfx::Rect window_bounds = client_bounds;
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
Expand Down
20 changes: 10 additions & 10 deletions www/ungoogled-chromium/files/patch-base_BUILD.gn
@@ -1,4 +1,4 @@
--- base/BUILD.gn.orig 2023-11-04 07:08:51 UTC
--- base/BUILD.gn.orig 2023-12-23 12:33:28 UTC
+++ base/BUILD.gn
@@ -186,7 +186,7 @@ buildflag_header("ios_cronet_buildflags") {
flags = [ "CRONET_BUILD=$is_cronet_build" ]
Expand All @@ -9,7 +9,7 @@
buildflag_header("message_pump_buildflags") {
header = "message_pump_buildflags.h"
header_dir = "base/message_loop"
@@ -1101,11 +1101,23 @@ component("base") {
@@ -1105,11 +1105,23 @@ component("base") {
# Needed for <atomic> if using newer C++ library than sysroot, except if
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
Expand All @@ -34,7 +34,7 @@
if (use_allocator_shim) {
if (is_apple) {
sources += [ "allocator/early_zone_registration_apple.h" ]
@@ -1125,7 +1137,7 @@ component("base") {
@@ -1129,7 +1141,7 @@ component("base") {

# Allow more direct string conversions on platforms with native utf8
# strings
Expand All @@ -43,7 +43,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}

@@ -2077,6 +2089,22 @@ component("base") {
@@ -2088,6 +2100,22 @@ component("base") {
]
}

Expand All @@ -66,7 +66,7 @@
# iOS
if (is_ios) {
sources += [
@@ -2209,6 +2237,29 @@ component("base") {
@@ -2220,6 +2248,29 @@ component("base") {
}
}

Expand Down Expand Up @@ -96,7 +96,7 @@
if (use_blink) {
sources += [
"files/file_path_watcher.cc",
@@ -2219,7 +2270,7 @@ component("base") {
@@ -2230,7 +2281,7 @@ component("base") {
}

if (dep_libevent) {
Expand All @@ -105,7 +105,7 @@
}

if (use_libevent) {
@@ -3599,7 +3650,7 @@ test("base_unittests") {
@@ -3619,7 +3670,7 @@ test("base_unittests") {
]
}

Expand All @@ -114,7 +114,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
@@ -3620,7 +3671,7 @@ test("base_unittests") {
@@ -3640,7 +3691,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
Expand All @@ -123,7 +123,7 @@
sources += [
"profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
@@ -3631,7 +3682,7 @@ test("base_unittests") {
@@ -3651,7 +3702,7 @@ test("base_unittests") {

# Allow more direct string conversions on platforms with native utf8
# strings
Expand All @@ -132,7 +132,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}

@@ -3892,7 +3943,7 @@ test("base_unittests") {
@@ -3913,7 +3964,7 @@ test("base_unittests") {
}
}

Expand Down

This file was deleted.

@@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/BUILD.gn.orig 2023-11-04 07:08:51 UTC
+++ base/allocator/partition_allocator/BUILD.gn
@@ -569,7 +569,7 @@ source_set("allocator_shim") {
--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2023-12-23 12:33:28 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
@@ -582,7 +582,7 @@ source_set("allocator_shim") {
]
configs += [ ":mac_no_default_new_delete_symbols" ]
}
Expand Down
@@ -1,5 +1,5 @@
--- base/allocator/partition_allocator/address_space_randomization.h.orig 2023-09-17 07:59:53 UTC
+++ base/allocator/partition_allocator/address_space_randomization.h
--- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig 2023-12-23 12:33:28 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h
@@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) {

#if defined(ARCH_CPU_64_BITS)
Expand Down
@@ -1,5 +1,5 @@
--- base/allocator/partition_allocator/page_allocator.h.orig 2023-09-17 07:59:53 UTC
+++ base/allocator/partition_allocator/page_allocator.h
--- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig 2023-12-23 12:33:28 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/page_allocator.h
@@ -258,7 +258,7 @@ void DecommitAndZeroSystemPages(void* address,
// recommitted. Do not assume that this will not change over time.
constexpr PA_COMPONENT_EXPORT(
Expand Down
@@ -1,5 +1,5 @@
--- base/allocator/partition_allocator/page_allocator_constants.h.orig 2023-09-17 07:59:53 UTC
+++ base/allocator/partition_allocator/page_allocator_constants.h
--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig 2023-12-23 12:33:28 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h
@@ -25,7 +25,7 @@
// elimination.
#define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const))
Expand Down
@@ -1,5 +1,5 @@
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-09-17 07:59:53 UTC
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2023-12-23 12:33:28 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h
@@ -403,8 +403,12 @@ bool TryRecommitSystemPagesInternal(

void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
Expand Down
@@ -1,5 +1,5 @@
--- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-07-21 09:49:17 UTC
+++ base/allocator/partition_allocator/partition_address_space.cc
--- base/allocator/partition_allocator/src/partition_alloc/partition_address_space.cc.orig 2023-12-23 12:33:28 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_address_space.cc
@@ -420,7 +420,7 @@ void PartitionAddressSpace::UninitThreadIsolatedPoolFo
}
#endif
Expand Down
@@ -1,5 +1,5 @@
--- base/allocator/partition_allocator/partition_alloc_base/compiler_specific.h.orig 2023-05-05 12:12:41 UTC
+++ base/allocator/partition_allocator/partition_alloc_base/compiler_specific.h
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h.orig 2023-12-23 12:33:28 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h
@@ -24,9 +24,9 @@
// Annotate a function indicating it should not be inlined.
// Use like:
Expand Down
@@ -1,5 +1,5 @@
--- base/allocator/partition_allocator/partition_alloc_base/debug/stack_trace_posix.cc.orig 2023-11-04 07:08:51 UTC
+++ base/allocator/partition_allocator/partition_alloc_base/debug/stack_trace_posix.cc
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc.orig 2023-12-23 12:33:28 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc
@@ -12,11 +12,11 @@
#include <string.h>
#include <unistd.h>
Expand Down
@@ -1,5 +1,5 @@
--- base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig 2023-09-17 07:59:53 UTC
+++ base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc.orig 2023-12-23 12:33:28 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc
@@ -90,6 +90,10 @@ void RandBytes(void* output, size_t output_length) {
if (getentropy(output, output_length) == 0) {
return;
Expand Down
@@ -1,5 +1,5 @@
--- base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h.orig 2022-10-01 07:40:07 UTC
+++ base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h.orig 2023-12-23 12:33:28 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h
@@ -10,7 +10,7 @@

namespace partition_alloc::internal::base::internal {
Expand Down
@@ -0,0 +1,11 @@
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig 2023-12-23 12:33:28 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc
@@ -17,7 +17,7 @@
#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h"
#include "build/build_config.h"

-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include <sys/syscall.h>
#include <atomic>
#endif
@@ -1,5 +1,5 @@
--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-10-13 13:20:35 UTC
+++ base/allocator/partition_allocator/partition_alloc_config.h
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2023-12-23 12:33:28 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h
@@ -94,7 +94,7 @@ static_assert(sizeof(void*) != 8, "");
// POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific
// features such as futex(2).
Expand All @@ -9,7 +9,7 @@

// On some platforms, we implement locking by spinning in userspace, then going
// into the kernel only if there is contention. This requires platform support,
@@ -237,7 +237,7 @@ constexpr bool kUseLazyCommit = false;
@@ -241,7 +241,7 @@ constexpr bool kUseLazyCommit = false;
// On these platforms, lock all the partitions before fork(), and unlock after.
// This may be required on more platforms in the future.
#define PA_CONFIG_HAS_ATFORK_HANDLER() \
Expand All @@ -18,7 +18,7 @@

// PartitionAlloc uses PartitionRootEnumerator to acquire all
// PartitionRoots at BeforeFork and to release at AfterFork.
@@ -284,7 +284,7 @@ constexpr bool kUseLazyCommit = false;
@@ -288,7 +288,7 @@ constexpr bool kUseLazyCommit = false;
// Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to
// larger slot spans.
#define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() \
Expand Down
@@ -1,5 +1,5 @@
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-11-04 07:08:51 UTC
+++ base/allocator/partition_allocator/partition_alloc_constants.h
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2023-12-23 12:33:28 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h
@@ -107,7 +107,7 @@ PartitionPageShift() {
return 18; // 256 KiB
}
Expand Down
@@ -1,5 +1,5 @@
--- base/allocator/partition_allocator/partition_alloc_forward.h.orig 2023-08-18 10:26:52 UTC
+++ base/allocator/partition_allocator/partition_alloc_forward.h
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_forward.h.orig 2023-12-23 12:33:28 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_forward.h
@@ -28,9 +28,13 @@ namespace internal {
// the second one 16. We could technically return something different for
// malloc() and operator new(), but this would complicate things, and most of
Expand Down
@@ -1,5 +1,5 @@
--- base/allocator/partition_allocator/partition_page_constants.h.orig 2023-08-18 10:26:52 UTC
+++ base/allocator/partition_allocator/partition_page_constants.h
--- base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h.orig 2023-12-23 12:33:28 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h
@@ -16,7 +16,7 @@ namespace partition_alloc::internal {
// (1 << 12 or 1 << 14), as checked in PartitionRoot::Init(). And
// PartitionPageSize() is 4 times the OS page size.
Expand Down
@@ -1,5 +1,5 @@
--- base/allocator/partition_allocator/partition_root.cc.orig 2023-10-13 13:20:35 UTC
+++ base/allocator/partition_allocator/partition_root.cc
--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2023-12-23 12:33:28 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
@@ -47,7 +47,7 @@
#include "wow64apiset.h"
#endif
Expand Down
@@ -1,5 +1,5 @@
--- base/allocator/partition_allocator/spinning_mutex.cc.orig 2023-05-05 12:12:41 UTC
+++ base/allocator/partition_allocator/spinning_mutex.cc
--- base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc.orig 2023-12-23 12:33:28 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc
@@ -18,7 +18,16 @@

#if PA_CONFIG(HAS_LINUX_KERNEL)
Expand Down
@@ -1,5 +1,5 @@
--- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2023-09-17 07:59:53 UTC
+++ base/allocator/partition_allocator/starscan/stack/stack.cc
--- base/allocator/partition_allocator/src/partition_alloc/starscan/stack/stack.cc.orig 2023-12-23 12:33:28 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/starscan/stack/stack.cc
@@ -18,6 +18,10 @@
#include <pthread.h>
#endif
Expand Down
6 changes: 3 additions & 3 deletions www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc
@@ -1,6 +1,6 @@
--- base/debug/stack_trace.cc.orig 2023-03-10 11:01:21 UTC
--- base/debug/stack_trace.cc.orig 2023-12-23 12:33:28 UTC
+++ base/debug/stack_trace.cc
@@ -273,7 +273,9 @@ void StackTrace::Print() const {
@@ -266,7 +266,9 @@ void StackTrace::Print() const {
}

void StackTrace::OutputToStream(std::ostream* os) const {
Expand All @@ -10,7 +10,7 @@
}

std::string StackTrace::ToString() const {
@@ -281,7 +283,7 @@ std::string StackTrace::ToString() const {
@@ -274,7 +276,7 @@ std::string StackTrace::ToString() const {
}
std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
std::stringstream stream;
Expand Down

0 comments on commit 2b72ddf

Please sign in to comment.