From bae3f5b7543b30205ea679364f07f43bb565dea3 Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Sat, 30 Nov 2024 14:12:20 +0800 Subject: [PATCH 1/4] chromium-stable: bump to 127.0.6533.119 --- ...rors-when-allocator-shim-is-disabled.patch | 21 ---------- ...-unity-fix-dynamic-loaded-libraries.patch} | 0 .../1703-swiftshader-no-android.patch | 38 +++++++++---------- .../2017-vk-layers-no-android-log.patch | 16 ++++---- ...play_color_management-include-string.patch | 10 ----- ...ent_data_iterator-use-std_nullptr_t.patch} | 0 ...preview_cancel_reason-include-string.patch | 11 ------ tur-chromium/chromium-stable/build.sh | 20 ++++------ tur-chromium/chromium-stable/toolchain.gn.in | 2 - 9 files changed, 35 insertions(+), 83 deletions(-) delete mode 100644 tur-chromium/chromium-stable/1014-chromium-fix-compile-errors-when-allocator-shim-is-disabled.patch rename tur-chromium/chromium-stable/{1021-chromium-unity-fix-dynamic-loaded-libraries.patch => 1014-chromium-unity-fix-dynamic-loaded-libraries.patch} (100%) delete mode 100644 tur-chromium/chromium-stable/8002-display_color_management-include-string.patch rename tur-chromium/chromium-stable/{8006-fragment_data_iterator-use-std_nullptr_t.patch => 8002-fragment_data_iterator-use-std_nullptr_t.patch} (100%) delete mode 100644 tur-chromium/chromium-stable/8005-preview_cancel_reason-include-string.patch diff --git a/tur-chromium/chromium-stable/1014-chromium-fix-compile-errors-when-allocator-shim-is-disabled.patch b/tur-chromium/chromium-stable/1014-chromium-fix-compile-errors-when-allocator-shim-is-disabled.patch deleted file mode 100644 index bd7e7c3..0000000 --- a/tur-chromium/chromium-stable/1014-chromium-fix-compile-errors-when-allocator-shim-is-disabled.patch +++ /dev/null @@ -1,21 +0,0 @@ -Origin: https://bitbucket.org/chromiumembedded/cef/pull-requests/380/linux-fix-compile-errors-when-allocator - ---- a/base/process/memory_linux.cc -+++ b/base/process/memory_linux.cc -@@ -18,6 +18,16 @@ - #include "base/threading/thread_restrictions.h" - #include "build/build_config.h" - -+#if !BUILDFLAG(USE_ALLOCATOR_SHIM) && defined(LIBC_GLIBC) -+extern "C" { -+void* __libc_malloc(size_t size); -+void* __libc_calloc(size_t n, size_t size); -+void* __libc_realloc(void* address, size_t size); -+void* __libc_memalign(size_t alignment, size_t size); -+void __libc_free(void* ptr); -+} // extern "C" -+#endif -+ - namespace base { - - namespace { diff --git a/tur-chromium/chromium-stable/1021-chromium-unity-fix-dynamic-loaded-libraries.patch b/tur-chromium/chromium-stable/1014-chromium-unity-fix-dynamic-loaded-libraries.patch similarity index 100% rename from tur-chromium/chromium-stable/1021-chromium-unity-fix-dynamic-loaded-libraries.patch rename to tur-chromium/chromium-stable/1014-chromium-unity-fix-dynamic-loaded-libraries.patch diff --git a/tur-chromium/chromium-stable/1703-swiftshader-no-android.patch b/tur-chromium/chromium-stable/1703-swiftshader-no-android.patch index 8893b0b..45d0444 100644 --- a/tur-chromium/chromium-stable/1703-swiftshader-no-android.patch +++ b/tur-chromium/chromium-stable/1703-swiftshader-no-android.patch @@ -193,7 +193,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift # include # include "commit.h" -@@ -104,7 +104,7 @@ +@@ -105,7 +105,7 @@ namespace { // Enable commit_id.py and #include commit.h for other platforms. @@ -202,7 +202,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift void logBuildVersionInformation() { // TODO(b/144093703): Don't call __android_log_print() directly -@@ -139,7 +139,7 @@ +@@ -140,7 +140,7 @@ void initializeLibrary() { static bool doOnce = [] { @@ -211,7 +211,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift logBuildVersionInformation(); #endif // __ANDROID__ && ENABLE_BUILD_VERSION_OUTPUT return true; -@@ -286,7 +286,7 @@ +@@ -322,7 +322,7 @@ { { VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_SPEC_VERSION } }, { { VK_EXT_DEBUG_UTILS_EXTENSION_NAME, VK_EXT_DEBUG_UTILS_SPEC_VERSION } }, { { VK_EXT_HEADLESS_SURFACE_EXTENSION_NAME, VK_EXT_HEADLESS_SURFACE_SPEC_VERSION } }, @@ -220,7 +220,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift { { VK_KHR_SURFACE_EXTENSION_NAME, VK_KHR_SURFACE_SPEC_VERSION } }, { { VK_EXT_SURFACE_MAINTENANCE_1_EXTENSION_NAME, VK_EXT_SURFACE_MAINTENANCE_1_SPEC_VERSION } }, { { VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME, VK_KHR_GET_SURFACE_CAPABILITIES_2_SPEC_VERSION } }, -@@ -340,7 +340,7 @@ +@@ -376,7 +376,7 @@ // Only 1.1 core version of this is supported. The extension has additional requirements //{{ VK_KHR_VARIABLE_POINTERS_EXTENSION_NAME, VK_KHR_VARIABLE_POINTERS_SPEC_VERSION }}, { { VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME, VK_EXT_QUEUE_FAMILY_FOREIGN_SPEC_VERSION } }, @@ -229,16 +229,16 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift // We fully support the KHR_swapchain v70 additions, so just track the spec version. { { VK_KHR_SWAPCHAIN_EXTENSION_NAME, VK_KHR_SWAPCHAIN_SPEC_VERSION } }, #else -@@ -416,7 +416,7 @@ +@@ -449,7 +449,7 @@ + { { VK_KHR_VULKAN_MEMORY_MODEL_EXTENSION_NAME, VK_KHR_VULKAN_MEMORY_MODEL_SPEC_VERSION } }, { { VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME, VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_SPEC_VERSION } }, - { { VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_EXTENSION_NAME, VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_SPEC_VERSION } }, { { VK_KHR_PIPELINE_LIBRARY_EXTENSION_NAME, VK_KHR_PIPELINE_LIBRARY_SPEC_VERSION } }, -#ifndef __ANDROID__ +#if !(defined(__ANDROID__) && !defined(__TERMUX__)) + { { VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_EXTENSION_NAME, VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_SPEC_VERSION } }, { { VK_EXT_SWAPCHAIN_MAINTENANCE_1_EXTENSION_NAME, VK_EXT_SWAPCHAIN_MAINTENANCE_1_SPEC_VERSION } }, #endif - { { VK_EXT_GRAPHICS_PIPELINE_LIBRARY_EXTENSION_NAME, VK_EXT_GRAPHICS_PIPELINE_LIBRARY_SPEC_VERSION } }, -@@ -1952,7 +1952,7 @@ +@@ -2038,7 +2038,7 @@ const VkBaseInStructure *extensionCreateInfo = reinterpret_cast(pCreateInfo->pNext); @@ -247,7 +247,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift vk::BackingMemory backmem; bool swapchainImage = false; #endif -@@ -1963,7 +1963,7 @@ +@@ -2049,7 +2049,7 @@ // VK_STRUCTURE_TYPE_NATIVE_BUFFER_ANDROID, are not enumerated in the official Vulkan headers. switch((int)(extensionCreateInfo->sType)) { @@ -256,7 +256,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift case VK_STRUCTURE_TYPE_SWAPCHAIN_IMAGE_CREATE_INFO_ANDROID: { const VkSwapchainImageCreateInfoANDROID *swapImageCreateInfo = reinterpret_cast(extensionCreateInfo); -@@ -2023,7 +2023,7 @@ +@@ -2109,7 +2109,7 @@ VkResult result = vk::Image::Create(pAllocator, pCreateInfo, pImage, vk::Cast(device)); @@ -265,7 +265,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift if(swapchainImage) { if(result != VK_SUCCESS) -@@ -2061,7 +2061,7 @@ +@@ -2147,7 +2147,7 @@ TRACE("(VkDevice device = %p, VkImage image = %p, const VkAllocationCallbacks* pAllocator = %p)", device, static_cast(image), pAllocator); @@ -274,7 +274,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift vk::Image *img = vk::Cast(image); if(img && img->hasExternalMemory()) { -@@ -3473,7 +3473,7 @@ +@@ -3573,7 +3573,7 @@ /* Do nothing */ break; @@ -283,7 +283,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift case VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHR: { const auto *swapchainInfo = reinterpret_cast(extInfo); -@@ -3683,7 +3683,7 @@ +@@ -3783,7 +3783,7 @@ vk::Cast(physicalDevice)->getProperties(properties); } break; @@ -292,7 +292,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENTATION_PROPERTIES_ANDROID: { auto *properties = reinterpret_cast(extensionProperties); -@@ -3902,7 +3902,7 @@ +@@ -4002,7 +4002,7 @@ VkBaseOutStructure *extensionProperties = reinterpret_cast(pImageFormatProperties->pNext); @@ -301,7 +301,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift bool hasAHBUsage = false; #endif -@@ -3936,7 +3936,7 @@ +@@ -4036,7 +4036,7 @@ properties->identicalMemoryLayout = VK_TRUE; } break; @@ -310,7 +310,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift case VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_USAGE_ANDROID: { auto *properties = reinterpret_cast(extensionProperties); -@@ -3966,7 +3966,7 @@ +@@ -4066,7 +4066,7 @@ vk::Cast(physicalDevice)->getImageFormatProperties(format, type, tiling, usage, flags, &pImageFormatProperties->imageFormatProperties); @@ -319,7 +319,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift if(hasAHBUsage) { // AHardwareBuffer_lock may only be called with a single layer. -@@ -4089,7 +4089,7 @@ +@@ -4189,7 +4189,7 @@ { switch(extInfo->sType) { @@ -328,7 +328,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift case VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_ANDROID: break; #endif -@@ -4603,7 +4603,7 @@ +@@ -4703,7 +4703,7 @@ return vk::HeadlessSurfaceKHR::Create(pAllocator, pCreateInfo, pSurface); } @@ -337,7 +337,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift VKAPI_ATTR void VKAPI_CALL vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, const VkAllocationCallbacks *pAllocator) { TRACE("(VkInstance instance = %p, VkSurfaceKHR surface = %p, const VkAllocationCallbacks* pAllocator = %p)", -@@ -4821,7 +4821,7 @@ +@@ -4921,7 +4921,7 @@ #endif // ! __ANDROID__ diff --git a/tur-chromium/chromium-stable/2017-vk-layers-no-android-log.patch b/tur-chromium/chromium-stable/2017-vk-layers-no-android-log.patch index 0f6d099..a6c1497 100644 --- a/tur-chromium/chromium-stable/2017-vk-layers-no-android-log.patch +++ b/tur-chromium/chromium-stable/2017-vk-layers-no-android-log.patch @@ -1,5 +1,5 @@ ---- a/third_party/vulkan-deps/vulkan-validation-layers/src/layers/error_message/logging.h -+++ b/third_party/vulkan-deps/vulkan-validation-layers/src/layers/error_message/logging.h +--- a/third_party/vulkan-validation-layers/src/layers/error_message/logging.h ++++ b/third_party/vulkan-validation-layers/src/layers/error_message/logging.h @@ -33,7 +33,7 @@ #include "generated/vk_layer_dispatch_table.h" #include "generated/vk_object_types.h" @@ -9,8 +9,8 @@ #include #define LOGCONSOLE(...) ((void)__android_log_print(ANDROID_LOG_INFO, "VALIDATION", __VA_ARGS__)) [[maybe_unused]] static const char *kForceDefaultCallbackKey = "debug.vvl.forcelayerlog"; ---- a/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_layer_config.cpp -+++ b/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_layer_config.cpp +--- a/third_party/vulkan-validation-layers/src/layers/vk_layer_config.cpp ++++ b/third_party/vulkan-validation-layers/src/layers/vk_layer_config.cpp @@ -74,7 +74,7 @@ #endif @@ -20,8 +20,8 @@ const char *output = getenv(variable); return output == NULL ? "" : output; #elif defined(_WIN32) ---- a/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/android_ndk_types.h -+++ b/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/android_ndk_types.h +--- a/third_party/vulkan-validation-layers/src/layers/utils/android_ndk_types.h ++++ b/third_party/vulkan-validation-layers/src/layers/utils/android_ndk_types.h @@ -29,7 +29,9 @@ #pragma once @@ -33,8 +33,8 @@ #error "VK_USE_PLATFORM_ANDROID_KHR not defined for Android build!" #endif ---- a/third_party/vulkan-deps/vulkan-utility-libraries/src/src/layer/layer_settings_manager.cpp -+++ b/third_party/vulkan-deps/vulkan-utility-libraries/src/src/layer/layer_settings_manager.cpp +--- a/third_party/vulkan-utility-libraries/src/src/layer/layer_settings_manager.cpp ++++ b/third_party/vulkan-utility-libraries/src/src/layer/layer_settings_manager.cpp @@ -32,7 +32,7 @@ #include #include diff --git a/tur-chromium/chromium-stable/8002-display_color_management-include-string.patch b/tur-chromium/chromium-stable/8002-display_color_management-include-string.patch deleted file mode 100644 index 724502d..0000000 --- a/tur-chromium/chromium-stable/8002-display_color_management-include-string.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/ui/display/types/display_color_management.h -+++ b/ui/display/types/display_color_management.h -@@ -5,6 +5,7 @@ - #define UI_DISPLAY_TYPES_DISPLAY_COLOR_MANAGEMENT_H_ - - #include -+#include - #include - - #include "third_party/skia/modules/skcms/skcms.h" diff --git a/tur-chromium/chromium-stable/8006-fragment_data_iterator-use-std_nullptr_t.patch b/tur-chromium/chromium-stable/8002-fragment_data_iterator-use-std_nullptr_t.patch similarity index 100% rename from tur-chromium/chromium-stable/8006-fragment_data_iterator-use-std_nullptr_t.patch rename to tur-chromium/chromium-stable/8002-fragment_data_iterator-use-std_nullptr_t.patch diff --git a/tur-chromium/chromium-stable/8005-preview_cancel_reason-include-string.patch b/tur-chromium/chromium-stable/8005-preview_cancel_reason-include-string.patch deleted file mode 100644 index 0835561..0000000 --- a/tur-chromium/chromium-stable/8005-preview_cancel_reason-include-string.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/content/public/browser/preview_cancel_reason.h -+++ b/content/public/browser/preview_cancel_reason.h -@@ -5,6 +5,8 @@ - #ifndef CONTENT_PUBLIC_BROWSER_PREVIEW_CANCEL_REASON_H_ - #define CONTENT_PUBLIC_BROWSER_PREVIEW_CANCEL_REASON_H_ - -+#include -+ - #include "content/common/content_export.h" - #include "third_party/abseil-cpp/absl/types/variant.h" - diff --git a/tur-chromium/chromium-stable/build.sh b/tur-chromium/chromium-stable/build.sh index b439c1a..f7005fd 100644 --- a/tur-chromium/chromium-stable/build.sh +++ b/tur-chromium/chromium-stable/build.sh @@ -2,12 +2,10 @@ 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=126.0.6478.182 +TERMUX_PKG_VERSION=127.0.6533.119 TERMUX_PKG_SRCURL=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$TERMUX_PKG_VERSION.tar.xz -TERMUX_PKG_SHA256=3939f5b3116ebd3cb15ff8c7059888f6b00f4cfa8a77bde983ee4ce5d0eea427 +TERMUX_PKG_SHA256=acc9e3f9fd2d180b8831865a1ac4f5cdd9ffe6211f47f467296d9ee1be2a577e TERMUX_PKG_DEPENDS="atk, cups, dbus, fontconfig, gtk3, krb5, libc++, libdrm, libevdev, libxkbcommon, libminizip, libnss, libwayland, libx11, mesa, openssl, pango, pulseaudio, zlib" -TERMUX_PKG_SUGGESTS="qt5-qtbase" -TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase, qt5-qtbase-cross-tools" # Chromium doesn't support i686 on Linux. TERMUX_PKG_BLACKLISTED_ARCHES="i686" @@ -17,6 +15,9 @@ SYSTEM_LIBRARIES=" libdrm fontconfig" termux_step_post_get_source() { python3 build/linux/unbundle/replace_gn_files.py --system-libraries \ $SYSTEM_LIBRARIES + + # Remove the source file to keep more space + rm -f "$TERMUX_PKG_CACHEDIR/chromium-$TERMUX_PKG_VERSION.tar.xz" } termux_step_configure() { @@ -48,9 +49,6 @@ termux_step_configure() { ln -s $_host_pkg_config $TERMUX_PKG_CACHEDIR/host-pkg-config-bin/pkg-config export PATH="$TERMUX_PKG_CACHEDIR/host-pkg-config-bin:$PATH" - # For qt build - export PATH="$TERMUX_PREFIX/opt/qt/cross/bin:$PATH" - # Install amd64 rootfs and deps env -i PATH="$PATH" sudo apt update env -i PATH="$PATH" sudo apt install lsb-release -yq @@ -197,7 +195,7 @@ angle_enable_abseil = false is_component_ffmpeg = true ffmpeg_branding = \"Chrome\" proprietary_codecs = true -use_qt = true +use_qt = false use_libpci = false use_alsa = false use_pulseaudio = true @@ -229,7 +227,6 @@ exclude_unwind_tables = false s|@HOST_AR@|$(command -v llvm-ar)|g s|@HOST_NM@|$(command -v llvm-nm)|g s|@HOST_IS_CLANG@|true|g - s|@HOST_USE_GOLD@|false|g s|@HOST_SYSROOT@|$_amd64_sysroot_path|g " $TERMUX_PKG_CACHEDIR/custom-toolchain/BUILD.gn sed -i "s|@V8_CC@|$_host_cc|g @@ -241,7 +238,6 @@ exclude_unwind_tables = false s|@V8_CURRENT_CPU@|$_v8_current_cpu|g s|@V8_V8_CURRENT_CPU@|$_target_cpu|g s|@V8_IS_CLANG@|true|g - s|@V8_USE_GOLD@|false|g s|@V8_SYSROOT@|$_v8_sysroot_path|g " $TERMUX_PKG_CACHEDIR/custom-toolchain/BUILD.gn @@ -253,7 +249,7 @@ exclude_unwind_tables = false termux_step_make() { cd $TERMUX_PKG_BUILDDIR - ninja -C out/Release chromedriver chrome chrome_crashpad_handler headless_shell + ninja -C out/Release chromedriver chrome chrome_crashpad_handler headless_shell -k 0 rm -rf "$TERMUX_PKG_CACHEDIR/sysroot-$TERMUX_ARCH" } @@ -306,7 +302,7 @@ termux_step_make_install() { libffmpeg.so # Qt - libqt5_shim.so + # libqt5_shim.so ) cp "${normal_files[@]/#/out/Release/}" "$TERMUX_PREFIX/opt/$TERMUX_PKG_NAME/" diff --git a/tur-chromium/chromium-stable/toolchain.gn.in b/tur-chromium/chromium-stable/toolchain.gn.in index 6c26578..2435138 100644 --- a/tur-chromium/chromium-stable/toolchain.gn.in +++ b/tur-chromium/chromium-stable/toolchain.gn.in @@ -11,7 +11,6 @@ gcc_toolchain("host") { current_os = "linux" current_cpu = "x64" is_clang = @HOST_IS_CLANG@ - use_gold = @HOST_USE_GOLD@ sysroot = "@HOST_SYSROOT@" } } @@ -26,7 +25,6 @@ gcc_toolchain("@V8_TOOLCHAIN_NAME@") { current_cpu = "@V8_CURRENT_CPU@" v8_current_cpu = "@V8_V8_CURRENT_CPU@" is_clang = @V8_IS_CLANG@ - use_gold = @V8_USE_GOLD@ sysroot = "@V8_SYSROOT@" } } From eb14b3efc38c15aa8f38715624a2fd81a2f333ae Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Sat, 30 Nov 2024 15:16:07 +0800 Subject: [PATCH 2/4] chromium-stable: bump to 128.0.6613.137 --- .../chromium-stable/1007-chromium-impl-sysinfo.patch | 4 ++-- .../2011-dawn-fix-dynamic-loaded-libraries.patch | 5 +++-- .../chromium-stable/2012-dawn-no-android-jni.patch | 7 ++++--- ...002-fragment_data_iterator-use-std_nullptr_t.patch | 11 ----------- ...8002-material_color_utilities-include-cmath.patch} | 0 tur-chromium/chromium-stable/build.sh | 4 ++-- 6 files changed, 11 insertions(+), 20 deletions(-) delete mode 100644 tur-chromium/chromium-stable/8002-fragment_data_iterator-use-std_nullptr_t.patch rename tur-chromium/chromium-stable/{8004-material_color_utilities-include-cmath.patch => 8002-material_color_utilities-include-cmath.patch} (100%) diff --git a/tur-chromium/chromium-stable/1007-chromium-impl-sysinfo.patch b/tur-chromium/chromium-stable/1007-chromium-impl-sysinfo.patch index 210ce4c..1e6f6ad 100644 --- a/tur-chromium/chromium-stable/1007-chromium-impl-sysinfo.patch +++ b/tur-chromium/chromium-stable/1007-chromium-impl-sysinfo.patch @@ -91,8 +91,8 @@ +} + +#endif // __TERMUX__ ---- ./base/system/sys_info.cc 2022-11-13 00:36:18.488042961 +0800 -+++ /home/uchkks/Desktop/sys_info.cc 2022-11-13 00:36:06.418042900 +0800 +--- a/base/system/sys_info.cc ++++ b/base/system/sys_info.cc @@ -94,7 +94,7 @@ #endif diff --git a/tur-chromium/chromium-stable/2011-dawn-fix-dynamic-loaded-libraries.patch b/tur-chromium/chromium-stable/2011-dawn-fix-dynamic-loaded-libraries.patch index 052979f..7b1bc50 100644 --- a/tur-chromium/chromium-stable/2011-dawn-fix-dynamic-loaded-libraries.patch +++ b/tur-chromium/chromium-stable/2011-dawn-fix-dynamic-loaded-libraries.patch @@ -1,6 +1,6 @@ --- a/third_party/dawn/src/dawn/native/X11Functions.cpp +++ b/third_party/dawn/src/dawn/native/X11Functions.cpp -@@ -17,12 +17,20 @@ +@@ -34,13 +34,21 @@ namespace dawn::native { X11Functions::X11Functions() { @@ -9,7 +9,8 @@ +#else if (!mX11Lib.Open("libX11.so.6") || !mX11Lib.GetProc(&xSetErrorHandler, "XSetErrorHandler") || +#endif - !mX11Lib.GetProc(&xGetWindowAttributes, "XGetWindowAttributes")) { + !mX11Lib.GetProc(&xGetWindowAttributes, "XGetWindowAttributes") || + !mX11Lib.GetProc(&xSynchronize, "XSynchronize")) { mX11Lib.Close(); } diff --git a/tur-chromium/chromium-stable/2012-dawn-no-android-jni.patch b/tur-chromium/chromium-stable/2012-dawn-no-android-jni.patch index ba5442d..b7f7b93 100644 --- a/tur-chromium/chromium-stable/2012-dawn-no-android-jni.patch +++ b/tur-chromium/chromium-stable/2012-dawn-no-android-jni.patch @@ -11,12 +11,13 @@ struct DAWN_NATIVE_EXPORT ExternalImageDescriptorAHardwareBuffer : ExternalImageDescriptorVk { --- a/third_party/dawn/src/dawn/common/Platform.h +++ b/third_party/dawn/src/dawn/common/Platform.h -@@ -48,7 +48,7 @@ +@@ -62,7 +62,8 @@ #elif defined(__linux__) #define DAWN_PLATFORM_IS_LINUX 1 #define DAWN_PLATFORM_IS_POSIX 1 -#if defined(__ANDROID__) ++#include +#if defined(__ANDROID__) && !defined(__TERMUX__) #define DAWN_PLATFORM_IS_ANDROID 1 - #endif - + #elif defined(DAWN_OS_CHROMEOS) + #define DAWN_PLATFORM_IS_CHROMEOS 1 diff --git a/tur-chromium/chromium-stable/8002-fragment_data_iterator-use-std_nullptr_t.patch b/tur-chromium/chromium-stable/8002-fragment_data_iterator-use-std_nullptr_t.patch deleted file mode 100644 index 40faddb..0000000 --- a/tur-chromium/chromium-stable/8002-fragment_data_iterator-use-std_nullptr_t.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/third_party/blink/renderer/core/paint/fragment_data_iterator.h -+++ b/third_party/blink/renderer/core/paint/fragment_data_iterator.h -@@ -21,7 +21,7 @@ - - public: - explicit FragmentDataIteratorBase(Head& head) : fragment_head_(head) {} -- explicit FragmentDataIteratorBase(nullptr_t) {} -+ explicit FragmentDataIteratorBase(std::nullptr_t) {} - - Data* GetFragmentData() const { - return !IsDone() ? &fragment_head_.at(idx_) : nullptr; diff --git a/tur-chromium/chromium-stable/8004-material_color_utilities-include-cmath.patch b/tur-chromium/chromium-stable/8002-material_color_utilities-include-cmath.patch similarity index 100% rename from tur-chromium/chromium-stable/8004-material_color_utilities-include-cmath.patch rename to tur-chromium/chromium-stable/8002-material_color_utilities-include-cmath.patch diff --git a/tur-chromium/chromium-stable/build.sh b/tur-chromium/chromium-stable/build.sh index f7005fd..d0012b9 100644 --- a/tur-chromium/chromium-stable/build.sh +++ b/tur-chromium/chromium-stable/build.sh @@ -2,9 +2,9 @@ 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=127.0.6533.119 +TERMUX_PKG_VERSION=128.0.6613.137 TERMUX_PKG_SRCURL=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$TERMUX_PKG_VERSION.tar.xz -TERMUX_PKG_SHA256=acc9e3f9fd2d180b8831865a1ac4f5cdd9ffe6211f47f467296d9ee1be2a577e +TERMUX_PKG_SHA256=e1d39c170dfdc2627a7b003e11d77f04a578b8e1cfe41e714cdaa345c91f4943 TERMUX_PKG_DEPENDS="atk, cups, dbus, fontconfig, gtk3, krb5, libc++, libdrm, libevdev, libxkbcommon, libminizip, libnss, libwayland, libx11, mesa, openssl, pango, pulseaudio, zlib" # Chromium doesn't support i686 on Linux. TERMUX_PKG_BLACKLISTED_ARCHES="i686" From 76772654fe33e70b72de5e4f933ebd956d6bb1ea Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 30 Nov 2024 21:32:40 +0800 Subject: [PATCH 3/4] chromium-stable: bump to 128.0.6668.100 --- .../1020-chromium-debug-build-stack_trace.patch | 11 +++++------ .../chromium-stable/1601-angle-no-android-jni.patch | 4 ++-- tur-chromium/chromium-stable/build.sh | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/tur-chromium/chromium-stable/1020-chromium-debug-build-stack_trace.patch b/tur-chromium/chromium-stable/1020-chromium-debug-build-stack_trace.patch index 67a5db8..4b8face 100644 --- a/tur-chromium/chromium-stable/1020-chromium-debug-build-stack_trace.patch +++ b/tur-chromium/chromium-stable/1020-chromium-debug-build-stack_trace.patch @@ -1,19 +1,18 @@ --- a/base/debug/stack_trace_posix.cc +++ b/base/debug/stack_trace_posix.cc -@@ -1062,14 +1062,14 @@ +@@ -1068,12 +1068,14 @@ #endif } -#if defined(HAVE_BACKTRACE) ++#if !defined(__UCLIBC__) && !defined(_AIX) void StackTrace::OutputToStreamWithPrefixImpl( std::ostream* os, cstring_view prefix_string) const { +#if defined(HAVE_BACKTRACE) StreamBacktraceOutputHandler handler(os); - ProcessBacktrace(trace_, count_, prefix_string, &handler); --} + ProcessBacktrace(addresses(), prefix_string, &handler); ++#endif + } #endif -+} - - namespace internal { diff --git a/tur-chromium/chromium-stable/1601-angle-no-android-jni.patch b/tur-chromium/chromium-stable/1601-angle-no-android-jni.patch index 5c582fb..e0fdd97 100644 --- a/tur-chromium/chromium-stable/1601-angle-no-android-jni.patch +++ b/tur-chromium/chromium-stable/1601-angle-no-android-jni.patch @@ -4,8 +4,8 @@ #elif defined(__APPLE__) # define ANGLE_PLATFORM_APPLE 1 # define ANGLE_PLATFORM_POSIX 1 --#elif defined(ANDROID) -+#elif (defined(ANDROID) && !defined(__TERMUX__)) +-#elif defined(ANDROID) && !defined(ANGLE_ANDROID_DMA_BUF) ++#elif (defined(ANDROID) && !defined(ANGLE_ANDROID_DMA_BUF) && !defined(__TERMUX__)) # define ANGLE_PLATFORM_ANDROID 1 # define ANGLE_PLATFORM_POSIX 1 #elif defined(__ggp__) diff --git a/tur-chromium/chromium-stable/build.sh b/tur-chromium/chromium-stable/build.sh index d0012b9..68d3339 100644 --- a/tur-chromium/chromium-stable/build.sh +++ b/tur-chromium/chromium-stable/build.sh @@ -2,9 +2,9 @@ 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=128.0.6613.137 +TERMUX_PKG_VERSION=129.0.6668.100 TERMUX_PKG_SRCURL=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$TERMUX_PKG_VERSION.tar.xz -TERMUX_PKG_SHA256=e1d39c170dfdc2627a7b003e11d77f04a578b8e1cfe41e714cdaa345c91f4943 +TERMUX_PKG_SHA256=281daed29a5cb546f6273130035d9980666d2232f356ad95fc06af3c90121bc2 TERMUX_PKG_DEPENDS="atk, cups, dbus, fontconfig, gtk3, krb5, libc++, libdrm, libevdev, libxkbcommon, libminizip, libnss, libwayland, libx11, mesa, openssl, pango, pulseaudio, zlib" # Chromium doesn't support i686 on Linux. TERMUX_PKG_BLACKLISTED_ARCHES="i686" From c5ce9378974e5ce16b044ac548f52b2629ae336e Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 1 Dec 2024 23:44:13 +0800 Subject: [PATCH 4/4] chromium-stable: bump to 130.0.6723.116 --- ...std_hardware_destructive_interference_size.patch | 13 +++++++++++++ .../chromium-stable/8004-blink-include-stack.patch | 10 ++++++++++ tur-chromium/chromium-stable/build.sh | 4 ++-- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 tur-chromium/chromium-stable/7003-disable-std_hardware_destructive_interference_size.patch create mode 100644 tur-chromium/chromium-stable/8004-blink-include-stack.patch diff --git a/tur-chromium/chromium-stable/7003-disable-std_hardware_destructive_interference_size.patch b/tur-chromium/chromium-stable/7003-disable-std_hardware_destructive_interference_size.patch new file mode 100644 index 0000000..37e2209 --- /dev/null +++ b/tur-chromium/chromium-stable/7003-disable-std_hardware_destructive_interference_size.patch @@ -0,0 +1,13 @@ +This reverts https://github.com/chromium/chromium/commit/fc838e8cc887adbe95110045d146b9d5885bf2a9. + +--- a/components/media_router/common/providers/cast/channel/enum_table.h ++++ b/components/media_router/common/providers/cast/channel/enum_table.h +@@ -368,7 +368,7 @@ + + private: + #ifdef ARCH_CPU_64_BITS +- alignas(std::hardware_destructive_interference_size) ++ alignas(64) + #endif + std::initializer_list data_; + bool is_sorted_; diff --git a/tur-chromium/chromium-stable/8004-blink-include-stack.patch b/tur-chromium/chromium-stable/8004-blink-include-stack.patch new file mode 100644 index 0000000..795ee41 --- /dev/null +++ b/tur-chromium/chromium-stable/8004-blink-include-stack.patch @@ -0,0 +1,10 @@ +--- a/third_party/blink/renderer/platform/image-decoders/skia/skia_image_decoder_base.cc ++++ b/third_party/blink/renderer/platform/image-decoders/skia/skia_image_decoder_base.cc +@@ -5,6 +5,7 @@ + #include "third_party/blink/renderer/platform/image-decoders/skia/skia_image_decoder_base.h" + + #include ++#include + + #include "third_party/blink/renderer/platform/image-decoders/segment_stream.h" + #include "third_party/skia/include/codec/SkCodec.h" diff --git a/tur-chromium/chromium-stable/build.sh b/tur-chromium/chromium-stable/build.sh index 68d3339..fbe756d 100644 --- a/tur-chromium/chromium-stable/build.sh +++ b/tur-chromium/chromium-stable/build.sh @@ -2,9 +2,9 @@ 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=129.0.6668.100 +TERMUX_PKG_VERSION=130.0.6723.116 TERMUX_PKG_SRCURL=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$TERMUX_PKG_VERSION.tar.xz -TERMUX_PKG_SHA256=281daed29a5cb546f6273130035d9980666d2232f356ad95fc06af3c90121bc2 +TERMUX_PKG_SHA256=968799e41158fdcc85af6f5547d3dd4730d6e51219e43aa2f1ab6ab5e00582ba TERMUX_PKG_DEPENDS="atk, cups, dbus, fontconfig, gtk3, krb5, libc++, libdrm, libevdev, libxkbcommon, libminizip, libnss, libwayland, libx11, mesa, openssl, pango, pulseaudio, zlib" # Chromium doesn't support i686 on Linux. TERMUX_PKG_BLACKLISTED_ARCHES="i686"