Notification time stamped 2022-12-31 12:59:37 UTC
From 3cd5befbda9a87abc6ea333e50a5708b2f374f47 Mon Sep 17 00:00:00 2001
From: Than Ngo <than(a)redhat.com>
Date: Dec 28 2022 21:08:28 +0000
Subject: drop build dependency on python3-importlib-metadata
fix symlinks
---
diff --git a/chromium-105.0.5195.125-arm64-gcc-fix.patch
b/chromium-105.0.5195.125-arm64-gcc-fix.patch
deleted file mode 100644
index d9ad16a..0000000
--- a/chromium-105.0.5195.125-arm64-gcc-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up chromium-105.0.5195.125/v8/BUILD.gn.arm64-gcc-fix
chromium-105.0.5195.125/v8/BUILD.gn
---- chromium-105.0.5195.125/v8/BUILD.gn.arm64-gcc-fix 2022-09-20 18:12:30.766293126
+0000
-+++ chromium-105.0.5195.125/v8/BUILD.gn 2022-09-20 18:13:04.376435347 +0000
-@@ -1095,7 +1095,7 @@ config("toolchain") {
- defines += [ "V8_TARGET_ARCH_ARM64" ]
- if (current_cpu == "arm64") {
- # This will enable PAC+BTI in code generation and static code.
-- if (v8_control_flow_integrity &&
-+ if (v8_control_flow_integrity && is_clang &&
- (!build_with_chromium || arm_control_flow_integrity == "standard"))
{
- cflags += [ "-mbranch-protection=standard" ]
- asmflags = [ "-mmark-bti-property" ]
diff --git a/chromium-108-drop-python-importlib-metadata.patch
b/chromium-108-drop-python-importlib-metadata.patch
new file mode 100644
index 0000000..dbba0c6
--- /dev/null
+++ b/chromium-108-drop-python-importlib-metadata.patch
@@ -0,0 +1,80 @@
+diff -up
chromium-108.0.5359.124/third_party/mako/mako/mako/compat.py.drop-python-importlib-metadata
chromium-108.0.5359.124/third_party/mako/mako/mako/compat.py
+---
chromium-108.0.5359.124/third_party/mako/mako/mako/compat.py.drop-python-importlib-metadata 2022-12-14
01:40:09.000000000 +0100
++++ chromium-108.0.5359.124/third_party/mako/mako/mako/compat.py 2022-12-28
14:07:33.761045114 +0100
+@@ -11,7 +11,6 @@ import sys
+
+ win32 = sys.platform.startswith("win")
+ pypy = hasattr(sys, "pypy_version_info")
+-py38 = sys.version_info >= (3, 8)
+
+ ArgSpec = collections.namedtuple(
+ "ArgSpec", ["args", "varargs", "keywords",
"defaults"]
+@@ -60,17 +59,3 @@ def exception_as():
+
+ def exception_name(exc):
+ return exc.__class__.__name__
+-
+-
+-if py38:
+- from importlib import metadata as importlib_metadata
+-else:
+- import importlib_metadata # noqa
+-
+-
+-def importlib_metadata_get(group):
+- ep = importlib_metadata.entry_points()
+- if hasattr(ep, "select"):
+- return ep.select(group=group)
+- else:
+- return ep.get(group, ())
+diff -up
chromium-108.0.5359.124/third_party/mako/mako/mako/util.py.drop-python-importlib-metadata
chromium-108.0.5359.124/third_party/mako/mako/mako/util.py
+---
chromium-108.0.5359.124/third_party/mako/mako/mako/util.py.drop-python-importlib-metadata 2022-12-14
01:40:09.000000000 +0100
++++ chromium-108.0.5359.124/third_party/mako/mako/mako/util.py 2022-12-28
14:07:33.761045114 +0100
+@@ -11,8 +11,6 @@ import os
+ import re
+ import timeit
+
+-from .compat import importlib_metadata_get
+-
+
+ def update_wrapper(decorated, fn):
+ decorated.__wrapped__ = fn
+@@ -28,17 +26,17 @@ class PluginLoader:
+ def load(self, name):
+ if name in self.impls:
+ return self.impls[name]()
++ import pkg_resources
+
+- for impl in importlib_metadata_get(self.group):
+- if impl.name == name:
+- self.impls[name] = impl.load
+- return impl.load()
+-
+- from mako import exceptions
+-
+- raise exceptions.RuntimeException(
+- "Can't load plugin %s %s" % (self.group, name)
+- )
++ for impl in pkg_resources.iter_entry_points(self.group, name):
++ self.impls[name] = impl.load
++ return impl.load()
++ else:
++ from mako import exceptions
++
++ raise exceptions.RuntimeException(
++ "Can't load plugin %s %s" % (self.group, name)
++ )
+
+ def register(self, name, modulepath, objname):
+ def load():
+diff -up
chromium-108.0.5359.124/third_party/mako/mako/setup.cfg.drop-python-importlib-metadata
chromium-108.0.5359.124/third_party/mako/mako/setup.cfg
+---
chromium-108.0.5359.124/third_party/mako/mako/setup.cfg.drop-python-importlib-metadata 2022-12-28
14:07:33.761045114 +0100
++++ chromium-108.0.5359.124/third_party/mako/mako/setup.cfg 2022-12-28 15:30:47.024152133
+0100
+@@ -33,7 +33,6 @@ python_requires = >=3.7
+ zip_safe = false
+ install_requires =
+ MarkupSafe >= 0.9.2
+- importlib-metadata;python_version<"3.8"
+
+ [options.packages.find]
+ exclude =
diff --git a/chromium-108-el7-drop-python-importlib-metadata.patch
b/chromium-108-el7-drop-python-importlib-metadata.patch
deleted file mode 100644
index dbba0c6..0000000
--- a/chromium-108-el7-drop-python-importlib-metadata.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -up
chromium-108.0.5359.124/third_party/mako/mako/mako/compat.py.drop-python-importlib-metadata
chromium-108.0.5359.124/third_party/mako/mako/mako/compat.py
----
chromium-108.0.5359.124/third_party/mako/mako/mako/compat.py.drop-python-importlib-metadata 2022-12-14
01:40:09.000000000 +0100
-+++ chromium-108.0.5359.124/third_party/mako/mako/mako/compat.py 2022-12-28
14:07:33.761045114 +0100
-@@ -11,7 +11,6 @@ import sys
-
- win32 = sys.platform.startswith("win")
- pypy = hasattr(sys, "pypy_version_info")
--py38 = sys.version_info >= (3, 8)
-
- ArgSpec = collections.namedtuple(
- "ArgSpec", ["args", "varargs", "keywords",
"defaults"]
-@@ -60,17 +59,3 @@ def exception_as():
-
- def exception_name(exc):
- return exc.__class__.__name__
--
--
--if py38:
-- from importlib import metadata as importlib_metadata
--else:
-- import importlib_metadata # noqa
--
--
--def importlib_metadata_get(group):
-- ep = importlib_metadata.entry_points()
-- if hasattr(ep, "select"):
-- return ep.select(group=group)
-- else:
-- return ep.get(group, ())
-diff -up
chromium-108.0.5359.124/third_party/mako/mako/mako/util.py.drop-python-importlib-metadata
chromium-108.0.5359.124/third_party/mako/mako/mako/util.py
----
chromium-108.0.5359.124/third_party/mako/mako/mako/util.py.drop-python-importlib-metadata 2022-12-14
01:40:09.000000000 +0100
-+++ chromium-108.0.5359.124/third_party/mako/mako/mako/util.py 2022-12-28
14:07:33.761045114 +0100
-@@ -11,8 +11,6 @@ import os
- import re
- import timeit
-
--from .compat import importlib_metadata_get
--
-
- def update_wrapper(decorated, fn):
- decorated.__wrapped__ = fn
-@@ -28,17 +26,17 @@ class PluginLoader:
- def load(self, name):
- if name in self.impls:
- return self.impls[name]()
-+ import pkg_resources
-
-- for impl in importlib_metadata_get(self.group):
-- if impl.name == name:
-- self.impls[name] = impl.load
-- return impl.load()
--
-- from mako import exceptions
--
-- raise exceptions.RuntimeException(
-- "Can't load plugin %s %s" % (self.group, name)
-- )
-+ for impl in pkg_resources.iter_entry_points(self.group, name):
-+ self.impls[name] = impl.load
-+ return impl.load()
-+ else:
-+ from mako import exceptions
-+
-+ raise exceptions.RuntimeException(
-+ "Can't load plugin %s %s" % (self.group, name)
-+ )
-
- def register(self, name, modulepath, objname):
- def load():
-diff -up
chromium-108.0.5359.124/third_party/mako/mako/setup.cfg.drop-python-importlib-metadata
chromium-108.0.5359.124/third_party/mako/mako/setup.cfg
----
chromium-108.0.5359.124/third_party/mako/mako/setup.cfg.drop-python-importlib-metadata 2022-12-28
14:07:33.761045114 +0100
-+++ chromium-108.0.5359.124/third_party/mako/mako/setup.cfg 2022-12-28 15:30:47.024152133
+0100
-@@ -33,7 +33,6 @@ python_requires = >=3.7
- zip_safe = false
- install_requires =
- MarkupSafe >= 0.9.2
-- importlib-metadata;python_version<"3.8"
-
- [options.packages.find]
- exclude =
diff --git a/chromium.spec b/chromium.spec
index 2271496..c93d7d5 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -313,8 +313,8 @@ Patch86: chromium-94.0.4606.81-clang-format.patch
# This is only in Fedora 37+
Patch87: chromium-99.0.4844.84-markdownsafe-soft_str.patch
-# There is a corner case where v8 tries to pass a clang only flag without checking
is_clang
-Patch88: chromium-105.0.5195.125-arm64-gcc-fix.patch
+# drop build dependency on python3-importlib-metadata
+Patch88: chromium-108-drop-python-importlib-metadata.patch
# Fix extra qualification error
Patch97: chromium-107.0.5304.110-remoting-extra-qualification.patch
@@ -331,9 +331,6 @@ Patch100: chromium-108-el7-include-fcntl-memfd.patch
# add define HAVE_STRNDUP on epel7
Patch101: chromium-108-el7-wayland-strndup-error.patch
-# drop build dependency of python3-importlib-metadata on el7
-Patch102: chromium-108-el7-drop-python-importlib-metadata.patch
-
# Work around old and missing headers on EPEL7
Patch103: chromium-99.0.4844.51-epel7-old-headers-workarounds.patch
@@ -613,11 +610,9 @@ BuildRequires: pkgconfig(gtk+-2.0)
%if %{build_with_python3}
BuildRequires: python3-devel
BuildRequires: python3-zipp
-BuildRequires: python3-importlib-metadata
%else
BuildRequires: python2-devel
BuildRequires: python-zipp
-BuildRequires: python-importlib-metadata
%endif
%if 0%{?build_with_python3}
@@ -996,7 +991,7 @@ udev.
%patch87 -p1 -b .markdownsafe-soft_str
%endif
-# %%patch88 -p1 -b .arm64-gcc-fix
+%patch88 -p1 -b .drop-build-dep-on-python3-importlib-metadata
%patch97 -p1 -b .remoting-extra-qualification
%patch98 -p1 -b .InkDropHost-crash
%patch99 -p1 -b .enable-WebRTCPipeWireCapturer-byDefault
@@ -1019,8 +1014,6 @@ udev.
%if 0%{?rhel} == 7
%patch100 -p1 -b .el7-memfd-fcntl-include
%patch101 -p1 -b .wayland-strndup-error
-# drop BR on python3-importlib-metadata
-# %%patch102 -p1 -b .drop-python-importlib-metadata
%patch103 -p1 -b .epel7-header-workarounds
%patch104 -p1 -b .el7cups
%patch105 -p1 -b .el7-old-libdrm
@@ -1439,8 +1432,7 @@ sed -i
"s|@@CHROMIUM_BROWSER_CHANNEL@@|$CHROMIUM_BROWSER_CHANNEL|g" %{buildroot}
sed -i "s|@@EXTRA_FLAGS@@|$EXTRA_FLAGS|g"
%{buildroot}%{chromium_path}/%{chromium_browser_channel}.sh
%endif
-
-ln -sr %{chromium_path}/%{chromium_browser_channel}.sh
%{buildroot}%{_bindir}/%{chromium_browser_channel}
+ln -s ../%{chromium_path}/%{chromium_browser_channel}.sh
%{buildroot}%{_bindir}/%{chromium_browser_channel}
mkdir -p %{buildroot}%{_mandir}/man1/
pushd %{builddir}
@@ -1494,7 +1486,7 @@ pushd %{builddir}
# chromedriver
cp -a chromedriver %{buildroot}%{chromium_path}/chromedriver
- ln -sr %{chromium_path}/chromedriver %{buildroot}%{_bindir}/chromedriver
+ ln -s ../%{chromium_path}/chromedriver %{buildroot}%{_bindir}/chromedriver
%if %{build_remoting}
# Remote desktop bits
https://src.fedoraproject.org/rpms/chromium/c/3cd5befbda9a87abc6ea333e50a...