Djam/chromium-browser-stable-test
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/chromium-browser-stable-test.git synced 2025-02-24 01:52:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

upd: 96.0.4664.45 -> 96.0.4664.110

Browse source
This commit is contained in:
Mikhail Novosyolov 2021-12-14 23:14:37 +03:00
parent ed660fdcbf
commit be875ba259
3 changed files with 7 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.abf.yml
View file

@ -1,6 +1,6 @@
sources:
chromium-96.0.4664.45.tar.xz: e08bf22a86057183b3a7cfeaaf501f5d94ae29d6
chromium-gost-edfb3698025cb3a6a0355c8dd600764ea52925c1.tar.gz: 34acb1a361076e0bfe0b30ae2d987b1c74d68ffb
chromium-96.0.4664.110.tar.xz: be373cbc456fa7ed019103bbdc1f6fcce6ea942d
chromium-gost-2291171a83c3a9738e0eba55976beca4988bd4ec.tar.gz: 004f5a5c470c0bfe22bded0de9f7da35e0655e33
depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5
icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3
msspi-1df40c96e1dfdc6bbe97c321aceae45114a89dd8.tar.gz: c2f9fb6ec24205ab39a58946b2acc72c54ab40a6

53
245e71ae8de3f4b5f3478739be819981bb12dfab.patch
View file

@ -1,53 +0,0 @@
From 245e71ae8de3f4b5f3478739be819981bb12dfab Mon Sep 17 00:00:00 2001
From: Alexander Dunaev <adunaev@igalia.com>
Date: Sat, 13 Nov 2021 06:35:35 +0000
Subject: [PATCH] [linux/xfce] Introduced a hack for Xfwm.
This proposes an alternative to [1]. Either this patch or that one
should be landed, but not both. See the linked crbug for the details.
Setting the frame extents via the _GTK_FRAME_EXTENTS property turned out
to be problematic at Xfwm. While the issue is agreed to be a bug in the
window manager, for now we disable setting the frame extents on that WM.
This patch introduces a logic that disables setting the window property
on Xfwm.
[1] https://chromium-review.googlesource.com/c/chromium/src/+/3275653
Bug: 1260821
Change-Id: I4b734ac0dc2b97d7ed6b1842564a33ec6e4b4035
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3275272
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Alexander Dunaev <adunaev@igalia.com>
Cr-Commit-Position: refs/heads/main@{#941444}
---
ui/platform_window/x11/x11_window.cc | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/ui/platform_window/x11/x11_window.cc b/ui/platform_window/x11/x11_window.cc
index 2b2083553c59c..4fa2992394329 100644
--- a/ui/platform_window/x11/x11_window.cc
+++ b/ui/platform_window/x11/x11_window.cc
@@ -1016,6 +1016,21 @@ void X11Window::SetOpacity(float opacity) {
}
bool X11Window::CanSetDecorationInsets() const {
+ // Xfwm handles _GTK_FRAME_EXTENTS a bit unexpected way. That is a known bug
+ // that will be eventually fixed, but for now we have to disable the function
+ // for Xfce. The block below should be removed when Xfwm is updated with the
+ // fix and is known to work properly.
+ // See https://crbug.com/1260821.
+ {
+ static WindowManagerName wm_name = WM_OTHER;
+ static bool checked_for_wm = false;
+ if (!checked_for_wm) {
+ wm_name = GuessWindowManager();
+ checked_for_wm = true;
+ }
+ if (wm_name == WM_XFWM4)
+ return false;
+ }
return ui::WmSupportsHint(x11::GetAtom("_GTK_FRAME_EXTENTS"));
}

9
chromium-browser-stable.spec
View file

@ -50,7 +50,7 @@
# GOST patches and sources
# Using commit hashes because upstream often puts tags long after making changes
# (they wait for builds to finish to make a new "release" with binary packages)
%define chromium_gost_commit edfb3698025cb3a6a0355c8dd600764ea52925c1
%define chromium_gost_commit 2291171a83c3a9738e0eba55976beca4988bd4ec
%define msspi_commit 1df40c96e1dfdc6bbe97c321aceae45114a89dd8
%define _gostsourcedir %{_builddir}/chromium-gost
@ -85,8 +85,8 @@
Summary: A fast web browser based on the Blink engine
Name: chromium-browser-stable
Version: 96.0.4664.45
Release: 2
Version: 96.0.4664.110
Release: 1
License: BSD, LGPL
Group: Networking/WWW
Url: https://www.chromium.org/Home
@ -131,7 +131,7 @@ Patch649: off-java-check.patch
# https://bugs.chromium.org/p/chromium/issues/detail?id=1260821
# https://gitlab.xfce.org/xfce/xfwm4/-/issues/603
Patch651: 314a1e4d19141b60850fc542abab6251c4f119c9.patch
Patch652: 245e71ae8de3f4b5f3478739be819981bb12dfab.patch
# 245e71ae8de3f4b5f3478739be819981bb12dfab was backported to 96.0.4664.110
BuildRequires: bison
BuildRequires: llvm12
@ -338,6 +338,7 @@ tar -C %{_gostsourcedir}/src/msspi --strip 1 -xf %{SOURCE1102}
sed -i'' %{_gostsourcedir}/patch/chromium.patch \
-e 's/ (Chromium GOST)//g' \
-e 's/Chromium GOST/Chromium/g' \
-e 's/Chromium-Gost/Chromium/g' \
-e 's/"chromium-gost"/"chromium-browser"/g' \
-e 's/"chromium-gost.desktop"/"chromium-browser.desktop"/g' \
--