chromium: Chromium 91.0.4472.164 -> 92.0.4515.107

4 files changed, 23 insertions, 174 deletions

diff --git a/chromium/chromium/chromium-gcc11-r871265.patch b/chromium/chromium/chromium-gcc11-r871265.patch
deleted file mode 100644
index 346fbd8..0000000
--- a/chromium/chromium/chromium-gcc11-r871265.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 429e6f78a88473208e96689afa2f6e91f07a4f8c Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Sat, 10 Apr 2021 17:02:49 +0000
-Subject: [PATCH] GCC: fix vector types in pcscan
-
- * _mm_cmpeq_epi64 result is __m128i
- * maybe_ptrs is __m128i already and doesn't require cast
-
-Bug: 819294
-Change-Id: I3f8c6cc327191827838e80aea1431ac09315fe88
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2817544
-Reviewed-by: Anton Bikineev <bikineev@chromium.org>
-Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
-Cr-Commit-Position: refs/heads/master@{#871265}
----
- base/allocator/partition_allocator/starscan/pcscan.cc | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/base/allocator/partition_allocator/starscan/pcscan.cc b/base/allocator/partition_allocator/starscan/pcscan.cc
-index c7854ff3a855..d5c0aea206e3 100644
---- a/base/allocator/partition_allocator/starscan/pcscan.cc
-+++ b/base/allocator/partition_allocator/starscan/pcscan.cc
-@@ -1143,7 +1143,7 @@ class PCScanTask::ScanLoop final {
-       const __m128i maybe_ptrs =
-           _mm_loadu_si128(reinterpret_cast<__m128i*>(payload));
-       const __m128i vand = _mm_and_si128(maybe_ptrs, cage_mask);
--      const __m128d vcmp = _mm_cmpeq_epi64(vand, vbase);
-+      const __m128i vcmp = _mm_cmpeq_epi64(vand, vbase);
-       const int mask = _mm_movemask_pd(_mm_castsi128_pd(vcmp));
-       if (LIKELY(!mask))
-         continue;
-@@ -1153,15 +1153,14 @@ class PCScanTask::ScanLoop final {
-       if (mask & 0b01) {
-         quarantine_size +=
-             pcscan_task_.TryMarkObjectInNormalBuckets<GigaCageLookupPolicy>(
--                _mm_cvtsi128_si64(_mm_castpd_si128(maybe_ptrs)));
-+                _mm_cvtsi128_si64(maybe_ptrs));
-       }
-       if (mask & 0b10) {
-         // Extraction intrinsics for qwords are only supported in SSE4.1, so
-         // instead we reshuffle dwords with pshufd. The mask is used to move the
-         // 4th and 3rd dwords into the second and first position.
-         static constexpr int kSecondWordMask = (3 << 2) | (2 << 0);
--        const __m128i shuffled =
--            _mm_shuffle_epi32(_mm_castpd_si128(maybe_ptrs), kSecondWordMask);
-+        const __m128i shuffled = _mm_shuffle_epi32(maybe_ptrs, kSecondWordMask);
-         quarantine_size +=
-             pcscan_task_.TryMarkObjectInNormalBuckets<GigaCageLookupPolicy>(
-                 _mm_cvtsi128_si64(shuffled));
--- 
-2.31.1
-
diff --git a/chromium/chromium/chromium-gcc11-r872164.patch b/chromium/chromium/chromium-gcc11-r872164.patch
deleted file mode 100644
index 32865be..0000000
--- a/chromium/chromium/chromium-gcc11-r872164.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From c2d0133f47afb59b4ce64e42215d1d053f15250a Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Tue, 13 Apr 2021 23:21:42 +0000
-Subject: [PATCH] fix crash in ThemeService
-
-ThemeSyncableService and ThemeService are owned by each other. On
-destruction of ThemeService, ThemeSyncableService gets destructed as
-well, but calls RemoveObserver of partly destructed ThemeService object.
-To avoid already destructed |observers_| list, move it before
-|theme_syncable_service_| definition.
-
-Bug: 1190561
-Change-Id: I4dc2c990d589071d97b7fa737afef54463c84751
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2821311
-Commit-Queue: Peter Kasting <pkasting@chromium.org>
-Reviewed-by: Peter Kasting <pkasting@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#872164}
----
- chrome/browser/themes/theme_service.h | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/chrome/browser/themes/theme_service.h b/chrome/browser/themes/theme_service.h
-index 592d40ae9de0..337dfac9a040 100644
---- a/chrome/browser/themes/theme_service.h
-+++ b/chrome/browser/themes/theme_service.h
-@@ -299,6 +299,10 @@ class ThemeService : public KeyedService,
-   // The number of infobars currently displayed.
-   int number_of_reinstallers_ = 0;
- 
-+  // Declared before |theme_syncable_service_|, because ThemeSyncableService
-+  // removes itself from the |observers_| list on destruction.
-+  base::ObserverList<ThemeServiceObserver> observers_;
-+
-   std::unique_ptr<ThemeSyncableService> theme_syncable_service_;
- 
- #if BUILDFLAG(ENABLE_EXTENSIONS)
-@@ -320,8 +324,6 @@ class ThemeService : public KeyedService,
-   ScopedObserver<ui::NativeTheme, ui::NativeThemeObserver>
-       native_theme_observer_{this};
- 
--  base::ObserverList<ThemeServiceObserver> observers_;
--
-   base::WeakPtrFactory<ThemeService> weak_ptr_factory_{this};
- 
-   DISALLOW_COPY_AND_ASSIGN(ThemeService);
--- 
-2.31.1
-
diff --git a/chromium/chromium/chromium-python2.patch b/chromium/chromium/chromium-python3.patch
index d4f8fba..eabac72 100644
--- a/chromium/chromium/chromium-python2.patch
+++ b/chromium/chromium/chromium-python3.patch
@@ -4,7 +4,7 @@
        gn_gen_args += ' is_debug=false'
      subprocess.check_call([
          gn_path, 'gen', out_dir,
-+        '--script-executable=/usr/bin/python2',
++        '--script-executable=/usr/bin/python3',
          '--args=%s' % gn_gen_args, "--root=" + SRC_ROOT
      ])
  
@@ -16,16 +16,7 @@ diff -up chromium-67.0.3396.99/third_party/catapult/common/py_vulcanize/py_vulca
    with tempfile.NamedTemporaryFile() as _:
      args = [
 -        'python',
-+        'python2',
++        'python3',
          rjsmin_path
      ]
      p = subprocess.Popen(args,
-@@ -177,7 +177,7 @@ def _MinifyCSS(css_text):
-       os.path.join(py_vulcanize_path, 'third_party', 'rcssmin', 'rcssmin.py'))
- 
-   with tempfile.NamedTemporaryFile() as _:
--    rcssmin_args = ['python', rcssmin_path]
-+    rcssmin_args = ['python2', rcssmin_path]
-     p = subprocess.Popen(rcssmin_args,
-                          stdin=subprocess.PIPE,
-                          stdout=subprocess.PIPE,
diff --git a/chromium/chromium/chromium.spec b/chromium/chromium/chromium.spec
index 7122b74..ca4d5e3 100644
--- a/chromium/chromium/chromium.spec
+++ b/chromium/chromium/chromium.spec
@@ -18,23 +18,6 @@
 # Require libxml2 > 2.9.4 for XML_PARSE_NOXXE
 %bcond_without system_libxml2
 
-# Python 2 libraries
-%if 0%{?fedora} < 32
-%bcond_without system_beautifulsoup4
-%bcond_without system_html5lib
-%bcond_without system_ply
-%else
-%bcond_with system_beautifulsoup4
-%bcond_with system_html5lib
-%bcond_with system_ply
-%endif
-
-%if 0%{?fedora} < 34
-%bcond_without system_markupsafe
-%else
-%bcond_with system_markupsafe
-%endif
-
 # Requires re2 2016.07.21 for re2::LazyRE2
 %bcond_with system_re2
 
@@ -57,7 +40,7 @@
 %bcond_with fedora_compilation_flags
 
 Name:       chromium
-Version:    91.0.4472.164
+Version:    92.0.4515.107
 Release:    100%{?dist}
 Summary:    A WebKit (Blink) powered web browser
 
@@ -106,15 +89,11 @@ Patch2:     chromium-gn-no-static-libstdc++.patch
 # Don't use unversioned python commands. This patch is based on
 # https://src.fedoraproject.org/rpms/chromium/c/7048e95ab61cd143
 # https://src.fedoraproject.org/rpms/chromium/c/cb0be2c990fc724e
-Patch20:    chromium-python2.patch
+Patch20:    chromium-python3.patch
 
 # Fix build issues for GCC 11
 Patch21:    chromium-ruy-limits.patch
 
-# Pull upstream patches
-Patch30:    chromium-gcc11-r871265.patch
-Patch31:    chromium-gcc11-r872164.patch
-
 # I don't have time to test whether it work on other architectures
 ExclusiveArch: x86_64
 
@@ -124,7 +103,8 @@ BuildRequires: clang
 %else
 BuildRequires: gcc, gcc-c++
 %endif
-BuildRequires: ninja-build, nodejs, java-headless, bison, gperf, hwdata
+BuildRequires: java-headless, nodejs, python2, python3
+BuildRequires: bison, gperf, hwdata, ninja-build
 BuildRequires: libgcc(x86-32), glibc(x86-32), libatomic
 BuildRequires: alsa-lib-devel, cups-devel, expat-devel
 BuildRequires: libcap-devel, libcurl-devel
@@ -139,21 +119,6 @@ BuildRequires: pkgconfig(libffi), pkgconfig(nss), pkgconfig(libexif)
 BuildRequires: pkgconfig(xtst), pkgconfig(xscrnsaver), pkgconfig(xshmfence)
 BuildRequires: pkgconfig(dbus-1), pkgconfig(libudev)
 BuildRequires: pkgconfig(libva), pkgconfig(gnome-keyring-1)
-BuildRequires: python2-setuptools
-# remove_bundled_libraries.py --do-remove
-BuildRequires: python2-rpm-macros
-%if %{with system_beautifulsoup4}
-BuildRequires: python2-beautifulsoup4
-%endif
-%if %{with system_html5lib}
-BuildRequires: python2-html5lib
-%endif
-%if %{with system_markupsafe}
-BuildRequires: python2-markupsafe
-%endif
-%if %{with system_ply}
-BuildRequires: python2-ply
-%endif
 # replace_gn_files.py --system-libraries
 BuildRequires: flac-devel
 BuildRequires: freetype-devel
@@ -223,7 +188,7 @@ Conflicts:     chromedriver-unstable
 # Don't use unversioned python commands in shebangs. This command is based on
 # https://src.fedoraproject.org/rpms/chromium/c/cdad6219176a7615
 find -type f -exec \
-    sed -i '1s:^#!/usr/bin/\(python\|env python\)$:#!%{__python2}:' '{}' '+'
+    sed -i '1s:^#!/usr/bin/\(python\|env python\)$:#!%{__python3}:' '{}' '+'
 
 ./build/linux/unbundle/remove_bundled_libraries.py --do-remove \
     base/third_party/cityhash \
@@ -267,12 +232,8 @@ find -type f -exec \
     third_party/catapult \
     third_party/catapult/common/py_vulcanize/third_party/rcssmin \
     third_party/catapult/common/py_vulcanize/third_party/rjsmin \
-%if !%{with system_beautifulsoup4}
     third_party/catapult/third_party/beautifulsoup4 \
-%endif
-%if !%{with system_html5lib}
     third_party/catapult/third_party/html5lib-python \
-%endif
     third_party/catapult/third_party/polymer \
     third_party/catapult/third_party/six \
     third_party/catapult/tracing/third_party/d3 \
@@ -293,6 +254,7 @@ find -type f -exec \
     third_party/dav1d \
     third_party/dawn \
     third_party/dawn/third_party/khronos \
+    third_party/dawn/third_party/tint \
     third_party/depot_tools \
     third_party/devscripts \
     third_party/devtools-frontend \
@@ -300,7 +262,7 @@ find -type f -exec \
     third_party/devtools-frontend/src/front_end/third_party/axe-core \
     third_party/devtools-frontend/src/front_end/third_party/chromium \
     third_party/devtools-frontend/src/front_end/third_party/codemirror \
-    third_party/devtools-frontend/src/front_end/third_party/fabricjs \
+    third_party/devtools-frontend/src/front_end/third_party/diff \
     third_party/devtools-frontend/src/front_end/third_party/i18n \
     third_party/devtools-frontend/src/front_end/third_party/intl-messageformat \
     third_party/devtools-frontend/src/front_end/third_party/lighthouse \
@@ -377,9 +339,7 @@ find -type f -exec \
     third_party/lss \
     third_party/lzma_sdk \
     third_party/mako \
-%if !%{with system_markupsafe}
     third_party/markupsafe \
-%endif
     third_party/mesa \
     third_party/metrics_proto \
     third_party/minigbm \
@@ -409,9 +369,7 @@ find -type f -exec \
     third_party/perfetto \
     third_party/perfetto/protos/third_party/chromium \
     third_party/pffft \
-%if !%{with system_ply}
     third_party/ply \
-%endif
     third_party/polymer \
     third_party/private-join-and-compute \
     third_party/private_membership \
@@ -449,7 +407,6 @@ find -type f -exec \
     third_party/tflite/src/third_party/fft2d \
     third_party/tflite-support \
     third_party/tcmalloc \
-    third_party/tint \
     third_party/ruy \
     third_party/ukey2 \
     third_party/unrar \
@@ -517,25 +474,17 @@ find -type f -exec \
 sed -i 's|//third_party/usb_ids|/usr/share/hwdata|g' \
     services/device/public/cpp/usb/BUILD.gn
 
-%if %{with system_markupsafe}
-rmdir third_party/markupsafe
-ln -s %{python2_sitearch}/markupsafe third_party/markupsafe
-%endif
-
-%if %{with system_ply}
-rmdir third_party/ply
-ln -s %{python2_sitelib}/ply third_party/ply
-%endif
-
 mkdir -p third_party/node/linux/node-linux-x64/bin
 ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node
 
 ln -s %{_bindir}/java third_party/jdk/current/bin/java
 
+mkdir -p buildtools/third_party/eu-strip/bin
+ln -s %{_bindir}/true buildtools/third_party/eu-strip/bin/eu-strip
+
 
 %build
 export AR=ar NM=nm
-export PNACLPYTHON=%{__python2}
 
 # Fedora 25 doesn't have __global_cxxflags
 %if %{with fedora_compilation_flags}
@@ -618,7 +567,7 @@ gn_args+=(
 
 ./tools/gn/bootstrap/bootstrap.py --gn-gen-args "${gn_args[*]}"
 ./out/Release/gn gen out/Release \
-    --script-executable=/usr/bin/python2 --args="${gn_args[*]}"
+    --script-executable=/usr/bin/python3 --args="${gn_args[*]}"
 
 # Raise the limit of open files because ld.bfd seems to open more files than
 # ld.gold. The default limit of 1024 is known to cause malformed archive error.
@@ -630,6 +579,8 @@ ulimit -Sn "$(ulimit -Hn)"
 ninja -v %{_smp_mflags} -C out/Release chrome chrome_sandbox chromedriver
 %endif
 
+mv out/Release/chromedriver{.unstripped,}
+
 
 %install
 mkdir -p %{buildroot}%{_bindir}
@@ -655,6 +606,7 @@ install -m 644 chrome.1 %{buildroot}%{_mandir}/man1/chromium-browser.1
 install -m 755 out/Release/chrome %{buildroot}%{chromiumdir}/chromium-browser
 install -m 4755 out/Release/chrome_sandbox %{buildroot}%{chromiumdir}/chrome-sandbox
 install -m 755 out/Release/chromedriver %{buildroot}%{chromiumdir}/
+install -m 755 out/Release/crashpad_handler %{buildroot}%{chromiumdir}/
 %if !%{with system_libicu}
 install -m 644 out/Release/icudtl.dat %{buildroot}%{chromiumdir}/
 %endif
@@ -714,6 +666,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{chromiumdir}/chromium-browser
 %{chromiumdir}/chrome-sandbox
 %{chromiumdir}/chromedriver
+%{chromiumdir}/crashpad_handler
 %if !%{with system_libicu}
 %{chromiumdir}/icudtl.dat
 %endif
@@ -734,8 +687,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{chromiumdir}/swiftshader/libGLESv2.so
 
 
-
 %changelog
+* Sun Jul 25 2021 - Ting-Wei Lan <lantw44@gmail.com> - 92.0.4515.107-100
+- Update to 92.0.4515.107
+- Switch to Python 3
+- Remove unbundling options for Python dependencies because porting these mostly
+  broken options to Python 3 is unlikely to be useful
+
 * Sat Jul 17 2021 - Ting-Wei Lan <lantw44@gmail.com> - 91.0.4472.164-100
 - Update to 91.0.4472.164