diff options
Diffstat (limited to 'www-client/chromium/files')
4 files changed, 12 insertions, 97 deletions
diff --git a/www-client/chromium/files/chromium-96-freetype-unbundle.patch b/www-client/chromium/files/chromium-96-freetype-unbundle.patch deleted file mode 100644 index 6ef5ff6832c7..000000000000 --- a/www-client/chromium/files/chromium-96-freetype-unbundle.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/build/linux/BUILD.gn -+++ b/build/linux/BUILD.gn -@@ -23,6 +23,7 @@ - # the system, use with caution,for details see build/config/freetype/BUILD.gn. - pkg_config("freetype_from_pkgconfig") { - visibility = [ -+ "//build/config/freetype:freetype", - "//third_party:freetype_harfbuzz", - "//third_party/harfbuzz-ng:harfbuzz_source", - ] diff --git a/www-client/chromium/files/chromium-97-fix-tag-dragging-i3.patch b/www-client/chromium/files/chromium-97-fix-tag-dragging-i3.patch deleted file mode 100644 index e31f0112478f..000000000000 --- a/www-client/chromium/files/chromium-97-fix-tag-dragging-i3.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 98715f8730c5f389976538848e58401db66f9b5d Mon Sep 17 00:00:00 2001 -From: Marco Genasci <fedeliallalinea@gmail.com> -Date: Wed, 12 Jan 2022 16:11:15 +0100 -Subject: [PATCH 2/2] [X11] Fix tag dragging in i3 - -ref: https://bugs.chromium.org/p/chromium/issues/detail?id=1279532 -caused by: https://bugs.chromium.org/p/chromium/issues/detail?id=1263023 -Patch from: -https://chromium-review.googlesource.com/c/chromium/src/+/3381679 ---- - ui/platform_window/x11/x11_topmost_window_finder.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ui/platform_window/x11/x11_topmost_window_finder.cc b/ui/platform_window/x11/x11_topmost_window_finder.cc -index e20bf0abf..c9c672c60 100644 ---- a/ui/platform_window/x11/x11_topmost_window_finder.cc -+++ b/ui/platform_window/x11/x11_topmost_window_finder.cc -@@ -42,12 +42,12 @@ bool EnumerateChildren(ShouldStopIteratingCallback should_stop_iterating, - // reverse-iterate the list to check the windows from top-to-bottom. - std::vector<x11::Window>::reverse_iterator iter; - for (iter = windows.rbegin(); iter != windows.rend(); iter++) { -- if (IsWindowNamed(*iter) && should_stop_iterating.Run(*iter)) -- return true; - if (depth < max_depth) { - if (EnumerateChildren(should_stop_iterating, *iter, max_depth, depth + 1)) - return true; - } -+ if (IsWindowNamed(*iter) && should_stop_iterating.Run(*iter)) -+ return true; - } - - return false; --- -2.34.1 - diff --git a/www-client/chromium/files/chromium-97-fix-tag-dragging.patch b/www-client/chromium/files/chromium-97-fix-tag-dragging.patch deleted file mode 100644 index 6afd5a78ec05..000000000000 --- a/www-client/chromium/files/chromium-97-fix-tag-dragging.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 692ed3e237fc645253fff3fbb932ad45a525a7ba Mon Sep 17 00:00:00 2001 -From: Marco Genasci <fedeliallalinea@gmail.com> -Date: Wed, 12 Jan 2022 16:08:41 +0100 -Subject: [PATCH 1/2] [X11] Fix tag dragging in Mutter and KWin - -ref: https://bugs.chromium.org/p/chromium/issues/detail?id=1279532 -caused by: https://bugs.chromium.org/p/chromium/issues/detail?id=1263023 -Patches from: -https://chromium-review.googlesource.com/c/chromium/src/+/3373204 -https://chromium-review.googlesource.com/c/chromium/src/+/3355376 ---- - .../x11/x11_topmost_window_finder.cc | 17 +++++------------ - 1 file changed, 5 insertions(+), 12 deletions(-) - -diff --git a/ui/platform_window/x11/x11_topmost_window_finder.cc b/ui/platform_window/x11/x11_topmost_window_finder.cc -index 50e75e17f..e20bf0abf 100644 ---- a/ui/platform_window/x11/x11_topmost_window_finder.cc -+++ b/ui/platform_window/x11/x11_topmost_window_finder.cc -@@ -44,15 +44,8 @@ bool EnumerateChildren(ShouldStopIteratingCallback should_stop_iterating, - for (iter = windows.rbegin(); iter != windows.rend(); iter++) { - if (IsWindowNamed(*iter) && should_stop_iterating.Run(*iter)) - return true; -- } -- -- // If we're at this point, we didn't find the window we're looking for at the -- // current level, so we need to recurse to the next level. We use a second -- // loop because the recursion and call to XQueryTree are expensive and is only -- // needed for a small number of cases. -- if (++depth <= max_depth) { -- for (iter = windows.rbegin(); iter != windows.rend(); iter++) { -- if (EnumerateChildren(should_stop_iterating, *iter, max_depth, depth)) -+ if (depth < max_depth) { -+ if (EnumerateChildren(should_stop_iterating, *iter, max_depth, depth + 1)) - return true; - } - } -@@ -68,9 +61,9 @@ bool EnumerateAllWindows(ShouldStopIteratingCallback should_stop_iterating, - - void EnumerateTopLevelWindows( - ui::ShouldStopIteratingCallback should_stop_iterating) { -- // Some WMs parent 'top-level' windows in unnamed actual top-level windows -- // (ion WM), so extend the search depth to all children of top-level windows. -- const int kMaxSearchDepth = 1; -+ // WMs may reparent toplevel windows inside their own containers, so extend -+ // the search to all grandchildren of all toplevel windows. -+ const int kMaxSearchDepth = 2; - ui::EnumerateAllWindows(should_stop_iterating, kMaxSearchDepth); - } - --- -2.34.1 - diff --git a/www-client/chromium/files/chromium-cross-compile.patch b/www-client/chromium/files/chromium-cross-compile.patch new file mode 100644 index 000000000000..430ceb7a4924 --- /dev/null +++ b/www-client/chromium/files/chromium-cross-compile.patch @@ -0,0 +1,12 @@ +--- a/build/toolchain/linux/unbundle/BUILD.gn ++++ b/build/toolchain/linux/unbundle/BUILD.gn +@@ -35,7 +35,7 @@ gcc_toolchain("host") { + extra_ldflags = getenv("BUILD_LDFLAGS") + + toolchain_args = { +- current_cpu = current_cpu +- current_os = current_os ++ current_cpu = host_cpu ++ current_os = host_os + } + } |