mirror of
https://abf.rosa.ru/djam/chromium-browser-stable.git
synced 2025-02-24 07:02:48 +00:00
105.0.5195.102
This commit is contained in:
parent
9b87a8d917
commit
855e85c598
3 changed files with 49 additions and 9 deletions
6
.abf.yml
6
.abf.yml
|
@ -1,10 +1,10 @@
|
||||||
sources:
|
sources:
|
||||||
22x22_chromium.svg: 045aa39ba3e340ba5e2c4366ad34f909001c02f9
|
22x22_chromium.svg: 045aa39ba3e340ba5e2c4366ad34f909001c02f9
|
||||||
48x48_chromium.svg: bbaa00aeb7b4f9820bc29474c5c1964ed17b32cc
|
48x48_chromium.svg: bbaa00aeb7b4f9820bc29474c5c1964ed17b32cc
|
||||||
chromium-102.0.5005.61.tar.xz: abdbab7a0a39813a71d86a20a2900c9008d48d87
|
chromium-105.0.5195.102.tar.xz: cae4eacf6ab37a0453c3e1f2021deb09855368a9
|
||||||
chromium-gost-b8bb24daca333ce67c0bb8f9d0c7103038020dbe.tar.gz: f466d681f56101e2cfa793caa297090d83b9441f
|
chromium-gost-fccc49b952ad6c84709a4cbf82e9277f81dd41ae.tar.gz: 84a139b2c84295b3164f3acced8986f698351583
|
||||||
depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5
|
depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5
|
||||||
icons-2012.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3
|
icons-2012.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3
|
||||||
msspi-afe02c38f9b29883a033c652f548b09876e2f9b9.tar.gz: a7f4420db6b145a24c5f3e6d18d459513109914e
|
msspi-0d09dc6de9df58041fc385ac49e5778323e547f4.tar.gz: 6bc512f9bffae44418d9482f3ad7395864a8dc24
|
||||||
rosa-logo-for-new-tab-page.svg: a01c204d34d1c8a8e4cb865891b1fd2720ff431c
|
rosa-logo-for-new-tab-page.svg: a01c204d34d1c8a8e4cb865891b1fd2720ff431c
|
||||||
xcb-proto-1.14.1.tar.xz: 836d5b2dd00ff21bd038e92764fda9a256a1b022
|
xcb-proto-1.14.1.tar.xz: 836d5b2dd00ff21bd038e92764fda9a256a1b022
|
||||||
|
|
38
angle-wayland-include-protocol.patch
Normal file
38
angle-wayland-include-protocol.patch
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
diff -upr third_party/angle.orig/BUILD.gn third_party/angle/BUILD.gn
|
||||||
|
--- a/third_party/angle.orig/BUILD.gn 2022-08-17 19:38:11.000000000 +0000
|
||||||
|
+++ b/third_party/angle/BUILD.gn 2022-08-18 11:04:09.061751111 +0000
|
||||||
|
@@ -489,6 +489,12 @@ config("angle_vulkan_wayland_config") {
|
||||||
|
if (angle_enable_vulkan && angle_use_wayland &&
|
||||||
|
defined(vulkan_wayland_include_dirs)) {
|
||||||
|
include_dirs = vulkan_wayland_include_dirs
|
||||||
|
+ } else if (angle_enable_vulkan && angle_use_wayland) {
|
||||||
|
+ include_dirs = [
|
||||||
|
+ "$wayland_gn_dir/src/src",
|
||||||
|
+ "$wayland_gn_dir/include/src",
|
||||||
|
+ "$wayland_gn_dir/include/protocol",
|
||||||
|
+ ]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1073,6 +1079,7 @@ if (angle_use_wayland) {
|
||||||
|
include_dirs = [
|
||||||
|
"$wayland_dir/egl",
|
||||||
|
"$wayland_dir/src",
|
||||||
|
+ "$wayland_gn_dir/include/protocol",
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
diff -upr third_party/angle.orig/src/third_party/volk/BUILD.gn third_party/angle/src/third_party/volk/BUILD.gn
|
||||||
|
--- a/third_party/angle.orig/src/third_party/volk/BUILD.gn 2022-08-17 19:38:12.000000000 +0000
|
||||||
|
+++ b/third_party/angle/src/third_party/volk/BUILD.gn 2022-08-18 11:04:36.499828006 +0000
|
||||||
|
@@ -21,6 +21,9 @@ source_set("volk") {
|
||||||
|
configs += [ "$angle_root:angle_no_cfi_icall" ]
|
||||||
|
public_deps = [ "$angle_vulkan_headers_dir:vulkan_headers" ]
|
||||||
|
if (angle_use_wayland) {
|
||||||
|
- include_dirs = [ "$wayland_dir/src" ]
|
||||||
|
+ include_dirs = [
|
||||||
|
+ "$wayland_dir/src",
|
||||||
|
+ "$wayland_gn_dir/include/protocol",
|
||||||
|
+ ]
|
||||||
|
}
|
||||||
|
}
|
|
@ -50,8 +50,8 @@
|
||||||
# GOST patches and sources
|
# GOST patches and sources
|
||||||
# Using commit hashes because upstream often puts tags long after making changes
|
# 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)
|
# (they wait for builds to finish to make a new "release" with binary packages)
|
||||||
%define chromium_gost_commit b8bb24daca333ce67c0bb8f9d0c7103038020dbe
|
%define chromium_gost_commit fccc49b952ad6c84709a4cbf82e9277f81dd41ae
|
||||||
%define msspi_commit afe02c38f9b29883a033c652f548b09876e2f9b9
|
%define msspi_commit 0d09dc6de9df58041fc385ac49e5778323e547f4
|
||||||
%define _gostsourcedir %{_builddir}/chromium-gost
|
%define _gostsourcedir %{_builddir}/chromium-gost
|
||||||
|
|
||||||
%define xcb_version 1.14.1
|
%define xcb_version 1.14.1
|
||||||
|
@ -80,8 +80,8 @@
|
||||||
|
|
||||||
Summary: A fast web browser based on the Blink engine
|
Summary: A fast web browser based on the Blink engine
|
||||||
Name: chromium-browser-stable
|
Name: chromium-browser-stable
|
||||||
Version: 102.0.5005.61
|
Version: 105.0.5195.102
|
||||||
Release: 3
|
Release: 1
|
||||||
License: BSD, LGPL
|
License: BSD, LGPL
|
||||||
Group: Networking/WWW
|
Group: Networking/WWW
|
||||||
Url: https://www.chromium.org/Home
|
Url: https://www.chromium.org/Home
|
||||||
|
@ -130,11 +130,14 @@ Patch651: 0001-Functional-new-tab-page-with-non-Google-search-engin.patch
|
||||||
Patch652: 0002-Yandex-as-default-search-engine.patch
|
Patch652: 0002-Yandex-as-default-search-engine.patch
|
||||||
Patch653: 0003-Remove-voice-search-button.patch
|
Patch653: 0003-Remove-voice-search-button.patch
|
||||||
Patch654: 0004-Hide-sync-with-Google.patch
|
Patch654: 0004-Hide-sync-with-Google.patch
|
||||||
|
# reported to upstream: https://crbug.com/1335359
|
||||||
Patch655: 0005-Adjust-sizes-in-new-tab-page-for-Russian-text.patch
|
Patch655: 0005-Adjust-sizes-in-new-tab-page-for-Russian-text.patch
|
||||||
# Block odd interaction with Google servers, probably including loading promo Google logos
|
# Block odd interaction with Google servers, probably including loading promo Google logos
|
||||||
# (e.g. an LGBT-colored one, https://clck.ru/niFdJ)
|
# (e.g. an LGBT-colored one, https://clck.ru/niFdJ)
|
||||||
# https://github.com/Eloston/ungoogled-chromium/blob/master/patches/core/ungoogled-chromium/block-requests.patch
|
# https://github.com/Eloston/ungoogled-chromium/blob/master/patches/core/ungoogled-chromium/block-requests.patch
|
||||||
Patch656: block-requests.patch
|
Patch656: block-requests.patch
|
||||||
|
# From Arch Linux, fix includes
|
||||||
|
Patch657: angle-wayland-include-protocol.patch
|
||||||
|
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
BuildRequires: llvm15
|
BuildRequires: llvm15
|
||||||
|
@ -223,8 +226,6 @@ BuildRequires: pythonegg(setuptools)
|
||||||
# https://bugs.chromium.org/p/dawn/issues/detail?id=1441
|
# https://bugs.chromium.org/p/dawn/issues/detail?id=1441
|
||||||
BuildRequires: git-core
|
BuildRequires: git-core
|
||||||
|
|
||||||
BuildRequires: %{_lib}atomic-devel
|
|
||||||
|
|
||||||
Requires: chromium-codecs = %{EVRD}
|
Requires: chromium-codecs = %{EVRD}
|
||||||
|
|
||||||
Provides: chromium-browser = %{EVRD}
|
Provides: chromium-browser = %{EVRD}
|
||||||
|
@ -579,6 +580,7 @@ CXXFLAGS="-nostdinc++ \
|
||||||
-Wno-unused-command-line-argument \
|
-Wno-unused-command-line-argument \
|
||||||
-I%{_includedir}/libstdc++-gcc10 \
|
-I%{_includedir}/libstdc++-gcc10 \
|
||||||
-I%{_includedir}/libstdc++-gcc10/%{_host} \
|
-I%{_includedir}/libstdc++-gcc10/%{_host} \
|
||||||
|
-D__STDCPP_WANT_MATH_SPEC_FUNCS__=1 \
|
||||||
" \
|
" \
|
||||||
%{__python} tools/gn/bootstrap/bootstrap.py --gn-gen-args='%{gn_config}'
|
%{__python} tools/gn/bootstrap/bootstrap.py --gn-gen-args='%{gn_config}'
|
||||||
unset LDFLAGS CXXFLAGS
|
unset LDFLAGS CXXFLAGS
|
||||||
|
|
Loading…
Add table
Reference in a new issue