The package rpms/chromium.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=367d6daf8....
Change:
+%ifarch aarch64
Thanks.
Full change:
============
commit d2a8ef647b2dff477b0cff43a43812ae7b948b35
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Mon Sep 20 13:41:41 2021 -0400
fix against harfbuzz v3, thanks to Jan Beich @ FreeBSD
diff --git a/chromium-93.0.4577.82-harfbuzz3.patch
b/chromium-93.0.4577.82-harfbuzz3.patch
new file mode 100644
index 0000000..1ed23fe
--- /dev/null
+++ b/chromium-93.0.4577.82-harfbuzz3.patch
@@ -0,0 +1,97 @@
+diff -up chromium-93.0.4577.82/components/paint_preview/common/subset_font.cc.hbfix
chromium-93.0.4577.82/components/paint_preview/common/subset_font.cc
+--- chromium-93.0.4577.82/components/paint_preview/common/subset_font.cc.hbfix 2021-09-20
11:37:58.633517817 -0400
++++ chromium-93.0.4577.82/components/paint_preview/common/subset_font.cc 2021-09-20
11:40:12.111235467 -0400
+@@ -72,9 +72,11 @@ sk_sp<SkData> SubsetFont(SkTypeface* typ
+ hb_set_t* glyphs =
+ hb_subset_input_glyph_set(input.get()); // Owned by |input|.
+ usage.ForEach(base::BindRepeating(&AddGlyphs, base::Unretained(glyphs)));
+- hb_subset_input_set_retain_gids(input.get(), true);
++ hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS);
+
+- HbScoped<hb_face_t> subset_face(hb_subset(face.get(), input.get()));
++ HbScoped<hb_face_t> subset_face(hb_subset_or_fail(face.get(), input.get()));
++ if (!subset_face)
++ return nullptr;
+ HbScoped<hb_blob_t> subset_blob(hb_face_reference_blob(subset_face.get()));
+ if (!subset_blob)
+ return nullptr;
+diff -up chromium-93.0.4577.82/third_party/skia/gn/skia.gni.hbfix
chromium-93.0.4577.82/third_party/skia/gn/skia.gni
+--- chromium-93.0.4577.82/third_party/skia/gn/skia.gni.hbfix 2021-09-20
11:41:20.078600944 -0400
++++ chromium-93.0.4577.82/third_party/skia/gn/skia.gni 2021-09-20 11:42:29.851976086
-0400
+@@ -33,8 +33,6 @@ declare_args() {
+ skia_include_multiframe_procs = false
+ skia_lex = false
+ skia_libgifcodec_path = "third_party/externals/libgifcodec"
+- skia_pdf_subset_harfbuzz =
+- false # TODO: set skia_pdf_subset_harfbuzz to skia_use_harfbuzz.
+ skia_qt_path = getenv("QT_PATH")
+ skia_skqp_global_error_tolerance = 0
+ skia_tools_require_resources = false
+@@ -99,6 +97,10 @@ declare_args() {
+ }
+
+ declare_args() {
++ skia_pdf_subset_harfbuzz = skia_use_harfbuzz
++}
++
++declare_args() {
+ skia_compile_sksl_tests = skia_compile_processors
+ skia_enable_fontmgr_android = skia_use_expat && skia_use_freetype
+ skia_enable_fontmgr_custom_directory = skia_use_freetype && !is_fuchsia
+diff -up chromium-93.0.4577.82/third_party/skia/src/pdf/SkPDFSubsetFont.cpp.hbfix
chromium-93.0.4577.82/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
+--- chromium-93.0.4577.82/third_party/skia/src/pdf/SkPDFSubsetFont.cpp.hbfix 2021-09-20
13:34:57.861369449 -0400
++++ chromium-93.0.4577.82/third_party/skia/src/pdf/SkPDFSubsetFont.cpp 2021-09-20
13:38:28.063504311 -0400
+@@ -49,6 +49,37 @@ static sk_sp<SkData> to_data(HBBlob blob
+ blob.release());
+ }
+
++template<typename...> using void_t = void;
++template<typename T, typename = void>
++struct SkPDFHarfBuzzSubset {
++ // This is the HarfBuzz 3.0 interface.
++ // hb_subset_flags_t does not exist in 2.0. It isn't dependent on T, so inline
the value of
++ // HB_SUBSET_FLAGS_RETAIN_GIDS until 2.0 is no longer supported.
++ static HBFace Make(T input, hb_face_t* face) {
++ // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY.
++ // If it isn't known if a font is 'tricky', retain the hints.
++ hb_subset_input_set_flags(input, 2/*HB_SUBSET_FLAGS_RETAIN_GIDS*/);
++ return HBFace(hb_subset_or_fail(face, input));
++ }
++};
++template<typename T>
++struct SkPDFHarfBuzzSubset<T, void_t<
++ decltype(hb_subset_input_set_retain_gids(std::declval<T>(),
std::declval<bool>())),
++ decltype(hb_subset_input_set_drop_hints(std::declval<T>(),
std::declval<bool>())),
++ decltype(hb_subset(std::declval<hb_face_t*>(), std::declval<T>()))
++ >>
++{
++ // This is the HarfBuzz 2.0 (non-public) interface, used if it exists.
++ // This code should be removed as soon as all users are migrated to the newer API.
++ static HBFace Make(T input, hb_face_t* face) {
++ hb_subset_input_set_retain_gids(input, true);
++ // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY.
++ // If it isn't known if a font is 'tricky', retain the hints.
++ hb_subset_input_set_drop_hints(input, false);
++ return HBFace(hb_subset(face, input));
++ }
++};
++
+ static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData> fontData,
+ const SkPDFGlyphUse& glyphUsage,
+ int ttcIndex) {
+@@ -71,11 +102,10 @@ static sk_sp<SkData> subset_harfbuzz(sk_
+ hb_set_t* glyphs = hb_subset_input_glyph_set(input.get());
+ glyphUsage.getSetValues([&glyphs](unsigned gid) { hb_set_add(glyphs, gid);});
+
+- hb_subset_input_set_retain_gids(input.get(), true);
+- // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY.
+- // If it isn't known if a font is 'tricky', retain the hints.
+- hb_subset_input_set_drop_hints(input.get(), false);
+- HBFace subset(hb_subset(face.get(), input.get()));
++ HBFace subset = SkPDFHarfBuzzSubset<hb_subset_input_t*>::Make(input.get(),
face.get());
++ if (!subset) {
++ return nullptr;
++ }
+ HBBlob result(hb_face_reference_blob(subset.get()));
+ return to_data(std::move(result));
+ }
diff --git a/chromium.spec b/chromium.spec
index 4c3d565..43dceef 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -225,7 +225,7 @@ Name: chromium%{chromium_channel}%{nsuffix}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.4577.82
-Release: 1%{?dist}
+Release: 2%{?dist}
%if %{?freeworld}
%if %{?shared}
# chromium-libs-media-freeworld
@@ -349,6 +349,9 @@ Patch93: chromium-93.0.4577.63-vector-fix.patch
Patch94: chromium-93.0.4577.63-remoting-nodestructor-fix.patch
# include full UrlResponseHead header
Patch95: chromium-93.0.4577.63-mojo-header-fix.patch
+# Fix against HarfBuzz v3
+# Thanks to Jan Beich @ FreeBSD
+Patch96: chromium-93.0.4577.82-harfbuzz3.patch
# Use lstdc++ on EPEL7 only
@@ -1031,6 +1034,9 @@ udev.
%patch93 -p1 -b .vector-fix
%patch94 -p1 -b .remoting-nodestructor-fix
%patch95 -p1 -b .mojo-header-fix
+%if 0%{?fedora} >= 36
+%patch96 -p1 -b .hbfix
+%endif
# Fedora branded user agent
%if 0%{?fedora}
@@ -2115,6 +2121,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r
chrome-remote-deskt
%changelog
+* Mon Sep 20 2021 Tom Callaway <spot(a)fedoraproject.org> - 93.0.4577.82-2
+- add fix for harfbuzz v3 (thanks to Jan Beich @ FreeBSD)
+
* Thu Sep 16 2021 Tom Callaway <spot(a)fedoraproject.org> - 93.0.4577.82-1
- update to 93.0.4577.82
commit 9292805640ae7e7dbb6742f26c55dfcf355a67fa
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Fri Sep 17 10:40:24 2021 -0400
fix the rest of the node conditionals
diff --git a/chromium.spec b/chromium.spec
index afdb13a..4c3d565 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -422,7 +422,7 @@
Source16:
https://github.com/web-platform-tests/wpt/raw/master/fonts/Ahem.ttf
Source17: GardinerModBug.ttf
Source18: GardinerModCat.ttf
# RHEL 7|8 needs newer nodejs
-%if 0%{?rhel} <= 8
+%if 0%{?rhel} && 0%{?rhel} <= 8
Source19:
https://nodejs.org/dist/latest-v12.x/node-v12.22.6-linux-x64.tar.xz
Source21:
https://nodejs.org/dist/latest-v12.x/node-v12.22.6-linux-arm64.tar.xz
%endif
@@ -479,7 +479,7 @@ BuildRequires: minizip-compat-devel
%endif
%endif
# RHEL 7|8's nodejs is too old
-%if 0%{?rhel} <= 8
+%if 0%{?rhel} && 0%{?rhel} <= 8
# Use bundled.
%else
BuildRequires: nodejs
commit 42f4d2d0e5aaaadb8090634f7c7e4df046a41954
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Thu Sep 16 17:53:57 2021 -0400
fix conditional so that Fedora does not use the bundled node it does not need
diff --git a/chromium.spec b/chromium.spec
index 475ca1b..afdb13a 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1226,7 +1226,7 @@ CHROMIUM_HEADLESS_GN_DEFINES+=' use_cups=false use_dbus=false
use_gio=false use_
CHROMIUM_HEADLESS_GN_DEFINES+=' use_pulseaudio=false use_udev=false use_gtk=false
use_glib=false use_x11=false'
export CHROMIUM_HEADLESS_GN_DEFINES
-%if 0%{?rhel} <= 8
+%if 0%{?rhel} && 0%{?rhel} <= 8
pushd third_party/node/linux
%ifarch x86_64
tar xf %{SOURCE19}
commit 93796dbd54c6b0ca0b2694e7cbaf9932dfe40c2c
Merge: d23de21 17a39d0
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Thu Sep 16 11:58:37 2021 -0400
Merge branch 'rawhide' into f34
commit 17a39d0d1fa0a958d0dc575dc58d87268e161f1d
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Thu Sep 16 11:57:40 2021 -0400
update to 93.0.4577.82
diff --git a/chromium.spec b/chromium.spec
index 97f1b15..475ca1b 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -581,7 +581,7 @@ BuildRequires: python3-devel
%if 0%{?bundlepylibs}
# Using bundled bits, do nothing.
%else
-%if 0%{?fedora} || %{?rhel} >= 8
+%if 0%{?fedora} || 0%{?rhel} >= 8
BuildRequires: python3-beautifulsoup4
# BuildRequires: python2-beautifulsoup
BuildRequires: python3-html5lib
commit 337ca304d21c5c2e3271f137de1e5333bc07ea63
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Thu Sep 16 11:56:15 2021 -0400
update to 93.0.4577.82
diff --git a/chromium.spec b/chromium.spec
index 1b2314c..97f1b15 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -224,7 +224,7 @@ Name: chromium%{chromium_channel}%{nsuffix}
%else
Name: chromium%{chromium_channel}
%endif
-Version: %{majorversion}.0.4577.63
+Version: %{majorversion}.0.4577.82
Release: 1%{?dist}
%if %{?freeworld}
%if %{?shared}
@@ -2115,6 +2115,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r
chrome-remote-deskt
%changelog
+* Thu Sep 16 2021 Tom Callaway <spot(a)fedoraproject.org> - 93.0.4577.82-1
+- update to 93.0.4577.82
+
* Thu Sep 2 2021 Tom Callaway <spot(a)fedoraproject.org> - 93.0.4577.63-1
- update to 93.0.4577.63
diff --git a/sources b/sources
index 3aaaa1f..dfc9ddf 100644
--- a/sources
+++ b/sources
@@ -19,6 +19,6 @@ SHA512 (xcb-proto-1.14.tar.xz) =
de66d568163b6da2be9d6c59984f3afa3acd119a7813786
SHA512 (depot_tools.git-master.tar.gz) =
dc323888812b66cc92c53a24a8a58ccf9e2961be67aa21852bd091b8b49569071f06ae9104cb58950e6253ac3a29f0db0663e9f35ef2b1ea28696efb38b42708
SHA512 (NotoSansSymbols2-Regular.ttf) =
2644b42c3fdccfe12395f9b61553aced169a0f1dc09f5a0fd7898e9d0a372ee4422b6b1cdab3c86ecc91db437e9ae8a951e64e85edc3ac9e9fca428852dbb2ad
SHA512 (NotoSansTibetan-Regular.ttf) =
fb5a48fcaea80eebe7d692f6fcf00d59d47658a358d0ec8e046fc559873f88bd595b2da474d2826abd9e9305f3741c69058d867b1e6048f37fe7d71b5d3af36a
-SHA512 (chromium-93.0.4577.63-clean.tar.xz) =
a8d6ad79a52e2df7a12c5922df41855a70f6dddcb76ec5e25177d9b0d565634074de1d86fbc1f894be259f37736d44ee231567596d7a37de96de11a010f2c5d9
SHA512 (node-v12.22.6-linux-arm64.tar.xz) =
87ce5eb954deb1d0debe6fa02b28a3cc675e12fca1e51d44b123ab294aa39ce0c6b8ac9eae1e7a6e32673ea2c2d480651d9ba7eea73012f0529503eebe9eb34d
SHA512 (node-v12.22.6-linux-x64.tar.xz) =
e1b55c32343cb2ccc40d888c705414bebf9c46b02083d13731df79b1e79521b7277761f6bcca041e40e3a2e47c67bb8e7848aa2b919a9de5c2ebf62c4a9c7176
+SHA512 (chromium-93.0.4577.82-clean.tar.xz) =
a304c47308d8694855b59d016d09cd265b453d466a0fe9c6bb24ef19654f8497b076b2948c085b37e85f1d436f416c5dcf91ba4160544b75262629aa29d07250
commit 816f9c890b1cc914164ba9a03b6b8c3c0a742d81
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Sat Sep 4 23:14:53 2021 -0400
drop the freetype hack, rhel 8 uses the bundled freetype which does not need it
diff --git a/chromium.spec b/chromium.spec
index ccdcd2c..1b2314c 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -324,8 +324,6 @@ Patch81: chromium-93-BluetoothLowEnergyScanFilter-include.patch
Patch82: chromium-93-ClassProperty-include.patch
# Fixes for python3
Patch83: chromium-92.0.4515.107-py3-fixes.patch
-# Support older freetype than 2.11 (for epel8)
-Patch84: chromium-93.0.4577.63-freetype-2.11.patch
# Clean up clang-format for python3
# thanks to Jon Nettleton
Patch86: chromium-93.0.4577.63-clang-format.patch
@@ -1023,7 +1021,6 @@ udev.
%patch81 -p1 -b .BluetoothLowEnergyScanFilter-include
%patch82 -p1 -b .ClassProperty-include
%patch83 -p1 -b .py3fixes
-%patch84 -p1 -b .freetype-2.11
%patch86 -p1 -b .clang-format-py3
%patch87 -p1 -b .ContextSet-permissive
%patch88 -p1 -b .DevToolsEmbedderMessageDispatcher-include
commit 2cda90bdb4d4d9696cd48f86677c092c51c679a4
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Sat Sep 4 22:35:46 2021 -0400
fix node conditional to be broader
diff --git a/chromium.spec b/chromium.spec
index 976de9c..ccdcd2c 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -423,8 +423,8 @@
Source15:
http://download.savannah.nongnu.org/releases/freebangfont/MuktiNarrow-
Source16:
https://github.com/web-platform-tests/wpt/raw/master/fonts/Ahem.ttf
Source17: GardinerModBug.ttf
Source18: GardinerModCat.ttf
-# RHEL 7 needs newer nodejs
-%if 0%{?rhel} == 7
+# RHEL 7|8 needs newer nodejs
+%if 0%{?rhel} <= 8
Source19:
https://nodejs.org/dist/latest-v12.x/node-v12.22.6-linux-x64.tar.xz
Source21:
https://nodejs.org/dist/latest-v12.x/node-v12.22.6-linux-arm64.tar.xz
%endif
commit 367d6daf856d97dc284aa923508d384ce9c40b61
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Sat Sep 4 22:22:06 2021 -0400
okay, lets try the old node hack on rhel 8 too
diff --git a/.gitignore b/.gitignore
index 2e5133d..fb9b0a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,5 @@
/xcb-proto-1.14.tar.xz
/NotoSansSymbols2-Regular.ttf
/NotoSansTibetan-Regular.ttf
+/node-v12.22.6-linux-arm64.tar.xz
+/node-v12.22.6-linux-x64.tar.xz
diff --git a/chromium.spec b/chromium.spec
index 712b588..976de9c 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -425,7 +425,8 @@ Source17: GardinerModBug.ttf
Source18: GardinerModCat.ttf
# RHEL 7 needs newer nodejs
%if 0%{?rhel} == 7
-Source19:
https://nodejs.org/dist/v10.15.3/node-v10.15.3-linux-x64.tar.gz
+Source19:
https://nodejs.org/dist/latest-v12.x/node-v12.22.6-linux-x64.tar.xz
+Source21:
https://nodejs.org/dist/latest-v12.x/node-v12.22.6-linux-arm64.tar.xz
%endif
# Bring xcb-proto with us (might need more than python on EPEL?)
Source20:
https://www.x.org/releases/individual/proto/xcb-proto-1.14.tar.xz
@@ -479,8 +480,8 @@ BuildRequires: minizip-compat-devel
# BuildRequires: minizip-devel
%endif
%endif
-# RHEL 7's nodejs is too old
-%if 0%{?rhel} == 7
+# RHEL 7|8's nodejs is too old
+%if 0%{?rhel} <= 8
# Use bundled.
%else
BuildRequires: nodejs
@@ -1228,10 +1229,18 @@ CHROMIUM_HEADLESS_GN_DEFINES+=' use_cups=false use_dbus=false
use_gio=false use_
CHROMIUM_HEADLESS_GN_DEFINES+=' use_pulseaudio=false use_udev=false use_gtk=false
use_glib=false use_x11=false'
export CHROMIUM_HEADLESS_GN_DEFINES
-%if 0%{?rhel} == 7
+%if 0%{?rhel} <= 8
pushd third_party/node/linux
+%ifarch x86_64
tar xf %{SOURCE19}
-mv node-v10.15.3-linux-x64 node-linux-x64
+mv node-v12.22.6-linux-x64 node-linux-x64
+%endif
+%ifarch aarch64
+tar xf %{SOURCE21}
+mv node-v12.22.6-linux-arm64 node-linux-arm64
+# This is weird, but whatever
+ln -s node-linux-arm64 node-linux-x64
+%endif
popd
%else
mkdir -p third_party/node/linux/node-linux-x64/bin
diff --git a/sources b/sources
index 18a7a4c..3aaaa1f 100644
--- a/sources
+++ b/sources
@@ -15,9 +15,10 @@ SHA512 (Tinos-Bold.ttf) =
54aeca804c06a4d5c57ade596e73df91a6a1c4401c4aadba55d987
SHA512 (Tinos-Italic.ttf) =
d4f4f096110ef98a781a2a0e0d319317e5f84e650fe6f4d4f6b0e22a16414278217f37497b904a18540273c0e2d79d4f1faabde3b0eb5446283b318c73bafb38
SHA512 (Tinos-Regular.ttf) =
58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb8746a5e5fa1a6f6daa62750dc2051b3b2d8a51b4d2e9bb0f66594caf2253c0870ed9c7286fa45e8f
SHA512 (Ahem.ttf) =
aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c882026ab7c616bf628fbc2fe14e38a6003f3a481af60b52a7ed62071d28ddaf428e4e3fd
-SHA512 (node-v10.15.3-linux-x64.tar.gz) =
5eb544ef706562981340a82acc79e2162c6a3e4049b4a95f69ce353ee5b0f929c60b1fc457e8249b3fb0696f82fc28c5f543f5947db19fae4e9d5c21b906bb20
SHA512 (xcb-proto-1.14.tar.xz) =
de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690
SHA512 (depot_tools.git-master.tar.gz) =
dc323888812b66cc92c53a24a8a58ccf9e2961be67aa21852bd091b8b49569071f06ae9104cb58950e6253ac3a29f0db0663e9f35ef2b1ea28696efb38b42708
SHA512 (NotoSansSymbols2-Regular.ttf) =
2644b42c3fdccfe12395f9b61553aced169a0f1dc09f5a0fd7898e9d0a372ee4422b6b1cdab3c86ecc91db437e9ae8a951e64e85edc3ac9e9fca428852dbb2ad
SHA512 (NotoSansTibetan-Regular.ttf) =
fb5a48fcaea80eebe7d692f6fcf00d59d47658a358d0ec8e046fc559873f88bd595b2da474d2826abd9e9305f3741c69058d867b1e6048f37fe7d71b5d3af36a
SHA512 (chromium-93.0.4577.63-clean.tar.xz) =
a8d6ad79a52e2df7a12c5922df41855a70f6dddcb76ec5e25177d9b0d565634074de1d86fbc1f894be259f37736d44ee231567596d7a37de96de11a010f2c5d9
+SHA512 (node-v12.22.6-linux-arm64.tar.xz) =
87ce5eb954deb1d0debe6fa02b28a3cc675e12fca1e51d44b123ab294aa39ce0c6b8ac9eae1e7a6e32673ea2c2d480651d9ba7eea73012f0529503eebe9eb34d
+SHA512 (node-v12.22.6-linux-x64.tar.xz) =
e1b55c32343cb2ccc40d888c705414bebf9c46b02083d13731df79b1e79521b7277761f6bcca041e40e3a2e47c67bb8e7848aa2b919a9de5c2ebf62c4a9c7176
commit 8ba922708af9958bd2daac03a3cedc80ac40764f
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Sat Sep 4 21:37:36 2021 -0400
put bundled six in the python path for epel8, system six is too old
diff --git a/chromium.spec b/chromium.spec
index 6a9a5ce..712b588 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1648,7 +1648,11 @@ tar xf %{SOURCE20}
%endif
# export
PYTHONPATH="../../third_party/pyjson5/src:../../third_party/catapult/third_party/google-endpoints:../../xcb-proto-1.14"
+%if 0%{?rhel} == 8
+export
PYTHONPATH="../../third_party/protobuf/third_party/six:../../third_party/pyjson5/src:../../xcb-proto-1.14:../../third_party/catapult/third_party/html5lib-1.1"
+%else
export
PYTHONPATH="../../third_party/pyjson5/src:../../xcb-proto-1.14:../../third_party/catapult/third_party/html5lib-1.1"
+%endif
echo
# Now do the full browser
commit c30e548fd5d1ee871b8f46a07a5aa216cc44c31e
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Sat Sep 4 21:06:05 2021 -0400
try python3 deps in epel8
diff --git a/chromium.spec b/chromium.spec
index 00646b5..6a9a5ce 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -582,7 +582,7 @@ BuildRequires: python3-devel
%if 0%{?bundlepylibs}
# Using bundled bits, do nothing.
%else
-%if 0%{?fedora}
+%if 0%{?fedora} || %{?rhel} >= 8
BuildRequires: python3-beautifulsoup4
# BuildRequires: python2-beautifulsoup
BuildRequires: python3-html5lib
commit 4bb9581dd3918d44ed90c29a2f54a2ff87333457
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Sat Sep 4 16:25:32 2021 -0400
drop unnecessary epel8 patch
diff --git a/chromium-92.0.4515.159-epel8-uffd-off.patch
b/chromium-92.0.4515.159-epel8-uffd-off.patch
deleted file mode 100644
index 553b9b0..0000000
--- a/chromium-92.0.4515.159-epel8-uffd-off.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up
chromium-92.0.4515.159/base/allocator/partition_allocator/partition_alloc_config.h.epel8-uffd-off
chromium-92.0.4515.159/base/allocator/partition_allocator/partition_alloc_config.h
----
chromium-92.0.4515.159/base/allocator/partition_allocator/partition_alloc_config.h.epel8-uffd-off 2021-08-30
09:25:56.878243728 -0400
-+++
chromium-92.0.4515.159/base/allocator/partition_allocator/partition_alloc_config.h 2021-08-30
09:26:12.489322762 -0400
-@@ -37,7 +37,7 @@ static_assert(sizeof(void*) != 8, "");
- #if defined(PA_HAS_64_BITS_POINTERS) && \
- (defined(OS_LINUX) || defined(OS_ANDROID))
- // TODO(bikineev): Enable for ChromeOS.
--#define PA_STARSCAN_UFFD_WRITE_PROTECTOR_SUPPORTED
-+// #define PA_STARSCAN_UFFD_WRITE_PROTECTOR_SUPPORTED
- #endif
-
- // POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific
diff --git a/chromium.spec b/chromium.spec
index 088e026..00646b5 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -378,8 +378,6 @@ Patch109: chromium-90.0.4430.93-epel7-erase-fix.patch
# Again, not sure how epel8 is the only one to hit this...
# AARCH64 neon symbols need to be prefixed too to prevent multiple definition issue at
linktime
Patch110: chromium-90.0.4430.93-epel8-aarch64-libpng16-symbol-prefixes.patch
-# The implementation of linux/userfaultfd.h in EL-8 is too old to support what Chromium
wants to do. Turn off the relevant chromium code.
-Patch111: chromium-92.0.4515.159-epel8-uffd-off.patch
# VAAPI
@@ -1054,7 +1052,6 @@ udev.
%if 0%{?rhel} == 8
# %%patch107 -p1 -b .el8-arm-incompatible-ints
%patch110 -p1 -b .el8-aarch64-libpng16-symbol-prefixes
-%patch111 -p1 -b .el8-uffd-off
%endif
# Feature specific patches
diff --git a/sources b/sources
index 8bf3438..18a7a4c 100644
--- a/sources
+++ b/sources
@@ -20,5 +20,4 @@ SHA512 (xcb-proto-1.14.tar.xz) =
de66d568163b6da2be9d6c59984f3afa3acd119a7813786
SHA512 (depot_tools.git-master.tar.gz) =
dc323888812b66cc92c53a24a8a58ccf9e2961be67aa21852bd091b8b49569071f06ae9104cb58950e6253ac3a29f0db0663e9f35ef2b1ea28696efb38b42708
SHA512 (NotoSansSymbols2-Regular.ttf) =
2644b42c3fdccfe12395f9b61553aced169a0f1dc09f5a0fd7898e9d0a372ee4422b6b1cdab3c86ecc91db437e9ae8a951e64e85edc3ac9e9fca428852dbb2ad
SHA512 (NotoSansTibetan-Regular.ttf) =
fb5a48fcaea80eebe7d692f6fcf00d59d47658a358d0ec8e046fc559873f88bd595b2da474d2826abd9e9305f3741c69058d867b1e6048f37fe7d71b5d3af36a
-SHA512 (chromium-92.0.4515.159-clean.tar.xz) =
e5062c35c55232f672008d7c4a06daa69a92e0ed4104ea78e60280e2d7d20bcbf1b52c33229fd3b81983b02cbc949d188e5385b6250662248e11660d1fced31d
SHA512 (chromium-93.0.4577.63-clean.tar.xz) =
a8d6ad79a52e2df7a12c5922df41855a70f6dddcb76ec5e25177d9b0d565634074de1d86fbc1f894be259f37736d44ee231567596d7a37de96de11a010f2c5d9
commit d23de2147164effa4feec174c2e814a304dac5db
Merge: 4ff2705 ff282d6
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Sat Sep 4 00:30:58 2021 -0400
Merge branch 'rawhide' into f34
commit 4ff27059d3adc3d4e12b0508bedec8af4f3d0ec5
Merge: 8c9197a 302a80b
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Fri Aug 27 06:09:14 2021 -0400
Merge branch 'rawhide' into f34
commit 8c9197aeaea890e8b00a147680a461980cdec846
Merge: b77f06d 2a62af5
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Fri Jul 16 15:09:28 2021 -0400
Merge branch 'rawhide' into f34
commit b77f06d1e815528ec56490c6f1fb2c5e89a6a018
Merge: 1ec02b5 a7ab43e
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Tue Jul 6 10:29:13 2021 -0400
Merge branch 'rawhide' into f34
commit 1ec02b566bb836ba5ae8b529572156ac8a5dbc92
Merge: 3b1ed76 baaf27b
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Thu Jun 24 09:26:56 2021 -0400
Merge branch 'rawhide' into f34
commit 3b1ed76b7d0c343fe84e8b901939d4ae0c105232
Merge: f6c384a ed9abbb
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Fri Jun 4 09:43:25 2021 -0400
Merge branch 'rawhide' into f34
commit f6c384af1af917f967b9d1e946d7513f634f18d9
Merge: d03ae74 bfc2976
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Thu May 20 11:08:56 2021 -0400
Merge branch 'rawhide' into f34
commit d03ae747933bace2655c98091dd4d0fe151350a8
Merge: e6568dd 986d1b2
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Tue Apr 27 12:08:27 2021 -0400
Merge branch 'rawhide' into f34
commit e6568ddd1c9495cab08cc2d69a44c11ab15b0b4a
Merge: 6e50941 c4e9fea
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Mon Apr 26 10:20:28 2021 -0400
Merge branch 'rawhide' into f34
commit 6e509410d793c969e82da723df874d518c865f82
Merge: 9810e01 bbbc483
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Wed Apr 14 16:13:30 2021 -0400
89.0.4389.128
commit 9810e01cdd374be75a55aa7bcedd726ef48cba21
Author: Jonathan Wakely <jwakely(a)redhat.com>
Date: Tue Mar 30 19:35:23 2021 +0100
Rebuilt for removed libstdc++ symbol (#1937698)
diff --git a/chromium.spec b/chromium.spec
index 096b90d..2525326 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -216,7 +216,7 @@ Name: chromium%{chromium_channel}%{nsuffix}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.4389.90
-Release: 3%{?dist}
+Release: 4%{?dist}
%if %{?freeworld}
%if %{?shared}
# chromium-libs-media-freeworld
@@ -1977,6 +1977,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r
chrome-remote-deskt
%changelog
+* Tue Mar 30 2021 Jonathan Wakely <jwakely(a)redhat.com> - 89.0.4389.90-4
+- Rebuilt for removed libstdc++ symbol (#1937698)
+
* Thu Mar 25 2021 Tom Callaway <spot(a)fedoraproject.org> - 89.0.4389.90-3
- apply upstream fix for newer system libva