diff --git a/.abf.yml b/.abf.yml index a296c19..bf47fd3 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,8 +1,8 @@ sources: 22x22_chromium.svg: 045aa39ba3e340ba5e2c4366ad34f909001c02f9 48x48_chromium.svg: bbaa00aeb7b4f9820bc29474c5c1964ed17b32cc - chromium-105.0.5195.102.tar.xz: cae4eacf6ab37a0453c3e1f2021deb09855368a9 - chromium-gost-fccc49b952ad6c84709a4cbf82e9277f81dd41ae.tar.gz: 84a139b2c84295b3164f3acced8986f698351583 + chromium-106.0.5249.61.tar.xz: 7170bc9699451d8b8664fca9dae7bca5557fe21c + chromium-gost-2980e5bb5bec4bd52b615fc94a47ad2f29fcaae8.tar.gz: 68828d3dfd199535030c2f685a003b26e815b72b depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5 icons-2012.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3 msspi-0d09dc6de9df58041fc385ac49e5778323e547f4.tar.gz: 6bc512f9bffae44418d9482f3ad7395864a8dc24 diff --git a/24a90f9327ac1a4d2b6dbb410cd28f65e3e33839.patch b/24a90f9327ac1a4d2b6dbb410cd28f65e3e33839.patch new file mode 100644 index 0000000..629bbaf --- /dev/null +++ b/24a90f9327ac1a4d2b6dbb410cd28f65e3e33839.patch @@ -0,0 +1,40 @@ +From 24a90f9327ac1a4d2b6dbb410cd28f65e3e33839 Mon Sep 17 00:00:00 2001 +From: Alexander Dunaev +Date: Mon, 1 Nov 2021 19:29:27 +0000 +Subject: [PATCH] [linux/xfce] Set zero insets on maximising the window. + +It turned out that Xfwm handles the frame insets not the way KWin and +Mutter do, which causes wrong window size when it is maximised (see the +linked crbug). + +This patch resets the frame insets to zero when the window is maximised, +which fixes the behaviour on Xfwm. + +Bug: 1260821 +Change-Id: I69e71049157c03b74d78bc5edb7a60bf39cdda8b +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3250747 +Commit-Queue: Thomas Anderson +Reviewed-by: Thomas Anderson +Cr-Commit-Position: refs/heads/main@{#936990} +--- + ui/platform_window/x11/x11_window.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/ui/platform_window/x11/x11_window.cc b/ui/platform_window/x11/x11_window.cc +index 017ff15a0af1b..dd416c031e7c1 100644 +--- a/ui/platform_window/x11/x11_window.cc ++++ b/ui/platform_window/x11/x11_window.cc +@@ -675,6 +675,13 @@ void X11Window::Maximize() { + // save this one for later too. + should_maximize_after_map_ = !window_mapped_in_client_; + ++ // Some WMs keep respecting the frame extents even if the window is maximised. ++ // Remove the insets when maximising. The extents will be set again when the ++ // window is restored to normal state. ++ // See https://crbug.com/1260821 ++ if (CanSetDecorationInsets()) ++ SetDecorationInsets(nullptr); ++ + SetWMSpecState(true, x11::GetAtom("_NET_WM_STATE_MAXIMIZED_VERT"), + x11::GetAtom("_NET_WM_STATE_MAXIMIZED_HORZ")); + } diff --git a/block-requests.patch b/block-requests.patch index 13eb9d7..d3ec790 100644 --- a/block-requests.patch +++ b/block-requests.patch @@ -2,7 +2,7 @@ # chrome://discards/ attempts to use d3 to display the graph --- a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc +++ b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc -@@ -286,6 +286,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad +@@ -287,6 +287,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad OneGoogleBarLoaderImpl::~OneGoogleBarLoaderImpl() = default; void OneGoogleBarLoaderImpl::Load(OneGoogleCallback callback) { @@ -12,14 +12,14 @@ // Note: If there is an ongoing request, abandon it. It's possible that --- a/chrome/browser/new_tab_page/promos/promo_service.cc +++ b/chrome/browser/new_tab_page/promos/promo_service.cc -@@ -138,6 +138,7 @@ PromoService::PromoService( +@@ -171,6 +171,7 @@ PromoService::PromoService( PromoService::~PromoService() = default; void PromoService::Refresh() { -+ return; - net::NetworkTrafficAnnotationTag traffic_annotation = - net::DefineNetworkTrafficAnnotation("promo_service", R"( - semantics { ++ if ((true)) return; + std::string command_id; + // Replace the promo URL with "command:" if such a command ID is set + // via the feature params. --- a/chrome/browser/resources/discards/graph_doc_template.html +++ b/chrome/browser/resources/discards/graph_doc_template.html @@ -78,10 +78,6 @@ URL. As result, this document needs to b @@ -35,7 +35,7 @@ --- a/chrome/browser/search/background/ntp_background_service.cc +++ b/chrome/browser/search/background/ntp_background_service.cc -@@ -83,6 +83,7 @@ void NtpBackgroundService::Shutdown() { +@@ -84,6 +84,7 @@ void NtpBackgroundService::Shutdown() { } void NtpBackgroundService::FetchCollectionInfo() { @@ -65,11 +65,11 @@ if (state_ == REQUESTING) { --- a/components/update_client/update_checker.cc +++ b/components/update_client/update_checker.cc -@@ -109,6 +109,7 @@ void UpdateCheckerImpl::CheckForUpdates( - const IdToComponentPtrMap& components, +@@ -98,6 +98,7 @@ void UpdateCheckerImpl::CheckForUpdates( + scoped_refptr context, const base::flat_map& additional_attributes, UpdateCheckCallback update_check_callback) { + return; DCHECK(thread_checker_.CalledOnValidThread()); - ids_checked_ = ids_checked; + update_check_callback_ = std::move(update_check_callback); diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec index fe99e18..d19492f 100644 --- a/chromium-browser-stable.spec +++ b/chromium-browser-stable.spec @@ -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 fccc49b952ad6c84709a4cbf82e9277f81dd41ae +%define chromium_gost_commit 2980e5bb5bec4bd52b615fc94a47ad2f29fcaae8 %define msspi_commit 0d09dc6de9df58041fc385ac49e5778323e547f4 %define _gostsourcedir %{_builddir}/chromium-gost @@ -80,8 +80,8 @@ Summary: A fast web browser based on the Blink engine Name: chromium-browser-stable -Version: 105.0.5195.102 -Release: 2 +Version: 106.0.5249.61 +Release: 1 License: BSD, LGPL Group: Networking/WWW Url: https://www.chromium.org/Home @@ -161,7 +161,7 @@ BuildRequires: nodejs14 BuildRequires: util-linux BuildRequires: jq BuildRequires: yasm -BuildRequires: %{_lib}atomic-devel +BuildRequires: atomic-devel BuildRequires: bzip2-devel BuildRequires: cap-devel BuildRequires: cups-devel diff --git a/off-java-check.patch b/off-java-check.patch new file mode 100644 index 0000000..93aded3 --- /dev/null +++ b/off-java-check.patch @@ -0,0 +1,29 @@ +Workaround build failure + +DEBUG: FAILED: gen/mojo/public/js/mojo_bindings_lite.js +DEBUG: /usr/bin/python2 ../../third_party/closure_compiler/js_binary.py --compiler ../../third_party/closure_compiler/compiler/compiler.jar --output gen/mojo/public/js/mojo_bindings_lite.js --deps gen/mojo/public/js/bindings_lite_sources.js_library --sources --flags jscomp_error=accessControls jscomp_error=checkTypes jscomp_error=checkVars jscomp_error=constantProperty jscomp_error=deprecated jscomp_error=externsValidation jscomp_error=globalThis jscomp_error=invalidCasts jscomp_error=misplacedTypeAnnotation jscomp_error=missingProperties jscomp_error=missingReturn jscomp_error=nonStandardJsDocs jscomp_error=suspiciousCode jscomp_error=undefinedNames jscomp_error=undefinedVars jscomp_error=unknownDefines jscomp_error=uselessCode jscomp_error=visibility compilation_level=ADVANCED_OPTIMIZATIONS language_in=ECMASCRIPT_2017 language_out=ECMASCRIPT_2015 generate_exports export_local_property_definitions isolation_mode=IIFE js_module_root=../../ui/webui/resources/ js_module_root=gen/ui/webui/resources/ module_resolution=BROWSER_WITH_TRANSFORMED_PREFIXES browser_resolver_prefix_replacements=\"chrome://resources/=./\" browser_resolver_prefix_replacements=\"//resources/=./\" --externs ../../third_party/closure_compiler/externs/chrome.js ../../third_party/closure_compiler/externs/polymer-1.0.js ../../third_party/closure_compiler/externs/mojo_core.js +DEBUG: Traceback (most recent call last): +DEBUG: File "../../third_party/closure_compiler/js_binary.py", line 20, in +DEBUG: import compiler +DEBUG: File "/builddir/build/BUILD/chromium-91.0.4472.77/third_party/closure_compiler/compiler.py", line 17, in +DEBUG: assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds" +DEBUG: AssertionError: java only allowed in android builds + +DEBUG: /bin/sh: /builddir/build/BUILD/chromium-91.0.4472.77/third_party/closure_compiler/../jdk/current/bin/java: No such file or directory +so hardcode path + +Reported to upstream: +https://bugs.chromium.org/p/chromium/issues/detail?id=1214022 + +--- a/third_party/closure_compiler/compiler.py.orig 2021-05-27 21:01:57.998956433 +0300 ++++ b/third_party/closure_compiler/compiler.py 2021-05-27 21:33:56.035526231 +0300 +@@ -13,8 +13,7 @@ + + + _CURRENT_DIR = os.path.join(os.path.dirname(__file__)) +-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java") +-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds" ++_JAVA_PATH = "/usr/bin/java" + + class Compiler(object): + """Runs the Closure compiler on given source files to typecheck them diff --git a/wayland-strndup.patch b/wayland-strndup.patch new file mode 100644 index 0000000..8749ad6 --- /dev/null +++ b/wayland-strndup.patch @@ -0,0 +1,36 @@ +Upstream commit added this code: +https://github.com/wayland-project/wayland/commit/4a1f348c20157db7bd7c759fdeb23fbe8729c571 + +For some reasones something goes wrong and HAVE_STRNDUP does not get defined on rosa2016.1, +(no problems on rosa2019.05 and rosa2019.1). + +The compiler fails: +../../third_party/wayland/src/src/scanner.c:979:1: error: expected identifier or '(' +strndup(const char *s, size_t size) + +glibc in rosa2016.1-rosa2019.1 does have strndup, workaround this issue by removing not needed code. + +// mikhailnov, 09.01.2021 + +diff --git a/src/scanner.c b/src/scanner.c +index 7ed1ba1a..2b3adbda 100644 +--- a/third_party/wayland/src/src/scanner.c ++++ b/third_party/wayland/src/src/scanner.c +@@ -974,17 +916,6 @@ + + } + +-#ifndef HAVE_STRNDUP +-char * +-strndup(const char *s, size_t size) +-{ +- char *r = malloc(size + 1); +- strncpy(r, s, size); +- r[size] = '\0'; +- return r; +-} +-#endif +- + static void + end_element(void *data, const XML_Char *name) + {