Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

38 changes: 19 additions & 19 deletions tur-chromium/chromium-stable/1703-swiftshader-no-android.patch
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
# include <unistd.h>

# include "commit.h"
@@ -104,7 +104,7 @@
@@ -105,7 +105,7 @@
namespace {

// Enable commit_id.py and #include commit.h for other platforms.
Expand All @@ -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 = [] {
Expand All @@ -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 } },
Expand All @@ -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 } },
Expand All @@ -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<const VkBaseInStructure *>(pCreateInfo->pNext);

Expand All @@ -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))
{
Expand All @@ -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<const VkSwapchainImageCreateInfoANDROID *>(extensionCreateInfo);
@@ -2023,7 +2023,7 @@
@@ -2109,7 +2109,7 @@

VkResult result = vk::Image::Create(pAllocator, pCreateInfo, pImage, vk::Cast(device));

Expand All @@ -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<void *>(image), pAllocator);

Expand All @@ -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;

Expand All @@ -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<const VkBindImageMemorySwapchainInfoKHR *>(extInfo);
@@ -3683,7 +3683,7 @@
@@ -3783,7 +3783,7 @@
vk::Cast(physicalDevice)->getProperties(properties);
}
break;
Expand All @@ -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<VkPhysicalDevicePresentationPropertiesANDROID *>(extensionProperties);
@@ -3902,7 +3902,7 @@
@@ -4002,7 +4002,7 @@

VkBaseOutStructure *extensionProperties = reinterpret_cast<VkBaseOutStructure *>(pImageFormatProperties->pNext);

Expand All @@ -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;
Expand All @@ -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<VkAndroidHardwareBufferUsageANDROID *>(extensionProperties);
@@ -3966,7 +3966,7 @@
@@ -4066,7 +4066,7 @@

vk::Cast(physicalDevice)->getImageFormatProperties(format, type, tiling, usage, flags, &pImageFormatProperties->imageFormatProperties);

Expand All @@ -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)
{
Expand All @@ -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);
}

Expand All @@ -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__

Expand Down
16 changes: 8 additions & 8 deletions tur-chromium/chromium-stable/2017-vk-layers-no-android-log.patch
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -9,8 +9,8 @@
#include <android/log.h>
#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

Expand All @@ -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
Expand All @@ -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 <array>
#include <algorithm>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
https://gitlab.exherbo.org/exherbo/desktop/-/blob/1748a1d4115bc19fb15e1bd6e581509238b7003e/packages/net-www/chromium-beta/files/chromium-browser-ui-missing-deps.patch
https://issues.chromium.org/issues/351157339

Source: Tom Briden <[email protected]>
Upstream: No

diff --git a/chrome/browser/ui/views/side_panel/BUILD.gn b/chrome/browser/ui/views/side_panel/BUILD.gn
index ea57f9b16f6b8..20d8681ee9af2 100644
--- a/chrome/browser/ui/views/side_panel/BUILD.gn
+++ b/chrome/browser/ui/views/side_panel/BUILD.gn
@@ -142,18 +142,30 @@ static_library("side_panel") {
}
public_deps = [
"//base",
+ "//chrome/browser/cart:mojo_bindings",
"//chrome/browser/companion/core/mojom:mojo_bindings",
"//chrome/browser/profiles:profile",
"//chrome/browser/ui/actions:actions_headers",
"//chrome/browser/ui/color:color_headers",
+ "//chrome/browser/ui/webui/side_panel/customize_chrome:mojo_bindings",
+ "//chrome/browser/ui/webui/side_panel/bookmarks:mojo_bindings",
"//chrome/browser/ui/webui/side_panel/performance_controls:mojo_bindings",
+ "//chrome/browser/ui/webui/side_panel/reading_list:mojo_bindings",
+ "//chrome/browser/ui:webui_name_variants",
"//chrome/common",
"//chrome/common/accessibility:mojo_bindings",
+ "//chrome/common/companion:mojo_bindings",
+ "//components/enterprise/buildflags:buildflags",
+ "//components/enterprise/common/proto:connectors_proto",
"//components/lens",
"//components/lens:buildflags",
"//components/omnibox/browser",
+ "//components/page_image_service/mojom:mojo_bindings",
+ "//components/paint_preview/buildflags:buildflags",
"//components/prefs",
"//components/search_engines",
+ "//components/segmentation_platform/public/proto:proto",
+ "//components/webapps/common:mojo_bindings",
"//content/public/browser",
"//extensions/browser",
"//extensions/common",
@@ -165,6 +177,8 @@ static_library("side_panel") {
"//ui/gfx/geometry",
"//ui/views",
"//ui/views/controls/webview",
+ "//ui/webui/resources/cr_components/commerce:mojo_bindings",
+ "//ui/webui/resources/cr_components/help_bubble:mojo_bindings",
"//url",
]
deps = [
diff --git a/chrome/browser/ui/webui/top_chrome/BUILD.gn b/chrome/browser/ui/webui/top_chrome/BUILD.gn
index 5830f1f5e234a..6749b8fd0da56 100644
--- a/chrome/browser/ui/webui/top_chrome/BUILD.gn
+++ b/chrome/browser/ui/webui/top_chrome/BUILD.gn
@@ -19,6 +19,7 @@ source_set("top_chrome") {
deps = [
"//base",
"//chrome/browser/profiles:profile",
+ "//chrome/browser/ui:webui_name_variants",
"//components/site_engagement/content:content",
"//content/public/browser",
"//ui/webui",

This file was deleted.

20 changes: 8 additions & 12 deletions tur-chromium/chromium-stable/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>"
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"

Expand All @@ -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() {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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"
}

Expand Down Expand Up @@ -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/"
Expand Down
2 changes: 0 additions & 2 deletions tur-chromium/chromium-stable/toolchain.gn.in
Original file line number Diff line number Diff line change
Expand Up @@ -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@"
}
}
Expand All @@ -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@"
}
}
Loading