Skip to content

Commit

Permalink
www/iridium: update to 2023.01.109
Browse files Browse the repository at this point in the history
  • Loading branch information
rnagy authored and rene0 committed Jan 17, 2023
1 parent b1a6bd9 commit fbc179b
Show file tree
Hide file tree
Showing 305 changed files with 1,772 additions and 1,479 deletions.
10 changes: 5 additions & 5 deletions www/iridium/Makefile
@@ -1,6 +1,5 @@
PORTNAME= iridium
PORTVERSION= 2022.12.108.1
PORTREVISION= 1
PORTVERSION= 2023.01.109
CATEGORIES= www wayland
MASTER_SITES= https://downloads.iridiumbrowser.de/source/
PKGNAMESUFFIX= -browser
Expand All @@ -16,7 +15,7 @@ LICENSE_COMB= multi
ONLY_FOR_ARCHS= aarch64 amd64 i386

PATCH_SITES= https://nerd.hu/distfiles/
PATCHFILES+= disable-privacy-sandbox-352a8844b01a05a786ba76da599d106487f1533f.patch:-p1
PATCHFILES+= disable-privacy-sandbox-7f49edb924b6d2b38fcc9a2c76d4e5e1f857e7b9.patch:-p1

BUILD_DEPENDS= bash:shells/bash \
${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
Expand Down Expand Up @@ -98,6 +97,7 @@ BINARY_ALIAS= python3=${PYTHON_CMD} \
# OS "target_os == is_bsd", like libusb, libpci.
GN_ARGS+= clang_use_chrome_plugins=false \
chrome_pgo_phase=0 \
enable_backup_ref_ptr_support=false \
enable_hangout_services_extension=true \
enable_js_type_check=false \
enable_nacl=false \
Expand All @@ -108,19 +108,19 @@ GN_ARGS+= clang_use_chrome_plugins=false \
optimize_webui=true \
toolkit_views=true \
treat_warnings_as_errors=false \
use_allocator="none" \
use_allocator_shim=false \
use_aura=true \
use_custom_libcxx=false \
use_gnome_keyring=false \
use_lld=true \
use_partition_alloc=true \
use_partition_alloc_as_malloc=false \
use_sysroot=false \
use_system_freetype=false \
use_system_harfbuzz=true \
use_system_libjpeg=true \
use_system_libwayland=true \
use_system_wayland_scanner=true \
use_system_libwayland_server=true \
use_udev=false \
extra_cxxflags="${CXXFLAGS}" \
extra_ldflags="${LDFLAGS}"
Expand Down
10 changes: 5 additions & 5 deletions www/iridium/distinfo
@@ -1,5 +1,5 @@
TIMESTAMP = 1670314377
SHA256 (iridium-browser-2022.12.108.1.tar.xz) = bc8e923f3003a601a51daa0c5aa6d846742e000f86c7187c55369909bb7ce227
SIZE (iridium-browser-2022.12.108.1.tar.xz) = 1641474124
SHA256 (disable-privacy-sandbox-352a8844b01a05a786ba76da599d106487f1533f.patch) = 643103d1d8d8d57a0403a5f048cbbc15422e539f8334cde158e83530aa67257d
SIZE (disable-privacy-sandbox-352a8844b01a05a786ba76da599d106487f1533f.patch) = 4702
TIMESTAMP = 1673979574
SHA256 (iridium-browser-2023.01.109.tar.xz) = fb7612c88d0b997c51d427691f55d284369f2155d1a97ebca872c94ea8c93ac0
SIZE (iridium-browser-2023.01.109.tar.xz) = 1497700992
SHA256 (disable-privacy-sandbox-7f49edb924b6d2b38fcc9a2c76d4e5e1f857e7b9.patch) = 946f281504f7ce775a288f7d82371c2479d39e2e6c238f779aeeba1b821cbf07
SIZE (disable-privacy-sandbox-7f49edb924b6d2b38fcc9a2c76d4e5e1f857e7b9.patch) = 4702
20 changes: 10 additions & 10 deletions www/iridium/files/patch-BUILD.gn
@@ -1,6 +1,6 @@
--- BUILD.gn.orig 2022-12-06 08:09:13 UTC
--- BUILD.gn.orig 2023-01-17 19:19:00 UTC
+++ BUILD.gn
@@ -59,7 +59,7 @@ declare_args() {
@@ -60,7 +60,7 @@ declare_args() {
root_extra_deps = []
}

Expand All @@ -9,15 +9,15 @@
# An official (maximally optimized!) component (optimized for build times)
# build doesn't make sense and usually doesn't work.
assert(!is_component_build)
@@ -89,7 +89,6 @@ group("gn_all") {
@@ -90,7 +90,6 @@ group("gn_all") {
"//codelabs",
"//components:components_unittests",
"//components/gwp_asan:gwp_asan_unittests",
- "//infra/orchestrator:orchestrator_all",
"//net:net_unittests",
"//sandbox:sandbox_unittests",
"//services:services_unittests",
@@ -430,7 +429,7 @@ group("gn_all") {
@@ -434,7 +433,7 @@ group("gn_all") {
]
}

Expand All @@ -26,7 +26,7 @@
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
@@ -632,6 +631,15 @@ group("gn_all") {
@@ -637,6 +636,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",
@@ -680,7 +688,7 @@ group("gn_all") {
@@ -685,7 +693,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)" ]
}

@@ -1107,7 +1115,7 @@ if (!is_ios) {
@@ -1115,7 +1123,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") {
@@ -1202,7 +1210,7 @@ if (!is_ios) {
@@ -1211,7 +1219,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)" ]
}
@@ -1211,7 +1219,7 @@ if (!is_ios) {
@@ -1220,7 +1228,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)" ]
}

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

Expand Down
27 changes: 13 additions & 14 deletions www/iridium/files/patch-base_BUILD.gn
@@ -1,6 +1,6 @@
--- base/BUILD.gn.orig 2022-12-06 08:09:13 UTC
--- base/BUILD.gn.orig 2023-01-17 19:19:00 UTC
+++ base/BUILD.gn
@@ -163,7 +163,7 @@ buildflag_header("ios_cronet_buildflags") {
@@ -167,7 +167,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"
@@ -1048,7 +1048,7 @@ mixed_component("base") {
@@ -1059,7 +1059,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",
@@ -1059,6 +1059,14 @@ mixed_component("base") {
@@ -1070,6 +1070,14 @@ mixed_component("base") {
"profiler/thread_delegate_posix.h",
]
}
Expand All @@ -33,7 +33,7 @@
}

if (is_win) {
@@ -1559,11 +1567,23 @@ mixed_component("base") {
@@ -1569,11 +1577,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",
@@ -1591,7 +1611,7 @@ mixed_component("base") {
@@ -1601,7 +1621,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",
@@ -1645,7 +1665,7 @@ mixed_component("base") {
@@ -1655,7 +1675,7 @@ mixed_component("base") {

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

@@ -2218,6 +2238,42 @@ mixed_component("base") {
@@ -2238,6 +2258,41 @@ mixed_component("base") {
}
}

+ if (is_bsd) {
+ sources -= [
+ "files/file_path_watcher_inotify.cc",
+ "files/file_util_linux.cc",
+ "files/scoped_file_linux.cc",
+ "process/memory_linux.cc",
+ "process/process_linux.cc",
Expand Down Expand Up @@ -119,7 +118,7 @@
# iOS
if (is_ios) {
sources -= [
@@ -2315,7 +2371,7 @@ mixed_component("base") {
@@ -2335,7 +2390,7 @@ mixed_component("base") {
}

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

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

Expand All @@ -137,7 +136,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
@@ -3629,7 +3685,7 @@ test("base_unittests") {
@@ -3651,7 +3706,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
Expand All @@ -146,7 +145,7 @@
sources += [
"profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
@@ -3640,7 +3696,7 @@ test("base_unittests") {
@@ -3662,7 +3717,7 @@ test("base_unittests") {

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

@@ -3832,7 +3888,7 @@ test("base_unittests") {
@@ -3869,7 +3924,7 @@ test("base_unittests") {
}
}

Expand Down
@@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-12-06 08:09:13 UTC
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-01-17 19:19:00 UTC
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
@@ -356,8 +356,12 @@ bool TryRecommitSystemPagesInternal(
@@ -370,8 +370,12 @@ bool TryRecommitSystemPagesInternal(

void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
void* ptr = reinterpret_cast<void*>(address);
Expand Down
@@ -1,8 +1,8 @@
--- base/allocator/partition_allocator/partition_address_space.cc.orig 2022-12-06 08:09:13 UTC
--- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-01-17 19:19:00 UTC
+++ base/allocator/partition_allocator/partition_address_space.cc
@@ -294,7 +294,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT
setup_.configurable_pool_base_mask_ = 0;
@@ -432,7 +432,7 @@ void PartitionAddressSpace::UninitPkeyPoolForTesting()
}
#endif

-#if BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
Expand Down
@@ -0,0 +1,11 @@
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-01-17 19:19:00 UTC
+++ base/allocator/partition_allocator/partition_alloc.gni
@@ -121,7 +121,7 @@ assert(
"Missing dangling pointer checks feature for its performance experiment")

declare_args() {
- enable_pkeys = is_linux && target_cpu == "x64"
+ enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64"
}
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 2022-12-01 10:35:46 UTC
--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-01-17 19:19:00 UTC
+++ base/allocator/partition_allocator/partition_alloc_config.h
@@ -76,7 +76,7 @@ static_assert(sizeof(void*) != 8, "");
@@ -84,7 +84,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 @@
#define PA_HAS_LINUX_KERNEL
#endif

@@ -197,7 +197,7 @@ constexpr bool kUseLazyCommit = false;
@@ -216,7 +216,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.
Expand All @@ -18,7 +18,7 @@
#define PA_HAS_ATFORK_HANDLER
#endif

@@ -238,7 +238,7 @@ constexpr bool kUseLazyCommit = false;
@@ -257,7 +257,7 @@ constexpr bool kUseLazyCommit = false;
//
// Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to
// larger slot spans.
Expand Down
@@ -1,4 +1,4 @@
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-12-06 08:09:13 UTC
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-01-17 19:19:00 UTC
+++ base/allocator/partition_allocator/partition_alloc_constants.h
@@ -91,7 +91,7 @@ PartitionPageShift() {
return 18; // 256 KiB
Expand All @@ -9,7 +9,7 @@
PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t
PartitionPageShift() {
return PageAllocationGranularityShift() + 2;
@@ -270,7 +270,7 @@ constexpr size_t kNumPools = 3;
@@ -274,7 +274,7 @@ constexpr size_t kNumPools = 3;
// Special-case Android and iOS, which incur test failures with larger
// pools. Regardless, allocating >8GiB with malloc() on these platforms is
// unrealistic as of 2022.
Expand Down
@@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_root.cc.orig 2022-12-01 10:35:46 UTC
--- base/allocator/partition_allocator/partition_root.cc.orig 2023-01-17 19:19:00 UTC
+++ base/allocator/partition_allocator/partition_root.cc
@@ -41,7 +41,7 @@
@@ -42,7 +42,7 @@
#include "wow64apiset.h"
#endif

Expand All @@ -9,7 +9,7 @@
#include <pthread.h>
#endif

@@ -238,7 +238,7 @@ void PartitionAllocMallocInitOnce() {
@@ -239,7 +239,7 @@ void PartitionAllocMallocInitOnce() {
if (!g_global_init_called.compare_exchange_strong(expected, true))
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.
@@ -331,7 +331,7 @@ static size_t PartitionPurgeSlotSpan(
@@ -332,7 +332,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
@@ -734,7 +734,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
@@ -789,7 +789,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
11 changes: 0 additions & 11 deletions www/iridium/files/patch-base_cpu.h

This file was deleted.

6 changes: 3 additions & 3 deletions www/iridium/files/patch-base_files_file__util__unittest.cc
@@ -1,6 +1,6 @@
--- base/files/file_util_unittest.cc.orig 2022-12-01 10:35:46 UTC
--- base/files/file_util_unittest.cc.orig 2023-01-17 19:19:00 UTC
+++ base/files/file_util_unittest.cc
@@ -3549,7 +3549,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
@@ -3558,7 +3558,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
}
#endif // BUILDFLAG(IS_WIN)

Expand All @@ -9,7 +9,7 @@
TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) {
FilePath file_path("/proc/cpuinfo");
std::string data = "temp";
@@ -4272,7 +4272,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
@@ -4281,7 +4281,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
NULL);
#else
size_t bytes_written =
Expand Down

0 comments on commit fbc179b

Please sign in to comment.