From 6d6f177fa9dcdc7171f86ed002a035547b0dda52 Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Thu, 15 Feb 2024 01:25:14 +0300
Subject: [PATCH] import chromium-121.0.6167.184-1.el9

---
 .chromium.metadata  |  2 +-
 .gitignore          |  2 +-
 SPECS/chromium.spec | 27 +++++++++++++++++++++------
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/.chromium.metadata b/.chromium.metadata
index 3513b3f0..a447bf52 100644
--- a/.chromium.metadata
+++ b/.chromium.metadata
@@ -1,3 +1,3 @@
-2c94f1467625311223004d63f3393b2a58e6c17b  SOURCES/chromium-121.0.6167.160-clean.tar.xz
+34dd20d324f5ac385e679cbfcbbc36f742d7f0be  SOURCES/chromium-121.0.6167.184-clean.tar.xz
 7e5d2c7864c5c83ec789b59c77cd9c20d2594916  SOURCES/linux-arm64-0.19.2.tgz
 dea187019741602d57aaf189a80abba261fbd2aa  SOURCES/linux-x64-0.19.2.tgz
diff --git a/.gitignore b/.gitignore
index 0b198e2e..d7b641d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-SOURCES/chromium-121.0.6167.160-clean.tar.xz
+SOURCES/chromium-121.0.6167.184-clean.tar.xz
 SOURCES/linux-arm64-0.19.2.tgz
 SOURCES/linux-x64-0.19.2.tgz
diff --git a/SPECS/chromium.spec b/SPECS/chromium.spec
index 0fbb9b08..7c3b9304 100644
--- a/SPECS/chromium.spec
+++ b/SPECS/chromium.spec
@@ -197,11 +197,11 @@
 %global bundlelibaom 1
 %global bundlelibavif 1
 %global bundledav1d 1
+%global bundlesnappy 1
 
 # Fedora's Python 2 stack is being removed, we use the bundled Python libraries
 # This can be revisited once we upgrade to Python 3
 %global bundlepylibs 0
-%global bundlelibevent 0
 %global bundlelibxslt 0
 %global bundleflac 0
 
@@ -231,9 +231,9 @@
 %global bundlecrc32c 1
 %global bundledoubleconversion 1
 %global bundlelibsecret 1
-%global bundlesnappy 1
 %global bundlelibXNVCtrl 1
 %global bundlelibxml 1
+%global bundlelibevent 1
 %else
 %if 0%{?fedora} > 38 || 0%{?rhel} > 9
 %global bundlebrotli 0
@@ -261,9 +261,9 @@
 %endif
 %global bundledoubleconversion 0
 %global bundlelibsecret 0
-%global bundlesnappy 1
 %global bundlelibXNVCtrl 0
 %global bundlelibxml 0
+%global bundlelibevent 0
 %endif
 
 ### From 2013 until early 2021, Google permitted distribution builds of
@@ -300,7 +300,7 @@
 %endif
 
 Name:	chromium%{chromium_channel}
-Version: 121.0.6167.160
+Version: 121.0.6167.184
 Release: 1%{?dist}
 Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use
 Url: http://www.chromium.org/Home
@@ -1065,8 +1065,10 @@ udev.
 %endif
 
 %if ! %{bundlelibxml}
+%if 0%{?fedora} && 0%{?fedora} < 40 || 0%{?rhel} && 0%{?rhel} < 10
 %patch -P90 -p1 -b .system-libxml
 %endif
+%endif
 
 %if ! %{bundleopus}
 %patch -P91 -p1 -b .system-opus
@@ -1238,6 +1240,14 @@ CXXFLAGS="$CFLAGS"
 CFLAGS="$FLAGS"
 CXXFLAGS="$FLAGS"
 %endif
+# reduce the size of relocations
+%if 0%{?fedora} || 0%{?rhel} > 9
+LDFLAGS="$LDFLAGS -Wl,-z,pack-relative-relocs"
+RUSTFLAGS=${RUSTFLAGS/--cap-lints/-Clink-arg=-Wl,-z,pack-relative-relocs --cap-lints}
+%if ! %{enable_debug}
+RUSTFLAGS=${RUSTFLAGS/debuginfo=?/debuginfo=0}
+%endif
+%endif
 
 %if %{clang}
 export CC=clang
@@ -1254,6 +1264,8 @@ export READELF=readelf
 %endif
 export CFLAGS
 export CXXFLAGS
+export LDFLAGS
+export RUSTFLAGS
 
 # enable toolset on el7
 %if 0%{?rhel} == 7
@@ -1284,7 +1296,7 @@ CHROMIUM_CORE_GN_DEFINES=""
 # using system toolchain
 CHROMIUM_CORE_GN_DEFINES+=' custom_toolchain="//build/toolchain/linux/unbundle:default"'
 CHROMIUM_CORE_GN_DEFINES+=' host_toolchain="//build/toolchain/linux/unbundle:default"'
-CHROMIUM_CORE_GN_DEFINES+=' is_debug=false'
+CHROMIUM_CORE_GN_DEFINES+=' is_debug=false dcheck_always_on=false dcheck_is_configurable=false'
 CHROMIUM_CORE_GN_DEFINES+=' use_goma=false'
 CHROMIUM_CORE_GN_DEFINES+=' enable_nacl=false'
 CHROMIUM_CORE_GN_DEFINES+=' system_libdir="%{_lib}"'
@@ -1392,7 +1404,7 @@ CHROMIUM_BROWSER_GN_DEFINES+=' use_v4l2_codec=true'
 %endif
 
 %if 0%{?fedora} || 0%{?rhel} >= 8
-CHROMIUM_BROWSER_GN_DEFINES+=' rtc_use_pipewire=true'
+CHROMIUM_BROWSER_GN_DEFINES+=' rtc_use_pipewire=true rtc_link_pipewire=true'
 %endif
 
 %if ! %{bundlelibjpeg}
@@ -1920,6 +1932,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 %{chromium_path}/chromedriver
 
 %changelog
+* Wed Feb 14 2024 Than Ngo <than@redhat.com> - 121.0.6167.184-1
+- update to 121.0.6167.184
+
 * Wed Feb 07 2024 Than Ngo <than@redhat.com> - 121.0.6167.160-1
 - update to 121.0.6167.160
   * High CVE-2024-1284: Use after free in Mojo