Skip to content

Commit

Permalink
www/iridium: update to 2022.04.100.0
Browse files Browse the repository at this point in the history
  • Loading branch information
rnagy authored and rene0 committed Apr 1, 2022
1 parent f606d82 commit 653b1b2
Show file tree
Hide file tree
Showing 318 changed files with 1,953 additions and 1,388 deletions.
3 changes: 1 addition & 2 deletions www/iridium/Makefile
@@ -1,6 +1,5 @@
PORTNAME= iridium
PORTVERSION= 2022.03.99.1
PORTREVISION= 1
PORTVERSION= 2022.04.100.0
CATEGORIES= www
MASTER_SITES= https://downloads.iridiumbrowser.de/source/
PKGNAMESUFFIX= -browser
Expand Down
6 changes: 3 additions & 3 deletions www/iridium/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1648465372
SHA256 (iridium-browser-2022.03.99.1.tar.xz) = f960ee848fd23f45b19ebde438dfdb0f59d8b33a2fc79dffc9505767ccefb7f9
SIZE (iridium-browser-2022.03.99.1.tar.xz) = 1310538552
TIMESTAMP = 1648800090
SHA256 (iridium-browser-2022.04.100.0.tar.xz) = 1a111c3ac3f50e81a3120a9936941682bb66bd5a5287d92a2ccf0158a0cf2b1e
SIZE (iridium-browser-2022.04.100.0.tar.xz) = 1323781188
14 changes: 7 additions & 7 deletions www/iridium/files/patch-BUILD.gn
@@ -1,6 +1,6 @@
--- BUILD.gn.orig 2022-03-28 18:11:04 UTC
--- BUILD.gn.orig 2022-04-01 07:48:30 UTC
+++ BUILD.gn
@@ -52,7 +52,7 @@ declare_args() {
@@ -53,7 +53,7 @@ declare_args() {
root_extra_deps = []
}

Expand All @@ -9,7 +9,7 @@
# An official (maximally optimized!) component (optimized for build times)
# build doesn't make sense and usually doesn't work.
assert(!is_component_build)
@@ -454,7 +454,7 @@ group("gn_all") {
@@ -452,7 +452,7 @@ group("gn_all") {
]
}

Expand All @@ -34,7 +34,7 @@
if (is_mac) {
deps += [
"//third_party/breakpad:crash_inspector",
@@ -686,7 +695,7 @@ group("gn_all") {
@@ -685,7 +694,7 @@ group("gn_all") {
host_os == "win") {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
Expand All @@ -43,7 +43,7 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}

@@ -1137,7 +1146,7 @@ if (!is_ios) {
@@ -1147,7 +1156,7 @@ if (!is_ios) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}

Expand All @@ -52,7 +52,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
@@ -1146,7 +1155,7 @@ if (!is_ios) {
@@ -1156,7 +1165,7 @@ if (!is_ios) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}

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

@@ -1521,7 +1530,7 @@ group("chromium_builder_perf") {
@@ -1531,7 +1540,7 @@ group("chromium_builder_perf") {

if (is_win) {
data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
Expand Down
@@ -1,6 +1,6 @@
--- ash/display/mirror_window_controller.cc.orig 2022-03-28 18:11:04 UTC
--- ash/display/mirror_window_controller.cc.orig 2022-04-01 07:48:30 UTC
+++ ash/display/mirror_window_controller.cc
@@ -297,7 +297,11 @@ void MirrorWindowController::UpdateWindow(
@@ -296,7 +296,11 @@ void MirrorWindowController::UpdateWindow(
return info.id() == iter->first;
}) == display_info_list.end()) {
CloseAndDeleteHost(iter->second, true);
Expand Down
22 changes: 11 additions & 11 deletions www/iridium/files/patch-base_BUILD.gn
@@ -1,6 +1,6 @@
--- base/BUILD.gn.orig 2022-03-28 18:11:04 UTC
--- base/BUILD.gn.orig 2022-04-01 07:48:30 UTC
+++ base/BUILD.gn
@@ -993,7 +993,7 @@ mixed_component("base") {
@@ -999,7 +999,7 @@ mixed_component("base") {
"timer/hi_res_timer_manager_posix.cc",
]

Expand All @@ -9,7 +9,7 @@
sources += [
"cpu_affinity_posix.cc",
"cpu_affinity_posix.h",
@@ -1004,6 +1004,12 @@ mixed_component("base") {
@@ -1010,6 +1010,12 @@ mixed_component("base") {
"profiler/thread_delegate_posix.h",
]
}
Expand All @@ -22,7 +22,7 @@
}

if (is_win) {
@@ -1462,11 +1468,23 @@ mixed_component("base") {
@@ -1478,11 +1484,23 @@ mixed_component("base") {
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
if (!use_sysroot &&
Expand All @@ -47,7 +47,7 @@
if (use_allocator_shim) {
sources += [
"allocator/allocator_shim.cc",
@@ -1490,7 +1508,7 @@ mixed_component("base") {
@@ -1506,7 +1524,7 @@ mixed_component("base") {
]
configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
}
Expand All @@ -56,7 +56,7 @@
sources += [
"allocator/allocator_shim_override_cpp_symbols.h",
"allocator/allocator_shim_override_glibc_weak_symbols.h",
@@ -1550,7 +1568,7 @@ mixed_component("base") {
@@ -1563,7 +1581,7 @@ mixed_component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
# TODO(crbug/1052397): Consider replacing is_ash with is_chromeos once lacros switches to target_os=chromeos
Expand All @@ -65,7 +65,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}

@@ -2222,6 +2240,42 @@ mixed_component("base") {
@@ -2243,6 +2261,42 @@ mixed_component("base") {
}
}

Expand Down Expand Up @@ -108,7 +108,7 @@
# iOS
if (is_ios) {
sources -= [
@@ -3465,7 +3519,7 @@ test("base_unittests") {
@@ -3495,7 +3549,7 @@ test("base_unittests") {
}
}

Expand All @@ -117,7 +117,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
@@ -3513,7 +3567,7 @@ test("base_unittests") {
@@ -3543,7 +3597,7 @@ test("base_unittests") {
"posix/unix_domain_socket_unittest.cc",
"task/thread_pool/task_tracker_posix_unittest.cc",
]
Expand All @@ -126,7 +126,7 @@
sources += [
"cpu_affinity_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
@@ -3525,7 +3579,7 @@ test("base_unittests") {
@@ -3555,7 +3609,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
# TODO(crbug/1052397): Consider replacing is_ash with is_chromeos once lacros switches to target_os=chromeos
Expand All @@ -135,7 +135,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}

@@ -3689,7 +3743,7 @@ test("base_unittests") {
@@ -3724,7 +3778,7 @@ test("base_unittests") {
}
}

Expand Down
@@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-03-28 18:11:04 UTC
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-04-01 07:48:30 UTC
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
@@ -346,8 +346,12 @@ bool TryRecommitSystemPagesInternal(
@@ -352,8 +352,12 @@ bool TryRecommitSystemPagesInternal(

void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
void* ptr = reinterpret_cast<void*>(address);
Expand Down
@@ -1,4 +1,4 @@
--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-03-28 18:11:04 UTC
--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-04-01 07:48:30 UTC
+++ base/allocator/partition_allocator/partition_alloc_config.h
@@ -59,7 +59,7 @@ static_assert(sizeof(void*) != 8, "");

Expand All @@ -9,3 +9,12 @@
#define PA_HAS_LINUX_KERNEL
#endif

@@ -179,7 +179,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.
-#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#define PA_HAS_ATFORK_HANDLER
#endif

@@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_page.h.orig 2022-03-28 18:11:04 UTC
--- base/allocator/partition_allocator/partition_page.h.orig 2022-04-01 07:48:30 UTC
+++ base/allocator/partition_allocator/partition_page.h
@@ -129,7 +129,8 @@ struct __attribute__((packed)) SlotSpanMetadata {
@@ -128,7 +128,8 @@ struct __attribute__((packed)) SlotSpanMetadata {
PartitionBucket<thread_safe>* const bucket = nullptr;

// CHECK()ed in AllocNewSlotSpan().
Expand All @@ -10,7 +10,7 @@
// 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.
@@ -143,7 +144,9 @@ struct __attribute__((packed)) SlotSpanMetadata {
@@ -142,7 +143,9 @@ struct __attribute__((packed)) SlotSpanMetadata {
#endif // defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE)
// The maximum number of bits needed to cover all currently supported OSes.
static constexpr size_t kMaxSlotsPerSlotSpanBits = 13;
Expand Down
@@ -1,11 +1,11 @@
--- base/allocator/partition_allocator/partition_root.h.orig 2022-03-28 18:11:04 UTC
--- base/allocator/partition_allocator/partition_root.h.orig 2022-04-01 07:48:30 UTC
+++ base/allocator/partition_allocator/partition_root.h
@@ -1019,7 +1019,7 @@ ALWAYS_INLINE void PartitionRoot<thread_safe>::FreeNoH
@@ -1071,7 +1071,7 @@ ALWAYS_INLINE void PartitionRoot<thread_safe>::FreeNoH
// essentially).
#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && \
((BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMECAST)) || \
- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_64_BITS)))
+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_64_BITS)))
PA_CHECK(IsManagedByPartitionAlloc(address));
PA_CHECK(IsManagedByPartitionAlloc(object_addr));
#endif

4 changes: 2 additions & 2 deletions www/iridium/files/patch-base_debug_stack__trace__posix.cc
@@ -1,6 +1,6 @@
--- base/debug/stack_trace_posix.cc.orig 2022-03-28 18:11:04 UTC
--- base/debug/stack_trace_posix.cc.orig 2022-04-01 07:48:30 UTC
+++ base/debug/stack_trace_posix.cc
@@ -37,7 +37,7 @@
@@ -38,7 +38,7 @@
#include <AvailabilityMacros.h>
#endif

Expand Down
@@ -1,4 +1,4 @@
--- base/process/process_metrics_openbsd.cc.orig 2022-03-28 18:11:04 UTC
--- base/process/process_metrics_openbsd.cc.orig 2022-04-01 07:48:30 UTC
+++ base/process/process_metrics_openbsd.cc
@@ -4,17 +4,36 @@

Expand Down Expand Up @@ -55,11 +55,12 @@
+ sizeof(struct kinfo_proc), 1 };

- mib[5] = (length / sizeof(struct kinfo_proc));
-
if (sysctl(mib, base::size(mib), &info, &length, NULL, 0) < 0)
- return 0;
+ if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0)
+ return 0.0;

- if (sysctl(mib, base::size(mib), &info, &length, NULL, 0) < 0)
- return 0;
-
- return info.p_pctcpu;
+ return static_cast<double>((info.p_pctcpu * 100.0) / FSCALE);
}
Expand Down
4 changes: 2 additions & 2 deletions www/iridium/files/patch-base_process_process__posix.cc
@@ -1,4 +1,4 @@
--- base/process/process_posix.cc.orig 2022-03-28 18:11:04 UTC
--- base/process/process_posix.cc.orig 2022-04-01 07:48:30 UTC
+++ base/process/process_posix.cc
@@ -23,10 +23,15 @@
#include "build/build_config.h"
Expand Down Expand Up @@ -35,7 +35,7 @@
// On Mac we can wait on non child processes.
return WaitForSingleNonChildProcess(handle, timeout);
#else
@@ -358,7 +363,55 @@ void Process::Exited(int exit_code) const {}
@@ -356,7 +361,55 @@ void Process::Exited(int exit_code) const {}

int Process::GetPriority() const {
DCHECK(IsValid());
Expand Down
4 changes: 2 additions & 2 deletions www/iridium/files/patch-base_rand__util.h
@@ -1,6 +1,6 @@
--- base/rand_util.h.orig 2022-03-28 18:11:04 UTC
--- base/rand_util.h.orig 2022-04-01 07:48:30 UTC
+++ base/rand_util.h
@@ -77,7 +77,7 @@ void RandomShuffle(Itr first, Itr last) {
@@ -81,7 +81,7 @@ void RandomShuffle(Itr first, Itr last) {
std::shuffle(first, last, RandomBitGenerator());
}

Expand Down
4 changes: 2 additions & 2 deletions www/iridium/files/patch-base_system_sys__info__unittest.cc
@@ -1,6 +1,6 @@
--- base/system/sys_info_unittest.cc.orig 2022-03-28 18:11:04 UTC
--- base/system/sys_info_unittest.cc.orig 2022-04-01 07:48:30 UTC
+++ base/system/sys_info_unittest.cc
@@ -228,12 +228,15 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
@@ -234,12 +234,15 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
EXPECT_TRUE(IsStringUTF8(hardware_info->model));
bool empty_result_expected =
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || \
Expand Down

This file was deleted.

@@ -1,6 +1,6 @@
--- base/trace_event/memory_dump_manager.cc.orig 2022-03-28 18:11:04 UTC
--- base/trace_event/memory_dump_manager.cc.orig 2022-04-01 07:48:30 UTC
+++ base/trace_event/memory_dump_manager.cc
@@ -78,7 +78,7 @@ const char* const MemoryDumpManager::kSystemAllocatorP
@@ -82,7 +82,7 @@ const char* const MemoryDumpManager::kSystemAllocatorP
#if defined(MALLOC_MEMORY_TRACING_SUPPORTED)
MallocDumpProvider::kAllocatedObjects;
#else
Expand Down

0 comments on commit 653b1b2

Please sign in to comment.