summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2023-10-04 17:51:15 +0200
committerConrad Kostecki <conikost@gentoo.org>2023-10-04 23:44:48 +0200
commit7db0bb7a157466da2b5934675415eb205ed0528f (patch)
tree4268519a6c83d77c1cc8915c94384b1edc11276b
parentnet-wireless/gnome-bluetooth: remove unused patch(es) (diff)
downloadgentoo-7db0bb7a.tar.gz
gentoo-7db0bb7a.tar.bz2
gentoo-7db0bb7a.zip
www-client/chromium: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/33192 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
-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
4 files changed, 0 insertions, 285 deletions
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])