diff --git a/tur-chromium/chromium-stable/0006-compiler-use-custom-libcxx-for-v8.patch b/tur-chromium/chromium-stable/0003-compiler-use-custom-libcxx-for-v8.patch similarity index 100% rename from tur-chromium/chromium-stable/0006-compiler-use-custom-libcxx-for-v8.patch rename to tur-chromium/chromium-stable/0003-compiler-use-custom-libcxx-for-v8.patch diff --git a/tur-chromium/chromium-stable/0003-script-add-ld-preload.patch b/tur-chromium/chromium-stable/0003-script-add-ld-preload.patch deleted file mode 100644 index db109c4..0000000 --- a/tur-chromium/chromium-stable/0003-script-add-ld-preload.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/build/gn_run_binary.py -+++ b/build/gn_run_binary.py -@@ -23,7 +23,19 @@ - # The rest of the arguments are passed directly to the executable. - args = [path] + sys.argv[2:] - --ret = subprocess.call(args) -+# Modified by Termux: When building for termux, this wrapper will -+# be used to run the binary which is built for host machine, using -+# the rootfs provided by Google. We need to set LD_PRELOAD with -+# libffi.so.7 as the host machine (Ubuntu 24.04) doesn't provide it. -+envs = os.environ.copy() -+if "./clang_x86_v8_arm/" in path or "./clang_x86/" in path: -+ base_sysroot = os.path.join(os.path.dirname(__file__), "linux", "debian_bullseye_i386-sysroot") -+ envs["LD_PRELOAD"] = base_sysroot + "/usr/lib/i386-linux-gnu/libffi.so.7" -+elif "./host/" in path or "./clang_x64_v8_arm64/" in path or "./clang_x64/" in path: -+ base_sysroot = os.path.join(os.path.dirname(__file__), "linux", "debian_bullseye_amd64-sysroot") -+ envs["LD_PRELOAD"] = base_sysroot + "/usr/lib/x86_64-linux-gnu/libffi.so.7" -+ -+ret = subprocess.call(args, env=envs) - if ret != 0: - if ret <= -100: - # Windows error codes such as 0xC0000005 and 0xC0000409 are much easier to diff --git a/tur-chromium/chromium-stable/1504-v8-memfd_create.patch b/tur-chromium/chromium-stable/1502-v8-memfd_create.patch similarity index 100% rename from tur-chromium/chromium-stable/1504-v8-memfd_create.patch rename to tur-chromium/chromium-stable/1502-v8-memfd_create.patch diff --git a/tur-chromium/chromium-stable/1502-v8-reimpl-page-allocator.patch b/tur-chromium/chromium-stable/1502-v8-reimpl-page-allocator.patch deleted file mode 100644 index 41fd83c..0000000 --- a/tur-chromium/chromium-stable/1502-v8-reimpl-page-allocator.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/v8/include/v8-platform.h -+++ b/v8/include/v8-platform.h -@@ -925,7 +925,9 @@ - * Allows the embedder to manage memory page allocations. - * Returning nullptr will cause V8 to use the default page allocator. - */ -- virtual PageAllocator* GetPageAllocator() = 0; -+ virtual PageAllocator* GetPageAllocator() { -+ return nullptr; -+ } - - /** - * Allows the embedder to specify a custom allocator used for zones. diff --git a/tur-chromium/chromium-stable/7007-ranges-base-container-to_value_list.patch b/tur-chromium/chromium-stable/7007-ranges-base-container-to_value_list.patch new file mode 100644 index 0000000..a814e53 --- /dev/null +++ b/tur-chromium/chromium-stable/7007-ranges-base-container-to_value_list.patch @@ -0,0 +1,18 @@ +--- a/base/containers/to_value_list.h ++++ b/base/containers/to_value_list.h +@@ -34,10 +34,11 @@ + std::indirect_result_t>> + Value::List ToValueList(Range&& range, Proj proj = {}) { + auto container = Value::List::with_capacity(std::ranges::size(range)); +- std::ranges::for_each( +- std::forward(range), +- [&](T&& value) { container.Append(std::forward(value)); }, +- std::move(proj)); ++ auto func = [&](T&& value) { container.Append(std::forward(value)); }; ++ auto first = std::ranges::begin(range); ++ auto last = std::ranges::end(range); ++ for (; first != last; ++first) ++ std::invoke(func, std::invoke(proj, *first)); + return container; + } + diff --git a/tur-chromium/chromium-stable/build.sh b/tur-chromium/chromium-stable/build.sh index d51377e..944e8ca 100644 --- a/tur-chromium/chromium-stable/build.sh +++ b/tur-chromium/chromium-stable/build.sh @@ -2,10 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://www.chromium.org/Home TERMUX_PKG_DESCRIPTION="Chromium web browser" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="Chongyun Lee " -TERMUX_PKG_VERSION=133.0.6943.141 +TERMUX_PKG_VERSION=134.0.6998.165 TERMUX_PKG_SRCURL=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$TERMUX_PKG_VERSION.tar.xz -TERMUX_PKG_SHA256=0b3b15aa03f128a6b3d7ff67a7492bfaa2ffbb4acd80664b9ff320fd470c68be +TERMUX_PKG_SHA256=6c2f2a4fca77f6428171215ffd688e68a09849b75fae43aed980a5f77eeb097d TERMUX_PKG_DEPENDS="atk, cups, dbus, fontconfig, gtk3, krb5, libc++, libdrm, libevdev, libxkbcommon, libminizip, libnss, libwayland, libx11, mesa, openssl, pango, pulseaudio, zlib" +TERMUX_PKG_BUILD_DEPENDS="libffi-static" # Chromium doesn't support i686 on Linux. TERMUX_PKG_EXCLUDED_ARCHES="i686" @@ -156,7 +157,7 @@ treat_warnings_as_errors = false # Use system libraries as little as possible use_system_freetype = false # use_system_libdrm = true -use_system_libffi = true +use_system_libffi = false use_custom_libcxx = false use_custom_libcxx_for_host = true use_allocator_shim = false @@ -182,7 +183,8 @@ angle_enable_abseil = false is_component_ffmpeg = true ffmpeg_branding = \"Chrome\" proprietary_codecs = true -use_qt = false +use_qt5 = false +use_qt6 = false use_libpci = false use_alsa = false use_pulseaudio = true