automatic version update by autodist [release 97.0.4692.99-1mamba;Sat Jan 22 2022]
This commit is contained in:
parent
539c3588ec
commit
e740a21485
35
chromium-97.0.4692.71-fix-tag-dragging-in-KWin.patch
Normal file
35
chromium-97.0.4692.71-fix-tag-dragging-in-KWin.patch
Normal file
@ -0,0 +1,35 @@
|
||||
From 52d0ad25ea695da44195e49f36e69fa81b55e670 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Anderson <thomasanderson@chromium.org>
|
||||
Date: Wed, 5 Jan 2022 21:11:03 +0000
|
||||
Subject: [PATCH] [X11] Fix tag dragging in KWin
|
||||
|
||||
R=sky
|
||||
|
||||
Bug: 1279532
|
||||
Change-Id: Iac166803e2149eef234045d922b630f0019c8073
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3355376
|
||||
Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
|
||||
Reviewed-by: Scott Violet <sky@chromium.org>
|
||||
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#955869}
|
||||
---
|
||||
ui/platform_window/x11/x11_topmost_window_finder.cc | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/ui/platform_window/x11/x11_topmost_window_finder.cc b/ui/platform_window/x11/x11_topmost_window_finder.cc
|
||||
index 50e75e17f0a..2e16393487b 100644
|
||||
--- a/ui/platform_window/x11/x11_topmost_window_finder.cc
|
||||
+++ b/ui/platform_window/x11/x11_topmost_window_finder.cc
|
||||
@@ -68,9 +68,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);
|
||||
}
|
||||
|
||||
46
chromium-97.0.4692.71-fix-tag-dragging-in-Mutter.patch
Normal file
46
chromium-97.0.4692.71-fix-tag-dragging-in-Mutter.patch
Normal file
@ -0,0 +1,46 @@
|
||||
From 3806f28918ea23291749ff4775339075a5f394e8 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Anderson <thomasanderson@chromium.org>
|
||||
Date: Thu, 6 Jan 2022 00:59:40 +0000
|
||||
Subject: [PATCH] [X11] Fix tag dragging in Mutter
|
||||
|
||||
We used to use a BFS to find the target window for tag dragging, but
|
||||
this causes windows underneath (like the window for the desktop
|
||||
wallpaper) to take precedence over nested windows.
|
||||
|
||||
This CL switches to a DFS.
|
||||
|
||||
R=sky
|
||||
|
||||
Bug: 1279532
|
||||
Change-Id: Ib569e9270be60bcb4fff088517dfe295697608b0
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3355470
|
||||
Reviewed-by: Scott Violet <sky@chromium.org>
|
||||
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
|
||||
Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#955976}
|
||||
---
|
||||
ui/platform_window/x11/x11_topmost_window_finder.cc | 11 ++---------
|
||||
1 file changed, 2 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/ui/platform_window/x11/x11_topmost_window_finder.cc b/ui/platform_window/x11/x11_topmost_window_finder.cc
|
||||
index 2e16393487b..e20bf0abf0e 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;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,12 @@
|
||||
diff --git a/build/linux/unbundle/ffmpeg.gn b/build/linux/unbundle/ffmpeg.gn
|
||||
index 16e20744706..6a079b32221 100644
|
||||
--- a/build/linux/unbundle/ffmpeg.gn
|
||||
+++ b/build/linux/unbundle/ffmpeg.gn
|
||||
@@ -12,6 +12,7 @@ pkg_config("system_ffmpeg") {
|
||||
"libavformat",
|
||||
"libavutil",
|
||||
]
|
||||
+ defines = [ "av_stream_get_first_dts(stream)=stream->first_dts" ]
|
||||
}
|
||||
|
||||
buildflag_header("ffmpeg_features") {
|
||||
@ -2,7 +2,7 @@
|
||||
%define gcc_patchset 4
|
||||
Name: chromium
|
||||
Epoch: 3
|
||||
Version: 96.0.4664.110
|
||||
Version: 97.0.4692.99
|
||||
Release: 1mamba
|
||||
Summary: An open-source browser project that aims to build a safer, faster, and more stable way to experience the web
|
||||
Group: Graphical Desktop/Applications/Internet
|
||||
@ -42,6 +42,9 @@ Patch23: chromium-95.0.4638.54-maldoca-depend-on-zlib-instead-of-headers-o
|
||||
Patch24: chromium-95.0.4638.54-harfbuzz-3.patch
|
||||
Patch25: chromium-95.0.4638.54-ozone-x11-fix-VA-API.patch
|
||||
Patch26: chromium-96.0.4664.45-gcc-2.34.patch
|
||||
Patch27: chromium-97.0.4692.71-unbundle-ffmpeg-av_stream_get_first_dts.patch
|
||||
Patch28: chromium-97.0.4692.71-fix-tag-dragging-in-KWin.patch
|
||||
Patch29: chromium-97.0.4692.71-fix-tag-dragging-in-Mutter.patch
|
||||
License: BSD
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
@ -83,6 +86,7 @@ BuildRequires: libpulseaudio-devel
|
||||
BuildRequires: libre2-devel
|
||||
BuildRequires: libsnappy-devel
|
||||
BuildRequires: libstdc++6-devel
|
||||
BuildRequires: libwayland-devel
|
||||
BuildRequires: libwebp-devel
|
||||
BuildRequires: libxcb-devel
|
||||
BuildRequires: libxkbcommon-devel
|
||||
@ -128,11 +132,11 @@ Requires: libvdpau-Mesa
|
||||
# gclient sync --force
|
||||
# python src/tools/export_tarball/export_tarball.py --remove-nonessential-files chromium-%{version}
|
||||
|
||||
%debug_package
|
||||
|
||||
%description
|
||||
Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all Internet users to experience the web.
|
||||
|
||||
%debug_package
|
||||
|
||||
%prep
|
||||
%setup -q -a2
|
||||
#% setup -q -D -T
|
||||
@ -151,17 +155,20 @@ sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
|
||||
%patch19 -p1 -b .ffmpeg-4.4
|
||||
%patch20 -Rp1 -b .ffmpeg-roll
|
||||
%patch21 -p0 -b .unexpire-accelerated-video-decode-flag
|
||||
%patch17 -Rp1 -b .replace-blacklist-with-ignorelist
|
||||
#%patch17 -Rp1 -b .replace-blacklist-with-ignorelist
|
||||
%patch22 -Rp1 -b .add-a-TODO-about-a-missing-pnacl-flag
|
||||
%patch18 -Rp1 -b .use-ffile-compilation-dir
|
||||
%patch12 -p1 -b .sql-make-VirtualCursor-standard-layout-type
|
||||
%patch26 -p1 -b .gcc-2.34
|
||||
%patch27 -p1 -b .unbundle-ffmpeg-av_stream_get_first_dts
|
||||
#%patch28 -p1 -b .fix-tag-dragging-in-KWin
|
||||
#%patch29 -p1 -b .fix-tag-dragging-in-Mutter
|
||||
|
||||
# Fixes for building with libstdc++ instead of libc++
|
||||
patch -Np1 -i patches/chromium-96-CommandLine-include.patch
|
||||
patch -Np1 -i patches/chromium-96-RestrictedCookieManager-tuple.patch
|
||||
patch -Np1 -i patches/chromium-96-DrmRenderNodePathFinder-include.patch
|
||||
patch -Np1 -i patches/chromium-96-CouponDB-include.patch
|
||||
#patch -Np1 -i patches/chromium-96-CommandLine-include.patch
|
||||
#patch -Np1 -i patches/chromium-96-RestrictedCookieManager-tuple.patch
|
||||
#patch -Np1 -i patches/chromium-96-DrmRenderNodePathFinder-include.patch
|
||||
#patch -Np1 -i patches/chromium-96-CouponDB-include.patch
|
||||
|
||||
# Force script incompatible with Python 3 to use /usr/bin/python2
|
||||
sed -i '1s|python$|&2|' third_party/dom_distiller_js/protoc_plugins/*.py
|
||||
@ -274,7 +281,6 @@ chromium_conf=(
|
||||
'host_toolchain="//build/toolchain/linux/unbundle:default"'
|
||||
'clang_use_chrome_plugins=false'
|
||||
'is_official_build=true' # implies is_cfi=true on x86_64
|
||||
'chrome_pgo_phase=0' # pgo incompatible with llvm 11
|
||||
'treat_warnings_as_errors=false'
|
||||
'fieldtrial_testing_like_official_build=true'
|
||||
'ffmpeg_branding="Chrome"'
|
||||
@ -295,6 +301,7 @@ chromium_conf=(
|
||||
'toolprefix="%{_target_platform}-"'
|
||||
)
|
||||
|
||||
# 'chrome_pgo_phase=0' # pgo incompatible with llvm 11
|
||||
# 'google_default_client_id="72870267994-r1bkll5bq0v275nnsa66d21h3t6ne10s.apps.googleusercontent.com"'
|
||||
# 'google_default_client_secret="Pcdh5bzXx3nsECO_AlMlPXXk"'
|
||||
|
||||
@ -425,6 +432,12 @@ ln -s %{_libdir}/chromium/chromedriver %{buildroot}%{_bindir}/chromedriver
|
||||
%{_mandir}/man1/chromium.1*
|
||||
|
||||
%changelog
|
||||
* Sat Jan 22 2022 Automatic Build System <autodist@mambasoft.it> 97.0.4692.99-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Wed Jan 12 2022 Automatic Build System <autodist@mambasoft.it> 97.0.4692.77-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Wed Dec 15 2021 Automatic Build System <autodist@mambasoft.it> 96.0.4664.110-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user