$ git diff --patch-with-stat --summary 3a602e6da6507fd50d6c10c0ffa6076e7dbd1588..07cc70109dd971f7d84239920f5e50c49733346e
.abf.yml | 2 +-
chromium-browser-stable.spec | 38 +++++++++++++++++++++++++++++---------
2 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/.abf.yml b/.abf.yml
index 9f3f9e9..9e70a53 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,3 @@
sources:
chromium-102-patchset-6.tar.xz: dc5cc65cb636762dd68f23a7009d09dec4166698
- chromium-102.0.5005.61.tar.xz: abdbab7a0a39813a71d86a20a2900c9008d48d87
+ chromium-102.0.5005.115.tar.xz: f0c73791d18158ee16e5233d93a16122fd8159f4
diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec
index 1ae09ee..0cdd357 100644
--- a/chromium-browser-stable.spec
+++ b/chromium-browser-stable.spec
@@ -17,12 +17,20 @@
%define _crdir %{_libdir}/%{crname}
%define _src %{_topdir}/SOURCES
# For incomplete debug package support
-#define _empty_manifest_terminate_build 0
+%define _empty_manifest_terminate_build 0
%ifarch %ix86
%define _build_pkgcheck_set %{nil}
%endif
+# crisb - build hangs with python3.11 during rminjs
+%if %omvver > 4050000
+%define build_py python3.9
+%else
+%define build_py python3
+%endif
+
+
# FIXME As of 97.0.4688.2, Chromium crashes frequently when
# built with fortification enabled.
# [3784233:1:1107/202853.599120:ERROR:socket.cc(93)] sendmsg: Broken pipe (32)
@@ -78,7 +86,7 @@
Name: chromium-browser-%{channel}
# Working version numbers can be found at
# http://omahaproxy.appspot.com/
-Version: 102.0.5005.61
+Version: 102.0.5005.115
Release: 1%{?extrarelsuffix}
Summary: A fast webkit-based web browser
Group: Networking/WWW
@@ -170,6 +178,7 @@ Provides: %{crname}
Obsoletes: chromium-browser-unstable < 26.0.1410.51
Obsoletes: chromium-browser-beta < 26.0.1410.51
Obsoletes: chromium-browser < 1:9.0.597.94
+BuildRequires: glibc-static-devel
BuildRequires: gperf
BuildRequires: bison
BuildRequires: re2c
@@ -246,8 +255,16 @@ BuildRequires: pkgconfig(lcms2)
%if %{with system_minizip}
BuildRequires: pkgconfig(minizip)
%endif
+
+%if %omvver > 4050000
+BuildRequires: pkgconfig(python-3.9)
+%else
+BuildRequires: pkgconfig(python)
BuildRequires: pkgconfig(protobuf)
BuildRequires: python3dist(protobuf)
+BuildRequires: python3dist(markupsafe)
+%endif
+
BuildRequires: yasm
BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: speech-dispatcher-devel
@@ -256,7 +273,6 @@ BuildRequires: pkgconfig(libexif)
BuildRequires: ninja
BuildRequires: nodejs
BuildRequires: jdk-current
-BuildRequires: python3dist(markupsafe)
%description
Chromium is a browser that combines a minimal design with sophisticated
@@ -340,13 +356,15 @@ for lib in %{system_libs}; do
\! -regex '.*\.\(gn\|gni\|isolate\)' \
-delete
done
-python build/linux/unbundle/replace_gn_files.py \
+%build_py build/linux/unbundle/replace_gn_files.py \
--system-libraries %{system_libs}
+%if %omvver <= 4050000
# Look, I don't know. This package is spit and chewing gum. Sorry.
rm -rf third_party/markupsafe
ln -s %{python3_sitearch}/markupsafe third_party/markupsafe
# We should look on removing other python packages as well i.e. ply
+%endif
# workaround build failure
if [ ! -f chrome/test/data/webui/i18n_process_css_test.html ]; then
@@ -358,7 +376,6 @@ fi
%ifarch %{arm}
# Use linker flags to reduce memory consumption on low-mem architectures
-%global optflags %(echo %{optflags} | sed -e 's/-g3 /-g0 /' -e 's/-gdwarf-4//')
mkdir -p bfd
ln -s %{_bindir}/ld.bfd bfd/ld
export PATH=$PWD/bfd:$PATH
@@ -369,7 +386,7 @@ export PATH=$PWD/bfd:$PATH
# Workaround for build failure
%global ldflags %{ldflags} -Wl,-z,notext
%endif
-%global optflags %(echo %{optflags} | sed -e 's/-g3 /-g0 /' -e 's/-gdwarf-4//')
+%global optflags %(echo %{optflags} | sed -e 's/-g3 /-g1 /' -e 's/-gdwarf-4//')
%global optflags %{optflags} -I%{_includedir}/libunwind
export CC=clang
@@ -426,6 +443,9 @@ CHROMIUM_CORE_GN_DEFINES+=" rtc_build_with_neon=true"
%endif
%ifarch %{aarch64}
CHROMIUM_CORE_GN_DEFINES+=" target_cpu=\"arm64\""
+# if this is true (default for non official builds) it tries to use
+# a prebuilt x86 binary in the source tree
+CHROMIUM_CORE_GN_DEFINES+=" devtools_skip_typecheck=false"
%endif
CHROMIUM_CORE_GN_DEFINES+=" google_api_key=\"%{google_api_key}\""
CHROMIUM_CORE_GN_DEFINES+=" google_default_client_id=\"%{google_default_client_id}\""
@@ -472,11 +492,11 @@ fi
export CC=%{__cc}
export CXX=%{__cxx}
-python tools/gn/bootstrap/bootstrap.py --skip-generate-buildfiles
+%build_py tools/gn/bootstrap/bootstrap.py --skip-generate-buildfiles
-python third_party/libaddressinput/chromium/tools/update-strings.py
+%build_py third_party/libaddressinput/chromium/tools/update-strings.py
-out/Release/gn gen --script-executable=/usr/bin/python --args="${CHROMIUM_CORE_GN_DEFINES} ${CHROMIUM_BROWSER_GN_DEFINES}" out/Release
+out/Release/gn gen --script-executable=/usr/bin/%build_py --args="${CHROMIUM_CORE_GN_DEFINES} ${CHROMIUM_BROWSER_GN_DEFINES}" out/Release
# Note: DON'T use system sqlite (3.7.3) -- it breaks history search
# As of 36.0.1985.143, use_system_icu breaks the build.