summaryrefslogtreecommitdiff
path: root/www-client/chromium
diff options
context:
space:
mode:
Diffstat (limited to 'www-client/chromium')
-rw-r--r--www-client/chromium/Manifest4
-rw-r--r--www-client/chromium/files/chromium-114-remove-evdev-dep.patch47
-rw-r--r--www-client/chromium/files/chromium-115-binutils-2.41.patch76
-rw-r--r--www-client/chromium/files/chromium-98-gtk4-build.patch56
-rw-r--r--www-client/chromium/files/chromium-qt6.patch106
5 files changed, 0 insertions, 289 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index e7fd8f2e5576..70acdc58be66 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,13 +1,9 @@
AUX chromium-108-EnumTable-crash.patch 2974 BLAKE2B b2d58b6b2b67b3bc2f04662749c3fd77b019356a6f9eaaad154cdae03e63f52c3bfa8bb0ed90467ac0806c58f6a2e7a351fd48c7e7a5e9b7ab317b4b8e2a75cb SHA512 3419e3dd6da21c8791d1335170547b3ac9fca593fe8eb01e17dd3eb916e6795a32848c4762051558cf98d0379592910ff9b267f05fd6b3c83d5e1c1073ba717c
AUX chromium-109-system-zlib.patch 440 BLAKE2B 95bb1099055e3e0e122d4d8a77cddec0a3417b3d87ef252d7a475f6be23b16f587ec627c90bac41d743bd9dc07488edccb0946ed465f2244b61adc44cd19761d SHA512 b4e386613eb2a0dd61af40bb29621356085e183b97d830661e5157e4f22c2ada5606d80e56d5a65fb2985cdffb505a878c32bdafb081b1fa24cbe976c7b60b86
AUX chromium-111-InkDropHost-crash.patch 1066 BLAKE2B ee0b42803a59ef4731e4f316849c2062870b92040ff4e339c3f3f2562999b54fa3176b27e432f31ada76559087631fd623d9f57f1961a42acd0684041c322a01 SHA512 dfa3ab6a84b57b6e66053be2597f0d6c7f4caf54b0e45a359774a56dfbe1e65bdea91120134e77b1e7c38c336a4fd8d05a7c26e9d3bf4bdc0fe40ad7cd832a54
-AUX chromium-114-remove-evdev-dep.patch 1476 BLAKE2B f3b5f18ce5566af845f855e4adf19a3716dba52dcd5d4352477d568a7ad7824812bfd105d4648e4e3c1c7aa02bf0f1193a80d18cc9f5261ca5ac022e3814895d SHA512 976a21fab6dc5e5272c45abfbb181a431698be23514ad991f68331ae67d687703b9294f4611f22b0908ac9c87db435920e4362f0f96e7833e5944f65a3b2a483
-AUX chromium-115-binutils-2.41.patch 2182 BLAKE2B 4c629957aea52a3fb1a51e0825921a2c390d65a499fbd8d85ad36e3a6bb3cbbcf353bd9bb0be2824de08de24b2485d86cbab01b50c7196a3d949ec4756ad1c60 SHA512 77d9d1acb299d5ded3e4ffc593ebe7025dc165868317342f975edcc380d85f1dab0a30838de82aad6a7125dbb718b60f3710ac8aa6f0817319f554b69adde170
-AUX chromium-98-gtk4-build.patch 3044 BLAKE2B 782dfd31a3a82d62dc0b8ffbb85cf2dbbef1c6cc47dbd8409dc0777be8d019c4ca082d75e6114b09f880f4f3e886d0f4b9631e66d46a3129e41468b70d71404c SHA512 e8acbf85274813ec81d575727b0e5d107749242d1df80e05035c9273ca0466d7358a8d7cece16c09f6996cb49ad3b1e0dcdf052af45023236f53fa6262b4e441
AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
AUX chromium-cross-compile.patch 323 BLAKE2B 8d5091ce5287422c9688ede2563360a96b8bd34b9750dc1c8f0b6ca9aeff2c066fac2da169396baa131d971c087c78f9af53999df0e102d1f57176f5e8d3dd57 SHA512 06d3afc1aa19e57daac0e4bad37e1f365a68408240430e5e818e5a4f12e3b7519214eafa463633e447e7029f4ae13ea864ca347ad1fac117702a0be88718a954
AUX chromium-launcher-r7.sh 1631 BLAKE2B ae28d758264446511fd2b64ba69fe920144b351e8833e0e98f43d00633e850094c288b5d97d1a84801ea13aceb294623692c86c1b9be5811b7b97fa8a07a1ecd SHA512 1e97f8394bd8bb4b29570b1b85176efe6258314a596f079bee1c4018113e0023aa54a93690ba8de2a00d127af10dbe2cc3fb3127b72b841c6f28f9e7bed820e0
-AUX chromium-qt6.patch 2786 BLAKE2B 06a8abb516c45ff1a16eff5e890713c3691a9cf1bc2b759e302c8e94595d547f79f5342e46dce986ce020f8adf0bb93f21a70cf7409ec065ff3a538c60a7a8e3 SHA512 f59e02f42cd82233ca7c81db1eb9b746acc20eab9c32fd9454d0579ad88b8af77a17477bc149f111ba0d884d0aa8f2f41cb18a8effeb2e9b548233f0dd76f408
AUX chromium-use-oauth2-client-switches-as-default.patch 1085 BLAKE2B baf3c463305934c126af4f7c5be305863edc7eec3add5b5ada30565b49b5944021eb40f1a9643e7eec3f973c502d9b02426f00b760570fcea5f1509219e41c6f SHA512 fe2878ee45778bac894ea17a668511d27ad2ca40988d5f11439790b700bfefd6560f3931415b4e6c543fcbbfc7cfef55cc757ed4ace1d111039ae78c46b81945
AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
DIST chromium-117.0.5938.132.tar.xz 3141005880 BLAKE2B cb46cc7840e64be6f07ec06d88b000cccd81b2100931736a5b6002f219f5282f34d5de226332f666e9f979926c9db2bb8fb8ed7a56eea92f76a81e63f1a2bff8 SHA512 a70a47080ff1b355db8ca65564c5dc6122a8a76e9509b271cb4eb1fc9016495828077c3fc59b42e59de61c53ddd40c18520a45db13e3bc1b38532aacca96bc6b
diff --git a/www-client/chromium/files/chromium-114-remove-evdev-dep.patch b/www-client/chromium/files/chromium-114-remove-evdev-dep.patch
deleted file mode 100644
index 6c106c33e747..000000000000
--- a/www-client/chromium/files/chromium-114-remove-evdev-dep.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-commit e3612e8dcb1a43bc358248845aa4f16f4a2792c7
-Author: Stephan Hartmann <stha09@googlemail.com>
-Date: Fri Jun 30 19:15:09 2023 +0200
-
- remoting: remove unused dependency on libevdev
-
- There is only one include, but nothing of libevdev is used. Instead
- linux/input.h (defines BTN_*).
-
-diff --git a/remoting/host/BUILD.gn b/remoting/host/BUILD.gn
-index 9e8dfee8b7d9e..5f46876222fd5 100644
---- a/remoting/host/BUILD.gn
-+++ b/remoting/host/BUILD.gn
-@@ -241,10 +241,6 @@ if (is_linux) {
- pkg_config("xkbcommon") {
- packages = [ "xkbcommon" ]
- }
--
-- pkg_config("libevdev") {
-- packages = [ "libevdev" ]
-- }
- }
-
- # This must be a static library instead of a source set because
-@@ -576,7 +572,6 @@ static_library("common") {
- "x11_display_util.cc",
- "x11_display_util.h",
- ]
-- configs += [ ":libevdev" ]
- libs += [ "//third_party/libei/lib64/libei.a" ]
- public_deps += [
- "//third_party/wayland:wayland_client",
-diff --git a/remoting/host/linux/remote_desktop_portal_injector.cc b/remoting/host/linux/remote_desktop_portal_injector.cc
-index f6de2b406a97f..bb40aa00328d4 100644
---- a/remoting/host/linux/remote_desktop_portal_injector.cc
-+++ b/remoting/host/linux/remote_desktop_portal_injector.cc
-@@ -7,9 +7,9 @@
- #include <gio/gio.h>
- #include <gio/gunixfdlist.h>
- #include <glib-object.h>
-+#include <linux/input.h>
- #include <poll.h>
-
--#include <libevdev/libevdev-uinput.h>
- #include <utility>
-
- #include "base/check.h"
diff --git a/www-client/chromium/files/chromium-115-binutils-2.41.patch b/www-client/chromium/files/chromium-115-binutils-2.41.patch
deleted file mode 100644
index 95f65eb6e33e..000000000000
--- a/www-client/chromium/files/chromium-115-binutils-2.41.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
- instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
-index 6298f5ed19..ca7e2dffc1 100644
---- a/third_party/ffmpeg/libavcodec/x86/mathops.h
-+++ b/third_party/ffmpeg/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
- int rt, dummy;
-+ if (__builtin_constant_p(shift))
- __asm__ (
- "imull %3 \n\t"
- "shrdl %4, %%edx, %%eax \n\t"
- :"=a"(rt), "=d"(dummy)
-- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
- );
-+ else
-+ __asm__ (
-+ "imull %3 \n\t"
-+ "shrdl %4, %%edx, %%eax \n\t"
-+ :"=a"(rt), "=d"(dummy)
-+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+ );
- return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline int32_t NEG_SSR32( int32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("sarl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("sarl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("shrl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("shrl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
---
-2.41.0
-
diff --git a/www-client/chromium/files/chromium-98-gtk4-build.patch b/www-client/chromium/files/chromium-98-gtk4-build.patch
deleted file mode 100644
index 94d2f1f00d58..000000000000
--- a/www-client/chromium/files/chromium-98-gtk4-build.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/ui/gtk/gsk.sigs
-+++ b/ui/gtk/gsk.sigs
-@@ -1,16 +1,16 @@
--GskRenderNodeType gsk_render_node_get_node_type(GskRenderNode* node);
-+GskRenderNodeType gsk_render_node_get_node_type(const GskRenderNode* node);
- void gsk_render_node_unref(GskRenderNode* node);
--GskRenderNode* gsk_transform_node_get_child(GskRenderNode* node);
--GskRenderNode* gsk_opacity_node_get_child(GskRenderNode* node);
--GskRenderNode* gsk_color_matrix_node_get_child(GskRenderNode* node);
--GskRenderNode* gsk_repeat_node_get_child(GskRenderNode* node);
--GskRenderNode* gsk_clip_node_get_child(GskRenderNode* node);
--GskRenderNode* gsk_rounded_clip_node_get_child(GskRenderNode* node);
--GskRenderNode* gsk_shadow_node_get_child(GskRenderNode* node);
--GskRenderNode* gsk_blur_node_get_child(GskRenderNode* node);
--GskRenderNode* gsk_debug_node_get_child(GskRenderNode* node);
--GskRenderNode* gsk_container_node_get_child(GskRenderNode* node, guint idx);
--GskRenderNode* gsk_gl_shader_node_get_child(GskRenderNode* node, guint idx);
--guint gsk_container_node_get_n_children(GskRenderNode* node);
--guint gsk_gl_shader_node_get_n_children(GskRenderNode* node);
--GdkTexture* gsk_texture_node_get_texture(GskRenderNode* node);
-+GskRenderNode* gsk_transform_node_get_child(const GskRenderNode* node);
-+GskRenderNode* gsk_opacity_node_get_child(const GskRenderNode* node);
-+GskRenderNode* gsk_color_matrix_node_get_child(const GskRenderNode* node);
-+GskRenderNode* gsk_repeat_node_get_child(const GskRenderNode* node);
-+GskRenderNode* gsk_clip_node_get_child(const GskRenderNode* node);
-+GskRenderNode* gsk_rounded_clip_node_get_child(const GskRenderNode* node);
-+GskRenderNode* gsk_shadow_node_get_child(const GskRenderNode* node);
-+GskRenderNode* gsk_blur_node_get_child(const GskRenderNode* node);
-+GskRenderNode* gsk_debug_node_get_child(const GskRenderNode* node);
-+GskRenderNode* gsk_container_node_get_child(const GskRenderNode* node, guint idx);
-+GskRenderNode* gsk_gl_shader_node_get_child(const GskRenderNode* node, guint idx);
-+guint gsk_container_node_get_n_children(const GskRenderNode* node);
-+guint gsk_gl_shader_node_get_n_children(const GskRenderNode* node);
-+GdkTexture* gsk_texture_node_get_texture(const GskRenderNode* node);
---- a/ui/gtk/gtk_util.cc
-+++ b/ui/gtk/gtk_util.cc
-@@ -705,7 +705,7 @@
- DCHECK(GtkCheckVersion(4));
- struct {
- GskRenderNodeType node_type;
-- GskRenderNode* (*get_child)(GskRenderNode*);
-+ GskRenderNode* (*get_child)(const GskRenderNode*);
- } constexpr simple_getters[] = {
- {GSK_TRANSFORM_NODE, gsk_transform_node_get_child},
- {GSK_OPACITY_NODE, gsk_opacity_node_get_child},
-@@ -719,8 +719,8 @@
- };
- struct {
- GskRenderNodeType node_type;
-- guint (*get_n_children)(GskRenderNode*);
-- GskRenderNode* (*get_child)(GskRenderNode*, guint);
-+ guint (*get_n_children)(const GskRenderNode*);
-+ GskRenderNode* (*get_child)(const GskRenderNode*, guint);
- } constexpr container_getters[] = {
- {GSK_CONTAINER_NODE, gsk_container_node_get_n_children,
- gsk_container_node_get_child},
diff --git a/www-client/chromium/files/chromium-qt6.patch b/www-client/chromium/files/chromium-qt6.patch
deleted file mode 100644
index 1f18a937331c..000000000000
--- a/www-client/chromium/files/chromium-qt6.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- a/ui/qt/qt.gni
-+++ b/ui/qt/qt.gni
-@@ -12,9 +12,21 @@ declare_args() {
- use_qt = is_linux && !is_castos && !is_msan
- }
-
-+declare_args() {
-+ if(!use_sysroot && use_qt) {
-+ moc_qt5_path = ""
-+ }
-+}
-+
- declare_args() {
- use_qt6 = use_qt && use_sysroot
- }
-
-+declare_args() {
-+ if(!use_sysroot && use_qt6) {
-+ moc_qt6_path = ""
-+ }
-+}
-+
- # use_qt6 => use_qt
- assert(!use_qt6 || use_qt)
---- a/ui/qt/BUILD.gn
-+++ b/ui/qt/BUILD.gn
-@@ -41,16 +41,19 @@ source_set("qt_interface") {
- sources = [ "qt_interface.cc" ]
- }
-
--if (!use_sysroot) {
-- action("generate_moc") {
-- script = "moc_wrapper.py"
-- inputs = [ "//ui/qt/qt_shim.h" ]
-- outputs = [ "$root_gen_dir/qt_shim_moc.cc" ]
-- args = rebase_path(inputs + outputs, root_build_dir)
-+template("qt_shim") {
-+ if (!use_sysroot) {
-+ action("generate_moc" + invoker.qt_version) {
-+ script = "moc_wrapper.py"
-+ inputs = [ "//ui/qt/qt_shim.h" ]
-+ outputs = [ "$root_gen_dir/qt" + invoker.qt_version + "/qt_shim_moc.cc" ]
-+ args = rebase_path(inputs + outputs, root_build_dir)
-+ if (invoker.moc_qt_path != "") {
-+ args += [ "--path", invoker.moc_qt_path ]
-+ }
-+ }
- }
--}
-
--template("qt_shim") {
- pkg_config("qt" + invoker.qt_version + "_config") {
- packages = [
- "Qt" + invoker.qt_version + "Core",
-@@ -90,17 +93,23 @@ template("qt_shim") {
- # avoid a build-time dependency on `moc` when using the sysroot.
- sources += [ "qt" + invoker.qt_version + "_shim_moc.cc" ]
- } else {
-- sources += get_target_outputs(":generate_moc")
-- deps += [ ":generate_moc" ]
-+ sources += get_target_outputs(":generate_moc" + invoker.qt_version)
-+ deps += [ ":generate_moc" + invoker.qt_version ]
- }
- }
- }
- qt_shim("qt5_shim") {
- qt_version = "5"
-+ if (!use_sysroot) {
-+ moc_qt_path = "$moc_qt5_path"
-+ }
- }
- if (use_qt6) {
- qt_shim("qt6_shim") {
- qt_version = "6"
-+ if (!use_sysroot) {
-+ moc_qt_path = "$moc_qt6_path"
-+ }
- }
- }
-
---- a/ui/qt/moc_wrapper.py
-+++ b/ui/qt/moc_wrapper.py
-@@ -3,8 +3,21 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-
-+import argparse
- import subprocess
--import sys
-
-+parser = argparse.ArgumentParser()
-+parser.add_argument(
-+ 'input', type=str, help='Input header file.')
-+parser.add_argument(
-+ 'output', type=str, help='Output file.')
-+parser.add_argument(
-+ '--path', required=False, type=str, default=None,
-+ help='Path to moc binary.')
-
--subprocess.check_call(["moc", sys.argv[1], "-o", sys.argv[2]])
-+args = parser.parse_args()
-+
-+if args.path is None:
-+ subprocess.check_call(["moc", args.input, "-o", args.output])
-+else:
-+ subprocess.check_call([args.path + "/moc", args.input, "-o", args.output])
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 11:01:55 +0000