Skip to content

Commit

Permalink
www/ungoogled-chromium: update to 115.0.5790.98
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert Nagy authored and Robert Nagy committed Jul 21, 2023
1 parent 45d8191 commit 792ca53
Show file tree
Hide file tree
Showing 341 changed files with 3,070 additions and 1,697 deletions.
7 changes: 4 additions & 3 deletions www/ungoogled-chromium/Makefile
@@ -1,5 +1,5 @@
PORTNAME= ungoogled-chromium
PORTVERSION= 114.0.5735.198
PORTVERSION= 115.0.5790.98
UGVERSION= ${DISTVERSION}-1
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
Expand Down Expand Up @@ -135,6 +135,7 @@ GN_ARGS+= build_with_tflite_lib=false \
enable_reading_list=false \
enable_remoting=false \
enable_reporting=false \
enable_rust=false \
enable_service_discovery=false \
exclude_unwind_tables=true \
google_api_key="" \
Expand Down Expand Up @@ -231,8 +232,8 @@ TEST_ALL_TARGET= ${TEST_TARGETS}
IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base
.endif

.if ${COMPILER_VERSION} < 150
LLVM_DEFAULT= 15
.if ${COMPILER_VERSION} < 160
LLVM_DEFAULT= 16
BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \
Expand Down
14 changes: 7 additions & 7 deletions www/ungoogled-chromium/distinfo
@@ -1,9 +1,9 @@
TIMESTAMP = 1687967513
SHA256 (chromium-114.0.5735.198.tar.xz) = a9f3440feeab51f56b199797b83b458ca545bf67e114c62b21470fadd5a41dea
SIZE (chromium-114.0.5735.198.tar.xz) = 1570630092
SHA256 (ungoogled-chromium-114.0.5735.198-1.tar.gz) = 3b22dcd4caebea5f1c72ea4437e67784d6b740a4624b15002078a6daf05235a1
SIZE (ungoogled-chromium-114.0.5735.198-1.tar.gz) = 664537
SHA256 (chromium-114.0.5735.198-testdata.tar.xz) = 2c244b76c21c298e07719107e421b56715f020eb2c14aea1bafa90bd84c06887
SIZE (chromium-114.0.5735.198-testdata.tar.xz) = 263496592
TIMESTAMP = 1689933072
SHA256 (chromium-115.0.5790.98.tar.xz) = ffbe630ecf8fc8a250be05fdbec6c94d5881b5fcbbc5fb2b93e54ddc78d56af1
SIZE (chromium-115.0.5790.98.tar.xz) = 1594903988
SHA256 (ungoogled-chromium-115.0.5790.98-1.tar.gz) = e6647876747b083a491710393af0f8058284e465d06b41225eb708b30fb08072
SIZE (ungoogled-chromium-115.0.5790.98-1.tar.gz) = 665549
SHA256 (chromium-115.0.5790.98-testdata.tar.xz) = ed42d767a1056182d68cea5e5565f33904e328c51d943dfe14cde791f2e286ae
SIZE (chromium-115.0.5790.98-testdata.tar.xz) = 264829224
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
12 changes: 6 additions & 6 deletions www/ungoogled-chromium/files/patch-BUILD.gn
@@ -1,4 +1,4 @@
--- BUILD.gn.orig 2023-06-05 19:39:05 UTC
--- BUILD.gn.orig 2023-07-21 09:49:17 UTC
+++ BUILD.gn
@@ -61,7 +61,7 @@ declare_args() {
root_extra_deps = []
Expand Down Expand Up @@ -42,7 +42,7 @@
if (is_mac) {
deps += [
"//third_party/breakpad:dump_syms",
@@ -658,7 +666,7 @@ group("gn_all") {
@@ -657,7 +665,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)" ]
}

@@ -1088,7 +1096,7 @@ if (!is_ios && !is_cronet_build) {
@@ -1086,7 +1094,7 @@ if (!is_ios && !is_cronet_build) {
]
}

Expand All @@ -60,7 +60,7 @@
# WPT Webdriver tests runner
# chrome/test/chromedriver/test/run_webdriver_tests.py
script_test("webdriver_wpt_tests") {
@@ -1188,7 +1196,7 @@ if (!is_ios && !is_cronet_build) {
@@ -1186,7 +1194,7 @@ if (!is_ios && !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)" ]
}
@@ -1197,7 +1205,7 @@ if (!is_ios && !is_cronet_build) {
@@ -1195,7 +1203,7 @@ if (!is_ios && !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)" ]
}

@@ -1664,7 +1672,7 @@ group("chromium_builder_perf") {
@@ -1663,7 +1671,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}

Expand Down
22 changes: 11 additions & 11 deletions www/ungoogled-chromium/files/patch-base_BUILD.gn
@@ -1,6 +1,6 @@
--- base/BUILD.gn.orig 2023-06-05 19:39:05 UTC
--- base/BUILD.gn.orig 2023-07-21 09:49:17 UTC
+++ base/BUILD.gn
@@ -197,7 +197,7 @@ buildflag_header("ios_cronet_buildflags") {
@@ -198,7 +198,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"
@@ -1100,11 +1100,23 @@ component("base") {
@@ -1099,11 +1099,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) {
sources += [
"allocator/partition_allocator/shim/allocator_shim.cc",
@@ -1132,7 +1144,7 @@ component("base") {
@@ -1131,7 +1143,7 @@ component("base") {
]
configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
}
Expand All @@ -43,7 +43,7 @@
sources += [
"allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h",
"allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h",
@@ -1173,7 +1185,7 @@ component("base") {
@@ -1172,7 +1184,7 @@ component("base") {

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

@@ -2127,6 +2139,43 @@ component("base") {
@@ -2130,6 +2142,43 @@ component("base") {
}
}

Expand Down Expand Up @@ -96,7 +96,7 @@
# iOS
if (is_ios) {
sources += [
@@ -2236,7 +2285,7 @@ component("base") {
@@ -2238,7 +2287,7 @@ component("base") {
}

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

if (use_libevent) {
@@ -3559,7 +3608,7 @@ test("base_unittests") {
@@ -3552,7 +3601,7 @@ test("base_unittests") {
]
}

Expand All @@ -114,7 +114,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
@@ -3608,7 +3657,7 @@ test("base_unittests") {
@@ -3601,7 +3650,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",
@@ -3619,7 +3668,7 @@ test("base_unittests") {
@@ -3612,7 +3661,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" ]
}

@@ -3843,7 +3892,7 @@ test("base_unittests") {
@@ -3837,7 +3886,7 @@ test("base_unittests") {
}
}

Expand Down
@@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/page_allocator.h.orig 2023-06-05 19:39:05 UTC
--- base/allocator/partition_allocator/page_allocator.h.orig 2023-07-21 09:49:17 UTC
+++ base/allocator/partition_allocator/page_allocator.h
@@ -238,7 +238,7 @@ void DecommitAndZeroSystemPages(void* address, size_t
@@ -241,7 +241,7 @@ void DecommitAndZeroSystemPages(void* address, size_t
// recommitted. Do not assume that this will not change over time.
constexpr PA_COMPONENT_EXPORT(
PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() {
Expand Down
@@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-06-05 19:39:05 UTC
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-07-21 09:49:17 UTC
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
@@ -387,8 +387,12 @@ bool TryRecommitSystemPagesInternal(
@@ -394,8 +394,12 @@ bool TryRecommitSystemPagesInternal(

void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
void* ptr = reinterpret_cast<void*>(address);
Expand Down
@@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-04-08 11:38:38 UTC
--- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-07-21 09:49:17 UTC
+++ base/allocator/partition_allocator/partition_address_space.cc
@@ -417,7 +417,7 @@ void PartitionAddressSpace::UninitPkeyPoolForTesting()
@@ -420,7 +420,7 @@ void PartitionAddressSpace::UninitThreadIsolatedPoolFo
}
#endif

Expand Down
@@ -1,11 +1,11 @@
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-06-05 19:39:05 UTC
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-07-21 09:49:17 UTC
+++ base/allocator/partition_allocator/partition_alloc.gni
@@ -305,7 +305,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt
"AsanBackupRefPtr requires RawPtrHookableImpl")

declare_args() {
- enable_pkeys = is_linux && target_cpu == "x64"
+ enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64"
@@ -291,7 +291,7 @@ declare_args() {
# pkeys support is explicitly disabled in all Cronet builds, as some test dependencies that
# use partition_allocator are compiled in AOSP against a version of glibc that does not
# include pkeys syscall numbers.
- enable_pkeys = is_linux && target_cpu == "x64" && !is_cronet_build
+ enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64" && !is_cronet_build
}
assert(!enable_pkeys || (is_linux && target_cpu == "x64"),
"Pkeys are only supported on x64 linux")
@@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-05-05 12:12:41 UTC
--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-07-21 09:49:17 UTC
+++ base/allocator/partition_allocator/partition_alloc_config.h
@@ -104,7 +104,7 @@ static_assert(sizeof(void*) != 8, "");
@@ -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).
#define PA_CONFIG_HAS_LINUX_KERNEL() \
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,
@@ -232,7 +232,7 @@ constexpr bool kUseLazyCommit = false;
@@ -234,7 +234,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.
@@ -277,7 +277,7 @@ constexpr bool kUseLazyCommit = false;
@@ -279,7 +279,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,4 +1,4 @@
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-05-05 12:12:41 UTC
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-07-21 09:49:17 UTC
+++ base/allocator/partition_allocator/partition_alloc_constants.h
@@ -92,7 +92,7 @@ PartitionPageShift() {
return 18; // 256 KiB
Expand All @@ -9,12 +9,13 @@
PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t
PartitionPageShift() {
return PageAllocationGranularityShift() + 2;
@@ -293,7 +293,7 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
// When pointer compression is enabled, we cannot use large pools (at most
@@ -294,7 +294,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
// 8GB for each of the glued pools).
#if BUILDFLAG(HAS_64_BIT_POINTERS)
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION) || BUILDFLAG(IS_BSD)
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \
- BUILDFLAG(ENABLE_POINTER_COMPRESSION)
+ BUILDFLAG(ENABLE_POINTER_COMPRESSION) || \
+ BUILDFLAG(IS_BSD)
constexpr size_t kPoolMaxSize = 8 * kGiB;
#else
constexpr size_t kPoolMaxSize = 16 * kGiB;
@@ -1,4 +1,4 @@
--- base/allocator/partition_allocator/partition_root.cc.orig 2023-06-05 19:39:05 UTC
--- base/allocator/partition_allocator/partition_root.cc.orig 2023-07-21 09:49:17 UTC
+++ base/allocator/partition_allocator/partition_root.cc
@@ -46,7 +46,7 @@
#include "wow64apiset.h"
Expand All @@ -9,7 +9,7 @@
#include <pthread.h>
#endif

@@ -287,7 +287,7 @@ void PartitionAllocMallocInitOnce() {
@@ -286,7 +286,7 @@ void PartitionAllocMallocInitOnce() {
return;
}

Expand All @@ -18,7 +18,7 @@
// When fork() is called, only the current thread continues to execute in the
// child process. If the lock is held, but *not* by this thread when fork() is
// called, we have a deadlock.
@@ -381,7 +381,7 @@ static size_t PartitionPurgeSlotSpan(
@@ -380,7 +380,7 @@ static size_t PartitionPurgeSlotSpan(
constexpr size_t kMaxSlotCount =
(PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) /
MinPurgeableSlotSize();
Expand All @@ -27,7 +27,7 @@
// It's better for slot_usage to be stack-allocated and fixed-size, which
// demands that its size be constexpr. On IS_APPLE and Linux on arm64,
// PartitionPageSize() is always SystemPageSize() << 2, so regardless of
@@ -853,7 +853,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
@@ -880,7 +880,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
// apple OSes.
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
(internal::SystemPageSize() == (size_t{1} << 14)));
Expand Down
@@ -1,4 +1,4 @@
--- base/debug/stack_trace_posix.cc.orig 2023-04-08 11:38:38 UTC
--- base/debug/stack_trace_posix.cc.orig 2023-07-21 09:49:17 UTC
+++ base/debug/stack_trace_posix.cc
@@ -41,7 +41,7 @@
// execinfo.h and backtrace(3) are really only present in glibc and in macOS
Expand All @@ -18,7 +18,7 @@
#include "base/debug/proc_maps_linux.h"
#endif

@@ -799,6 +799,9 @@ class SandboxSymbolizeHelper {
@@ -798,6 +798,9 @@ class SandboxSymbolizeHelper {
// for the modules that are loaded in the current process.
// Returns true on success.
bool CacheMemoryRegions() {
Expand All @@ -28,7 +28,7 @@
// Reads /proc/self/maps.
std::string contents;
if (!ReadProcMaps(&contents)) {
@@ -816,6 +819,7 @@ class SandboxSymbolizeHelper {
@@ -815,6 +818,7 @@ class SandboxSymbolizeHelper {

is_initialized_ = true;
return true;
Expand Down
@@ -1,6 +1,6 @@
--- base/files/file_path_watcher_unittest.cc.orig 2023-06-05 19:39:05 UTC
--- base/files/file_path_watcher_unittest.cc.orig 2023-07-21 09:49:17 UTC
+++ base/files/file_path_watcher_unittest.cc
@@ -473,7 +473,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
@@ -479,7 +479,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
VLOG(1) << "Waiting for file1 creation";
ASSERT_TRUE(WaitForEvent());

Expand All @@ -9,7 +9,7 @@
// Mac implementation does not detect files modified in a directory.
ASSERT_TRUE(WriteFile(file1, "content v2"));
VLOG(1) << "Waiting for file1 modification";
@@ -1275,7 +1275,7 @@ enum Permission {
@@ -1281,7 +1281,7 @@ enum Permission {
Execute
};

Expand All @@ -18,7 +18,7 @@
bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) {
struct stat stat_buf;

@@ -1306,7 +1306,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
@@ -1312,7 +1312,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
}
#endif // BUILDFLAG(IS_APPLE)

Expand Down
@@ -1,4 +1,4 @@
--- base/memory/platform_shared_memory_region.h.orig 2022-10-01 07:40:07 UTC
--- base/memory/platform_shared_memory_region.h.orig 2023-07-21 09:49:17 UTC
+++ base/memory/platform_shared_memory_region.h
@@ -16,7 +16,7 @@

Expand All @@ -18,7 +18,7 @@
// Structure to limit access to executable region creation.
struct ExecutableRegion {
private:
@@ -211,7 +211,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
@@ -215,7 +215,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
CheckPlatformHandlePermissionsCorrespondToMode);
static PlatformSharedMemoryRegion Create(Mode mode,
size_t size
Expand Down

0 comments on commit 792ca53

Please sign in to comment.