commit 6c55b1911ca60fff841754851894171b8f0bc4ad Author: Vasiliy Glazov <vascom2(a)gmail.com&gt; Date: Tue Apr 2 11:42:31 2019 +0300 Sync with Fedora. .gitignore | 2 ++ chromium-73.0.3683.75-el7-fix-noexcept.patch | 54 ++++++++++++++++++++++++++++ chromium-freeworld.spec | 43 ++++++++++++++++++---- sources | 20 +---------- 4 files changed, 94 insertions(+), 25 deletions(-) --- diff --git a/.gitignore b/.gitignore index fda6414..c305724 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,5 @@ /chromium-70.0.3538.110.tar.xz /chromium-71.0.3578.98.tar.xz /chromium-73.0.3683.75.tar.xz +/chromium-73.0.3683.86.tar.xz +/node-v8.9.1-linux-x64.tar.gz diff --git a/chromium-73.0.3683.75-el7-fix-noexcept.patch b/chromium-73.0.3683.75-el7-fix-noexcept.patch new file mode 100644 index 0000000..3fc69ba --- /dev/null +++ b/chromium-73.0.3683.75-el7-fix-noexcept.patch @@ -0,0 +1,54 @@ +diff -up chromium-73.0.3683.75/chrome/common/media_router/media_sink.cc.el7-noexcept chromium-73.0.3683.75/chrome/common/media_router/media_sink.cc +--- chromium-73.0.3683.75/chrome/common/media_router/media_sink.cc.el7-noexcept 2019-03-11 18:00:54.000000000 -0400 ++++ chromium-73.0.3683.75/chrome/common/media_router/media_sink.cc 2019-03-20 09:45:29.400426336 -0400 +@@ -19,12 +19,12 @@ MediaSink::MediaSink(const MediaSink::Id + provider_id_(provider_id) {} + + MediaSink::MediaSink(const MediaSink& other) = default; +-MediaSink::MediaSink(MediaSink&& other) noexcept = default; ++MediaSink::MediaSink(MediaSink&& other) = default; + MediaSink::MediaSink() = default; + MediaSink::~MediaSink() = default; + + MediaSink& MediaSink::operator=(const MediaSink& other) = default; +-MediaSink& MediaSink::operator=(MediaSink&& other) noexcept = default; ++MediaSink& MediaSink::operator=(MediaSink&& other) = default; + + bool MediaSink::IsMaybeCloudSink() const { + switch (icon_type_) { +diff -up chromium-73.0.3683.75/components/policy/core/common/policy_map.cc.el7-noexcept chromium-73.0.3683.75/components/policy/core/common/policy_map.cc +--- chromium-73.0.3683.75/components/policy/core/common/policy_map.cc.el7-noexcept 2019-03-11 18:00:56.000000000 -0400 ++++ chromium-73.0.3683.75/components/policy/core/common/policy_map.cc 2019-03-19 11:11:38.310689134 -0400 +@@ -25,7 +25,7 @@ PolicyMap::Entry::Entry() = default; + PolicyMap::Entry::~Entry() = default; + + PolicyMap::Entry::Entry(Entry&&) noexcept = default; +-PolicyMap::Entry& PolicyMap::Entry::operator=(Entry&&) noexcept = default; ++PolicyMap::Entry& PolicyMap::Entry::operator=(Entry&&) = default; + + PolicyMap::Entry PolicyMap::Entry::DeepCopy() const { + Entry copy; +diff -up chromium-73.0.3683.75/components/signin/core/browser/account_info.cc.el7-noexcept chromium-73.0.3683.75/components/signin/core/browser/account_info.cc +--- chromium-73.0.3683.75/components/signin/core/browser/account_info.cc.el7-noexcept 2019-03-11 18:00:57.000000000 -0400 ++++ chromium-73.0.3683.75/components/signin/core/browser/account_info.cc 2019-03-19 11:11:38.311689112 -0400 +@@ -50,7 +50,7 @@ AccountInfo::AccountInfo(AccountInfo&& o + + AccountInfo& AccountInfo::operator=(const AccountInfo& other) = default; + +-AccountInfo& AccountInfo::operator=(AccountInfo&& other) noexcept = default; ++AccountInfo& AccountInfo::operator=(AccountInfo&& other) = default; + + bool AccountInfo::IsEmpty() const { + return account_id.empty() && email.empty() && gaia.empty() && +diff -up chromium-73.0.3683.75/gpu/config/gpu_info.cc.el7-noexcept chromium-73.0.3683.75/gpu/config/gpu_info.cc +--- chromium-73.0.3683.75/gpu/config/gpu_info.cc.el7-noexcept 2019-03-19 11:12:36.992435015 -0400 ++++ chromium-73.0.3683.75/gpu/config/gpu_info.cc 2019-03-19 11:12:37.061433540 -0400 +@@ -118,7 +118,7 @@ GPUInfo::GPUDevice& GPUInfo::GPUDevice:: + const GPUInfo::GPUDevice& other) = default; + + GPUInfo::GPUDevice& GPUInfo::GPUDevice::operator=( +- GPUInfo::GPUDevice&& other) noexcept = default; ++ GPUInfo::GPUDevice&& other) = default; + + GPUInfo::GPUInfo() + : optimus(false), diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec index dd79815..cb2b88b 100644 --- a/chromium-freeworld.spec +++ b/chromium-freeworld.spec @@ -107,6 +107,8 @@ BuildRequires: libicu-devel >= 5.4 %global gtk3 1 %if 0%{?rhel} == 7 +%global dts_version 8 + %global bundleopus 1 %global bundlelibusbx 1 %global bundleharfbuzz 1 @@ -159,7 +161,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld} %else Name: chromium%{chromium_channel} %endif -Version: %{majorversion}.0.3683.75 +Version: %{majorversion}.0.3683.86 Release: 2%{?dist} Summary: A WebKit (Blink) powered web browser Url: http://www.chromium.org/Home @@ -324,6 +326,8 @@ Patch136: chromium-73.0.3683.75-pipewire-cstring-fix.patch Patch137: chromium-73.0.3683.75-no-header-hygiene.patch # Add missing #include <limits> needed to build crashpad for aarch64 Patch138: chromium-73.0.3683.75-aarch64-crashpad-limits.patch +# el7 only patch +Patch139: chromium-73.0.3683.75-el7-fix-noexcept.patch # Use chromium-latest.py to generate clean tarball from released build tarballs, found here: # http://build.chromium.org/buildbot/official/ @@ -356,7 +360,10 @@ 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 needs newer nodejs +%if 0%{?rhel} +Source19: node-v8.9.1-linux-x64.tar.gz +%endif # We can assume gcc and binutils. BuildRequires: gcc-c++ @@ -391,6 +398,7 @@ BuildRequires: libdrm-devel %endif BuildRequires: libgcrypt-devel BuildRequires: libudev-devel +BuildRequires: libuuid-devel BuildRequires: libusb-devel BuildRequires: libXdamage-devel BuildRequires: libXScrnSaver-devel @@ -400,7 +408,10 @@ BuildRequires: minizip-compat-devel %else BuildRequires: minizip-devel %endif +# RHEL 7's nodejs is too old +%if 0%{?fedora} BuildRequires: nodejs +%endif BuildRequires: nss-devel >= 3.26 BuildRequires: pciutils-devel BuildRequires: pulseaudio-libs-devel @@ -569,7 +580,7 @@ BuildRequires: ninja-build BuildRequires: java-1.8.0-openjdk-headless %if 0%{?rhel} == 7 -BuildRequires: devtoolset-7-toolchain, devtoolset-7-libatomic-devel +BuildRequires: devtoolset-%{dts_version}-toolchain, devtoolset-%{dts_version}-libatomic-devel %endif # There is a hardcoded check for nss 3.26 in the chromium code (crypto/nss_util.cc) @@ -896,6 +907,9 @@ udev. %patch136 -p1 -b .cstring-fix %patch137 -p1 -b .nohh %patch138 -p1 -b .aarch64-limits +%if 0%{?rhel} == 7 +%patch139 -p1 -b .el7-noexcept +%endif # Change shebang in all relevant files in this directory and all subdirectories # See `man find` for how the `-exec command {} +` syntax works @@ -1105,8 +1119,15 @@ CHROMIUM_HEADLESS_GN_DEFINES+=' use_cups=false use_dbus=false use_gio=false use_ CHROMIUM_HEADLESS_GN_DEFINES+=' use_pulseaudio=false use_udev=false' export CHROMIUM_HEADLESS_GN_DEFINES +%if 0%{?rhel} +pushd third_party/node/linux +tar xf %{SOURCE19} +mv node-v8.9.1-linux-x64 node-linux-x64 +popd +%else mkdir -p third_party/node/linux/node-linux-x64/bin ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node +%endif # Remove most of the bundled libraries. Libraries specified below (taken from # Gentoo's Chromium ebuild) are the libraries that needs to be preserved. @@ -1391,7 +1412,7 @@ sed -i '/aarch64)/ a \ exec "/usr/bin/ninja-build" "$@";;\' ../depot_tool sed -i 's|exec "${THIS_DIR}/ninja-linux${LONG_BIT}"|exec "/usr/bin/ninja-build"|g' ../depot_tools/ninja %if 0%{?rhel} == 7 -. /opt/rh/devtoolset-7/enable +. /opt/rh/devtoolset-%{dts_version}/enable %endif # Check that there is no system 'google' module, shadowing bundled ones: @@ -1428,7 +1449,7 @@ sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"Fedora Project"/' $FILE %build %if 0%{?rhel} == 7 -. /opt/rh/devtoolset-7/enable +. /opt/rh/devtoolset-%{dts_version}/enable %endif # Now do the full browser @@ -1772,7 +1793,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %lang(de) %{chromium_path}/locales/de.pak* %lang(el) %{chromium_path}/locales/el.pak* %lang(en_GB) %{chromium_path}/locales/en-GB.pak* -%lang(en_US) %{chromium_path}/locales/en-US.pak* +# Chromium _ALWAYS_ needs en-US.pak as a fallback +# This means we cannot apply the lang code here. +# Otherwise, it is filtered out on install. +%{chromium_path}/locales/en-US.pak* %lang(es) %{chromium_path}/locales/es.pak* %lang(es) %{chromium_path}/locales/es-419.pak* %lang(et) %{chromium_path}/locales/et.pak* @@ -1874,6 +1898,13 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %changelog +* Wed Mar 27 2019 Tom Callaway <spot(a)fedoraproject.org&gt; - 73.0.3683.86-2 +- remove lang macro from en-US.pak* because Chromium crashes if it is not present + (bz1692660) + +* Fri Mar 22 2019 Tom Callaway <spot(a)fedoraproject.org&gt; - 73.0.3683.86-1 +- update to 73.0.3683.86 + * Tue Mar 19 2019 Tom Callaway <spot(a)fedoraproject.org&gt; - 73.0.3683.75-2 - do not include pyproto/protoc files in package diff --git a/sources b/sources index 6c1893b..6ed46e4 100644 --- a/sources +++ b/sources @@ -1,19 +1 @@ -da72b7ad3a595d0140ceba60e867b9b7 Ahem.ttf -b25c0f936b23cccc0b92e85017e02bee Tinos-Regular.ttf -0da96c8a7d54f8b8f6f7713c8524f2fc Tinos-Italic.ttf -b68a7149509c5f1f69153d2dc3d8dd17 Tinos-Bold.ttf -042b1967a334625c34b3ab6255242127 Tinos-BoldItalic.ttf -00d46771d6344fd0c8e3d05bfd092887 Cousine-Regular.ttf -cef49e5506d6f09ea3064f7bd3191417 Cousine-Italic.ttf -86fed5639322e2f033ad817ee406c2fe Cousine-Bold.ttf -97415fecbce8ffd540f9f9af681cd398 Cousine-BoldItalic.ttf -7ac02a544211773d9636e056e9da6c35 Arimo-Regular.ttf -fa87472a877e70c5bce22e42be5c25a9 Arimo-Italic.ttf -927b7dca5b947f69cb8e835f7f743d15 Arimo-Bold.ttf -08fb930e5cf38bab811efa91f368b248 Arimo-BoldItalic.ttf -85d8bf52bda23c1cd422be54dee113a6 lohit-gurmukhi-ttf-2.91.2.tar.gz -9af8a0b80e85db34b1c34928d81cc423 NotoSansCJKjp-hinted.zip -314394b29c1d15a73c3f00316003810a MuktiNarrow-0.94.tar.bz2 -4d610887ff4d445cbc639aae7828d139 gelasio.zip -49a7f897775cce21d2b69968b8af1cea depot_tools.git-master.tar.gz -5acadb18a18526beaa8f49982be57c5d chromium-73.0.3683.75.tar.xz +4988b63c61a557d435ca84a8fd7b16e5 node-v8.9.1-linux-x64.tar.gz