Skip to content

Commit

Permalink
www/ungoogled-chromium: update to 108.0.5359.71
Browse files Browse the repository at this point in the history
  • Loading branch information
rnagy authored and rene0 committed Dec 3, 2022
1 parent 27ca116 commit fa51d48
Show file tree
Hide file tree
Showing 318 changed files with 1,658 additions and 1,731 deletions.
7 changes: 4 additions & 3 deletions www/ungoogled-chromium/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PORTNAME= ungoogled-chromium
PORTVERSION= 107.0.5304.121
UGVERSION= 107.0.5304.110-1
PORTVERSION= 108.0.5359.71
UGVERSION= ${DISTVERSION}-1
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
https://nerd.hu/distfiles/:external
Expand Down Expand Up @@ -88,7 +88,8 @@ SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-
MAKE_ARGS= -C out/${BUILDTYPE}
ALL_TARGET= chrome

BINARY_ALIAS= python3=${PYTHON_CMD}
BINARY_ALIAS= python3=${PYTHON_CMD} \
moc=${PREFIX}/bin/moc-qt5

# TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn)
#
Expand Down
14 changes: 7 additions & 7 deletions www/ungoogled-chromium/distinfo
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
TIMESTAMP = 1669375165
SHA256 (chromium-107.0.5304.121.tar.xz) = 12b0ab045715a18abaf0c833c98c1001a43da4aae9690bb571b369d61f74e08b
SIZE (chromium-107.0.5304.121.tar.xz) = 1688476176
SHA256 (ungoogled-chromium-107.0.5304.110-1.tar.gz) = c497b0f3256a3c0bb1e48dd14115040b97bd7319b9def1c6501f9155fc56fef6
SIZE (ungoogled-chromium-107.0.5304.110-1.tar.gz) = 670238
SHA256 (chromium-107.0.5304.121-testdata.tar.xz) = f576ac3f760af0111e6802ce4b79a551916a82942dc09e56086120d0474221db
SIZE (chromium-107.0.5304.121-testdata.tar.xz) = 266234692
TIMESTAMP = 1670003182
SHA256 (chromium-108.0.5359.71.tar.xz) = cb6ca080c492ede34df7bf9c4eca45576e6306865985465bd0319c96bb71ff5d
SIZE (chromium-108.0.5359.71.tar.xz) = 1731590804
SHA256 (ungoogled-chromium-108.0.5359.71-1.tar.gz) = e50a612d4b0b68ee57bf2410c847fe20bfef0c7332fb706a3b5bee36682c5025
SIZE (ungoogled-chromium-108.0.5359.71-1.tar.gz) = 670813
SHA256 (chromium-108.0.5359.71-testdata.tar.xz) = 6ffc30f3e0785cb6f682c00abc04ec73f0aff0d7e7df38f49dcda4edfd663938
SIZE (chromium-108.0.5359.71-testdata.tar.xz) = 259213668
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
--- BUILD.gn.orig 2022-10-29 17:50:56 UTC
--- BUILD.gn.orig 2022-12-02 17:56:32 UTC
+++ BUILD.gn
@@ -59,7 +59,7 @@ declare_args() {
root_extra_deps = []
Expand All @@ -17,7 +17,7 @@
"//net:net_unittests",
"//sandbox:sandbox_unittests",
"//services:services_unittests",
@@ -447,7 +446,7 @@ group("gn_all") {
@@ -430,7 +429,7 @@ group("gn_all") {
]
}

Expand All @@ -26,7 +26,7 @@
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
@@ -640,6 +639,15 @@ group("gn_all") {
@@ -624,6 +623,15 @@ group("gn_all") {
deps += [ "//gpu/tools/compositor_model_bench" ]
}

Expand All @@ -42,7 +42,7 @@
if (is_mac) {
deps += [
"//third_party/breakpad:crash_inspector",
@@ -688,7 +696,7 @@ group("gn_all") {
@@ -672,7 +680,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)" ]
}

@@ -1115,7 +1123,7 @@ if (!is_ios) {
@@ -1099,7 +1107,7 @@ if (!is_ios) {
]
}

Expand All @@ -60,7 +60,7 @@
# WPT Webdriver tests runner
# chrome/test/chromedriver/test/run_webdriver_tests.py
script_test("webdriver_wpt_tests") {
@@ -1210,7 +1218,7 @@ if (!is_ios) {
@@ -1194,7 +1202,7 @@ if (!is_ios) {
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)" ]
}
@@ -1219,7 +1227,7 @@ if (!is_ios) {
@@ -1203,7 +1211,7 @@ if (!is_ios) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}

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

@@ -1660,7 +1668,7 @@ group("chromium_builder_perf") {
@@ -1647,7 +1655,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}

Expand Down
26 changes: 13 additions & 13 deletions www/ungoogled-chromium/files/patch-base_BUILD.gn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- base/BUILD.gn.orig 2022-10-29 17:50:56 UTC
--- base/BUILD.gn.orig 2022-12-02 17:56:32 UTC
+++ base/BUILD.gn
@@ -162,7 +162,7 @@ buildflag_header("ios_cronet_buildflags") {
@@ -163,7 +163,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"
@@ -1035,7 +1035,7 @@ mixed_component("base") {
@@ -1048,7 +1048,7 @@ mixed_component("base") {
"timer/hi_res_timer_manager_posix.cc",
]

Expand All @@ -18,7 +18,7 @@
sources += [
"profiler/stack_base_address_posix.cc",
"profiler/stack_base_address_posix.h",
@@ -1046,6 +1046,14 @@ mixed_component("base") {
@@ -1059,6 +1059,14 @@ mixed_component("base") {
"profiler/thread_delegate_posix.h",
]
}
Expand All @@ -33,7 +33,7 @@
}

if (is_win) {
@@ -1557,11 +1565,23 @@ mixed_component("base") {
@@ -1559,11 +1567,23 @@ mixed_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 @@ -58,7 +58,7 @@
if (use_allocator_shim) {
sources += [
"allocator/partition_allocator/shim/allocator_shim.cc",
@@ -1589,7 +1609,7 @@ mixed_component("base") {
@@ -1591,7 +1611,7 @@ mixed_component("base") {
]
configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
}
Expand All @@ -67,7 +67,7 @@
sources += [
"allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h",
"allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h",
@@ -1643,7 +1663,7 @@ mixed_component("base") {
@@ -1645,7 +1665,7 @@ mixed_component("base") {

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

@@ -2216,6 +2236,42 @@ mixed_component("base") {
@@ -2218,6 +2238,42 @@ mixed_component("base") {
}
}

Expand Down Expand Up @@ -119,7 +119,7 @@
# iOS
if (is_ios) {
sources -= [
@@ -2313,7 +2369,7 @@ mixed_component("base") {
@@ -2315,7 +2371,7 @@ mixed_component("base") {
}

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

if (use_libevent) {
@@ -3565,7 +3621,7 @@ test("base_unittests") {
@@ -3583,7 +3639,7 @@ test("base_unittests") {
}
}

Expand All @@ -137,7 +137,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
@@ -3613,7 +3669,7 @@ test("base_unittests") {
@@ -3629,7 +3685,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
Expand All @@ -146,7 +146,7 @@
sources += [
"profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
@@ -3624,7 +3680,7 @@ test("base_unittests") {
@@ -3640,7 +3696,7 @@ test("base_unittests") {

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

@@ -3812,7 +3868,7 @@ test("base_unittests") {
@@ -3832,7 +3888,7 @@ test("base_unittests") {
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/page_allocator.h.orig 2022-10-01 07:40:07 UTC
--- base/allocator/partition_allocator/page_allocator.h.orig 2022-12-02 17:56:32 UTC
+++ base/allocator/partition_allocator/page_allocator.h
@@ -206,7 +206,7 @@ void DecommitAndZeroSystemPages(void* address, size_t
@@ -231,7 +231,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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-10-01 07:40:07 UTC
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-12-02 17:56:32 UTC
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
@@ -347,8 +347,12 @@ bool TryRecommitSystemPagesInternal(
@@ -356,8 +356,12 @@ bool TryRecommitSystemPagesInternal(

void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
void* ptr = reinterpret_cast<void*>(address);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--- base/allocator/partition_allocator/partition_address_space.cc.orig 2022-10-29 17:50:56 UTC
--- base/allocator/partition_allocator/partition_address_space.cc.orig 2022-12-02 17:56:32 UTC
+++ base/allocator/partition_allocator/partition_address_space.cc
@@ -261,7 +261,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT
setup_.configurable_pool_ = 0;
@@ -294,7 +294,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT
setup_.configurable_pool_base_mask_ = 0;
}

-#if BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-10-29 17:50:56 UTC
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-12-02 17:56:32 UTC
+++ base/allocator/partition_allocator/partition_alloc_constants.h
@@ -91,7 +91,7 @@ PartitionPageShift() {
return 18; // 256 KiB
Expand All @@ -9,9 +9,9 @@
PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t
PartitionPageShift() {
return PageAllocationGranularityShift() + 2;
@@ -272,7 +272,7 @@ constexpr size_t kNumPools = 3;
@@ -270,7 +270,7 @@ constexpr size_t kNumPools = 3;
// Special-case Android and iOS, which incur test failures with larger
// GigaCage. Regardless, allocating >8GiB with malloc() on these platforms is
// pools. Regardless, allocating >8GiB with malloc() on these platforms is
// unrealistic as of 2022.
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
--- base/allocator/partition_allocator/partition_page.h.orig 2022-11-06 16:08:29 UTC
--- base/allocator/partition_allocator/partition_page.h.orig 2022-12-02 17:56:32 UTC
+++ base/allocator/partition_allocator/partition_page.h
@@ -144,7 +144,7 @@ struct SlotSpanMetadata {
@@ -138,13 +138,13 @@ struct SlotSpanMetadata {
PartitionBucket<thread_safe>* const bucket = nullptr;

// CHECK()ed in AllocNewSlotSpan().
-#if defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE)
+#if (defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE))
// System page size is not a constant on Apple OSes, but is either 4 or 16kiB
// (1 << 12 or 1 << 14), as checked in PartitionRoot::Init(). And
// PartitionPageSize() is 4 times the OS page size.
static constexpr size_t kMaxSlotsPerSlotSpan =
4 * (1 << 14) / kSmallestBucket;
Expand Down
4 changes: 2 additions & 2 deletions www/ungoogled-chromium/files/patch-base_cpu.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- base/cpu.h.orig 2022-10-01 07:40:07 UTC
--- base/cpu.h.orig 2022-12-02 17:56:32 UTC
+++ base/cpu.h
@@ -108,7 +108,7 @@ class BASE_EXPORT CPU final {
@@ -115,7 +115,7 @@ class BASE_EXPORT CPU final {
const std::string& cpu_brand() const { return cpu_brand_; }

#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
Expand Down
6 changes: 3 additions & 3 deletions www/ungoogled-chromium/files/patch-base_i18n_icu__util.cc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- base/i18n/icu_util.cc.orig 2022-10-29 17:50:56 UTC
--- base/i18n/icu_util.cc.orig 2022-12-02 17:56:32 UTC
+++ base/i18n/icu_util.cc
@@ -53,7 +53,7 @@
@@ -52,7 +52,7 @@
#include "third_party/icu/source/common/unicode/unistr.h"
#endif

Expand All @@ -9,7 +9,7 @@
BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
#include "third_party/icu/source/i18n/unicode/timezone.h"
#endif
@@ -344,7 +344,7 @@ void InitializeIcuTimeZone() {
@@ -343,7 +343,7 @@ void InitializeIcuTimeZone() {
FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
icu::TimeZone::adoptDefault(
icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
--- base/memory/discardable_memory.cc.orig 2022-10-01 07:40:07 UTC
--- base/memory/discardable_memory.cc.orig 2022-12-02 17:56:32 UTC
+++ base/memory/discardable_memory.cc
@@ -25,7 +25,7 @@ const base::Feature kMadvFreeDiscardableMemory{
"MadvFreeDiscardableMemory", base::FEATURE_DISABLED_BY_DEFAULT};
@@ -26,7 +26,7 @@ BASE_FEATURE(kMadvFreeDiscardableMemory,
base::FEATURE_DISABLED_BY_DEFAULT);
#endif // BUILDFLAG(IS_POSIX)

-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
const base::Feature kDiscardableMemoryBackingTrial{
"DiscardableMemoryBackingTrial", base::FEATURE_DISABLED_BY_DEFAULT};

@@ -50,7 +50,7 @@ const base::FeatureParam<DiscardableMemoryTrialGroup>
BASE_FEATURE(kDiscardableMemoryBackingTrial,
"DiscardableMemoryBackingTrial",
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -52,7 +52,7 @@ const base::FeatureParam<DiscardableMemoryTrialGroup>

namespace {

Expand All @@ -18,7 +18,7 @@

DiscardableMemoryBacking GetBackingForFieldTrial() {
DiscardableMemoryTrialGroup trial_group =
@@ -69,7 +69,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() {
@@ -71,7 +71,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() {

} // namespace

Expand All @@ -27,7 +27,7 @@

// Probe capabilities of this device to determine whether we should participate
// in the discardable memory backing trial.
@@ -99,7 +99,7 @@ DiscardableMemory::DiscardableMemory() = default;
@@ -101,7 +101,7 @@ DiscardableMemory::DiscardableMemory() = default;
DiscardableMemory::~DiscardableMemory() = default;

DiscardableMemoryBacking GetDiscardableMemoryBacking() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
--- base/process/process_metrics.h.orig 2022-10-29 17:50:56 UTC
--- base/process/process_metrics.h.orig 2022-12-02 17:56:32 UTC
+++ base/process/process_metrics.h
@@ -36,7 +36,7 @@
#endif
Expand Down Expand Up @@ -118,7 +118,7 @@
// Parse the data found in /proc/<pid>/stat and return the sum of the
// CPU-related ticks. Returns -1 on parse error.
// Exposed for testing.
@@ -621,7 +619,7 @@ class BASE_EXPORT SystemMetrics {
@@ -622,7 +620,7 @@ class BASE_EXPORT SystemMetrics {
FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);

size_t committed_memory_;
Expand Down
4 changes: 2 additions & 2 deletions www/ungoogled-chromium/files/patch-base_rand__util.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- base/rand_util.h.orig 2022-10-29 17:50:56 UTC
--- base/rand_util.h.orig 2022-12-02 17:56:32 UTC
+++ base/rand_util.h
@@ -89,7 +89,7 @@ void RandomShuffle(Itr first, Itr last) {
@@ -117,7 +117,7 @@ void RandomShuffle(Itr first, Itr last) {
std::shuffle(first, last, RandomBitGenerator());
}

Expand Down

0 comments on commit fa51d48

Please sign in to comment.