[chromium-freeworld] Update to 97.0.4692.71

commit 7f6f0caa458afed506a76fed39d542010dcd5623 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Wed Jan 5 08:36:35 2022 +0000 Update to 97.0.4692.71 chromium-94-ffmpeg-roll.patch | 49 ------- chromium-InkDropHost-crash.patch | 24 ++++ chromium-freeworld.spec | 182 ++------------------------ chromium-hw-accel-mjpeg.patch | 63 --------- chromium-md5-based-build-id.patch | 4 +- remove-llvm13-warning-flags.patch | 21 --- sources | 4 +- unbundle-ffmpeg-av_stream_get_first_dts.patch | 12 ++ 8 files changed, 49 insertions(+), 310 deletions(-) --- diff --git a/chromium-InkDropHost-crash.patch b/chromium-InkDropHost-crash.patch new file mode 100644 index 0000000..b5e2794 --- /dev/null +++ b/chromium-InkDropHost-crash.patch @@ -0,0 +1,24 @@ +diff -up chromium-94.0.4606.71/ui/views/animation/ink_drop_host_view.h.InkDropHost-crash chromium-94.0.4606.71/ui/views/animation/ink_drop_host_view.h +--- chromium-94.0.4606.71/ui/views/animation/ink_drop_host_view.h.InkDropHost-crash 2021-10-05 16:04:46.313586509 -0400 ++++ chromium-94.0.4606.71/ui/views/animation/ink_drop_host_view.h 2021-10-05 16:05:12.213732558 -0400 +@@ -228,6 +228,11 @@ class VIEWS_EXPORT InkDropHost { + // Used to observe View and inform the InkDrop of host-transform changes. + ViewLayerTransformObserver host_view_transform_observer_; + ++ // Declared before |ink_drop_|, because InkDropImpl may call ++ // RemoveInkDropLayer on partly destructed InkDropHost. In ++ // that case |ink_drop_mask_| must be still valid. ++ std::unique_ptr<views::InkDropMask> ink_drop_mask_; ++ + // Should not be accessed directly. Use GetInkDrop() instead. + std::unique_ptr<InkDrop> ink_drop_; + +@@ -249,8 +254,6 @@ class VIEWS_EXPORT InkDropHost { + int ink_drop_small_corner_radius_ = 2; + int ink_drop_large_corner_radius_ = 4; + +- std::unique_ptr<views::InkDropMask> ink_drop_mask_; +- + base::RepeatingCallback<std::unique_ptr<InkDrop>()> create_ink_drop_callback_; + base::RepeatingCallback<std::unique_ptr<InkDropRipple>()> + create_ink_drop_ripple_callback_; diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec index c566015..e17bd47 100644 --- a/chromium-freeworld.spec +++ b/chromium-freeworld.spec @@ -36,7 +36,7 @@ %global system_re2 1 ##############################Package Definitions###################################### Name: chromium-freeworld -Version: 96.0.4664.110 +Version: 97.0.4692.71 Release: 1%{?dist} Summary: Chromium built with all freeworld codecs and VA-API support License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2) @@ -61,7 +61,7 @@ Source0: chromium-%{version}-clean.tar.xz %endif # Patchset composed by Stephan Hartmann. -%global patchset_revision chromium-96-patchset-4 +%global patchset_revision chromium-97-patchset-4 Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c... # The following two source files are copied and modified from the chromium source @@ -169,15 +169,15 @@ ExclusiveArch: x86_64 aarch64 # Gentoo patches: Patch201: chromium-96-EnumTable-crash.patch +Patch202: chromium-InkDropHost-crash.patch # Arch Linux patches: Patch226: chromium-93-ffmpeg-4.4.patch -Patch1227: chromium-94-ffmpeg-roll.patch +Patch227: unbundle-ffmpeg-av_stream_get_first_dts.patch Patch1228: add-a-TODO-about-a-missing-pnacl-flag.patch Patch1229: use-ffile-compilation-dir.patch # Suse patches: -Patch231: remove-llvm13-warning-flags.patch Patch232: chromium-91-sql-standard-layout-type.patch Patch233: chromium-clang-nomerge.patch @@ -190,7 +190,6 @@ Patch304: chromium-clang-format.patch Patch1303: chromium-rawhide-gcc-std-max-fix.patch # RPM Fusion patches [free/chromium-freeworld]: -Patch400: chromium-hw-accel-mjpeg.patch Patch401: chromium-fix-vaapi-on-intel.patch Patch402: chromium-enable-widevine.patch Patch403: chromium-manpage.patch @@ -214,10 +213,8 @@ Patch1406: chromium-rpm-fusion-brand.patch %patchset_apply chromium-78-protobuf-RepeatedPtrField-export.patch %patchset_apply chromium-95-libyuv-aarch64.patch -%patchset_apply chromium-96-CommandLine-include.patch -%patchset_apply chromium-96-CouponDB-include.patch -%patchset_apply chromium-96-DrmRenderNodePathFinder-include.patch -%patchset_apply chromium-96-RestrictedCookieManager-tuple.patch +%patchset_apply chromium-97-Point-constexpr.patch +%patchset_apply chromium-97-ScrollView-reference.patch # Apply patches up to #1000 from this spec. @@ -225,8 +222,6 @@ Patch1406: chromium-rpm-fusion-brand.patch # Manually apply patches that need an ifdef -%patch1227 -Rp1 - %if 0%{?fedora} < 35 %patch1228 -Rp1 %patch1229 -Rp1 @@ -756,6 +751,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda %{chromiumdir}/swiftshader/libGLESv2.so #########################################changelogs################################################# %changelog +* Wed Jan 05 2022 Leigh Scott <leigh123linux(a)gmail.com&gt; - 97.0.4692.71-1 +- Update to 97.0.4692.71 + * Tue Dec 14 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 96.0.4664.110-1 - Update to 96.0.4664.110 @@ -795,165 +793,3 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda * Wed Sep 01 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 93.0.4577.63-1 - Update to 93.0.4577.63 -* Tue Aug 31 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 92.0.4515.166-1 -- Update to 92.0.4515.166 - -* Thu Aug 26 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 92.0.4515.159-5 -- Enable expired vaapi support - -* Wed Aug 25 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 92.0.4515.159-4 -- Disable eu-strip - -* Sun Aug 22 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 92.0.4515.159-3 -- Fix sandbox crash - -* Sun Aug 22 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 92.0.4515.159-2 -- Add missing file and add crashpad_handler consent patch - -* Sat Aug 21 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 92.0.4515.159-1 -- Update to 92.0.4515.159 - -* Mon Aug 02 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 90.0.4430.85-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Apr 22 2021 qvint <dotqvint(a)gmail.com&gt; - 90.0.4430.85-1 -- Update to 90.0.4430.85 - -* Sat Apr 17 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 89.0.4389.114-2 -- Rebuild for F33 to include missed patches (rfbz#5973) - -* Sun Apr 04 2021 qvint <dotqvint(a)gmail.com&gt; - 89.0.4389.114-1 -- Update to 89.0.4389.114 - -* Thu Feb 04 2021 qvint <dotqvint(a)gmail.com&gt; - 88.0.4324.150-1 -- Update to 88.0.4324.150 - -* Wed Jan 20 2021 qvint <dotqvint(a)gmail.com&gt; - 88.0.4324.96-1 -- Update to 88.0.4324.96 -- Comply with new Google API key rules for derivatives -- Fix Icon key in chrome-apps.directory (rfbz#5895) -- Fix PulseAudio application name and icon -- Don't depend on CHROME_DESKTOP env var -- Sync shell wrapper with Fedora Chromium (rfbz#5859, rhbz#1902983) - -* Tue Dec 08 2020 qvint <dotqvint(a)gmail.com&gt; - 87.0.4280.88-1 -- Update to 87.0.4280.88 - -* Fri Nov 27 2020 qvint <dotqvint(a)gmail.com&gt; - 87.0.4280.66-1 -- Update to 87.0.4280.66 - -* Tue Oct 27 2020 qvint <dotqvint(a)gmail.com&gt; - 86.0.4240.111-2 -- Fix invalid "end" iterator usage in CookieMonster -- Only fall back to the i965 driver if we're on iHD -- Check for enable-accelerated-video-decode -- Fix mouse movements near window edges -- Fix crash in UserInputMonitorLinuxCore (rfbz#5807) - -* Wed Oct 21 2020 qvint <dotqvint(a)gmail.com&gt; - 86.0.4240.111-1 -- Update to 86.0.4240.111 - -* Wed Sep 23 2020 qvint <dotqvint(a)gmail.com&gt; - 85.0.4183.121-1 -- Update to 85.0.4183.121 -- Enable Hangout services extension (rfbz#5758) -- Use MD5-based BuildID (rfbz#5743) -- Use %%ninja_build macro -- Remove debug_pkg toggle -- Replace bconds with ordinary macros -- Use system re2 -- Use system libicu (f33+) - -* Thu Sep 10 2020 qvint <dotqvint(a)gmail.com&gt; - 85.0.4183.102-1 -- Update to 85.0.4183.102 -- Remove bundlepylibs and clang toggles - -* Mon Aug 31 2020 qvint <dotqvint(a)gmail.com&gt; - 85.0.4183.83-2 -- Ship ANGLE libEGL.so and libGLESv2.so (rfbz#5738) - -* Wed Aug 26 2020 qvint <dotqvint(a)gmail.com&gt; - 85.0.4183.83-1 -- Update to 85.0.4183.83 -- Use xcb-proto bundled in Chromium tarball -- Drop Fedora 30 support -- Fix XDG paths in manpage -- Update AppStream metadata -- Fix name in .desktop file (rfbz#5717) -- Fix name in GNOME default-apps XML -- Add symbolic app icon - -* Tue Aug 11 2020 qvint <dotqvint(a)gmail.com&gt; - 84.0.4147.125-1 -- Update to 84.0.4147.125 -- Stop using gold -- Add 'ulimit -n 2048' - -* Sat Jul 18 2020 qvint <dotqvint(a)gmail.com&gt; - 84.0.4147.89-1 -- Update to 84.0.4147.89 -- Use patchset composed by Stephan Hartmann <stha09(a)googlemail.com&gt; -- Bundle xcb-proto - -* Thu Jun 25 2020 qvint <dotqvint(a)gmail.com&gt; - 83.0.4103.116-1 -- Update to 83.0.4103.116 - -* Wed Jun 17 2020 qvint <dotqvint(a)gmail.com&gt; - 83.0.4103.106-1 -- Update to 83.0.4103.106 -- Disable python byte compiling - -* Mon Jun 08 2020 qvint <dotqvint(a)gmail.com&gt; - 83.0.4103.97-2 -- Fix crash in ServiceWorker (rfbz#5671) - -* Fri Jun 05 2020 qvint <dotqvint(a)gmail.com&gt; - 83.0.4103.97-1 -- Update to 83.0.4103.97 - -* Wed May 06 2020 qvint <dotqvint(a)gmail.com&gt; - 81.0.4044.138-1 -- Update to 81.0.4044.138 -- Fix touchpad scrolling under XWayland (rfbz#5621) - -* Thu Apr 30 2020 qvint <dotqvint(a)gmail.com&gt; - 81.0.4044.129-1 -- Update to 81.0.4044.129 - -* Thu Apr 09 2020 qvint <dotqvint(a)gmail.com&gt; - 81.0.4044.92-1 -- Update to 81.0.4044.92 - -* Sun Apr 05 2020 qvint <dotqvint(a)gmail.com&gt; - 80.0.3987.163-1 -- Update to 80.0.3987.163 - -* Thu Apr 02 2020 qvint <dotqvint(a)gmail.com&gt; - 80.0.3987.162-1 -- Update to 80.0.3987.162 - -* Wed Mar 18 2020 qvint <dotqvint(a)gmail.com&gt; - 80.0.3987.149-1 -- Update to 80.0.3987.149 -- Fix rpmlint warnings and errors - -* Wed Mar 04 2020 qvint <dotqvint(a)gmail.com&gt; - 80.0.3987.132-1 -- Update to 80.0.3987.132 - -* Sun Mar 01 2020 qvint <dotqvint(a)gmail.com&gt; - 80.0.3987.122-1 -- Update to 80.0.3987.122 - -* Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 79.0.3945.130-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jan 17 2020 Vasiliy Glazov <vascom2(a)gmail.com&gt; - 79.0.3945.130-1 -- Update to 79.0.3945.130 - -* Tue Jan 14 2020 Vasiliy Glazov <vascom2(a)gmail.com&gt; - 79.0.3945.117-1 -- Update to 79.0.3945.117 - -* Sat Dec 21 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org&gt; - 79.0.3945.88-1 -- Update to 79.0.3945.88 - -* Fri Dec 13 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org&gt; - 79.0.3945.79-1 -- Update to 79.0.3945.79 - -* Fri Dec 06 2019 Vasiliy Glazov <vascom2(a)gmail.com&gt; - 78.0.3904.108-2 -- Disable fedora's build flags to reduce binary size - -* Thu Nov 21 2019 Vasiliy Glazov <vascom2(a)gmail.com&gt; - 78.0.3904.108-1 -- Update to 78.0.3904.108 - -* Tue Nov 12 2019 Vasiliy Glazov <vascom2(a)gmail.com&gt; - 78.0.3904.97-1 -- Update to 78.0.3904.97 - -* Sat Nov 02 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org&gt; - 78.0.3904.87-1 -- Update to 78.0.3904.87 - -* Thu Oct 31 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org&gt; - 78.0.3904.70-1 -- IMPORT: rename package; add back Fedora build flags diff --git a/chromium-md5-based-build-id.patch b/chromium-md5-based-build-id.patch index 3f55448..52b38ac 100644 --- a/chromium-md5-based-build-id.patch +++ b/chromium-md5-based-build-id.patch @@ -3,10 +3,10 @@ https://bugzilla.rpmfusion.org/show_bug.cgi?id=5743 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -368,7 +368,7 @@ config("compiler") { +@@ -406,7 +406,7 @@ config("compiler") { # links. ldflags += [ "-Wl,--build-id=sha1" ] - } else if (current_os != "aix") { + } else if (current_os != "aix" && current_os != "zos") { - ldflags += [ "-Wl,--build-id" ] + ldflags += [ "-Wl,--build-id=md5" ] } diff --git a/sources b/sources index 8f4d49e..e6d43c0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (chromium-96.0.4664.110.tar.xz) = 7db962dc7016f531c33e915408303f06f429b53d1c5a69b281e64f6204d4bdb413fd281c3d891bb696d846f80f6182289c10f4b19b3b4c2c8b7fd72070de3f02 -SHA512 (chromium-patches-chromium-96-patchset-4.tar.gz) = f3b25447b8f78d9c9d3bacf0f54bf29da1053d4524597744100d9d20fea750b1dca70e5504f92885320a5408180b435f79510f58e52bae5dd4786d9fb31892cf +SHA512 (chromium-97.0.4692.71.tar.xz) = 4087950d5353b6fa824de5aeb43a578b0b2361d5a2f32977814f13c75ff0c5ab5f9bd5f70f6331c1e16654733ac2c1d0b5023d856171ea658658336ff3424af4 +SHA512 (chromium-patches-chromium-97-patchset-4.tar.gz) = d5e5e4ed005c12ca973f01d8d6d657d67a36b6b20ab4d0b5bef005a5094012ea41a436a49439954ffe70fd01bbd9abad21c83d1894bbd6b3f80c5737e494ec7d diff --git a/unbundle-ffmpeg-av_stream_get_first_dts.patch b/unbundle-ffmpeg-av_stream_get_first_dts.patch new file mode 100644 index 0000000..dae1add --- /dev/null +++ b/unbundle-ffmpeg-av_stream_get_first_dts.patch @@ -0,0 +1,12 @@ +diff --git a/build/linux/unbundle/ffmpeg.gn b/build/linux/unbundle/ffmpeg.gn +index 16e20744706..6a079b32221 100644 +--- a/build/linux/unbundle/ffmpeg.gn ++++ b/build/linux/unbundle/ffmpeg.gn +@@ -12,6 +12,7 @@ pkg_config("system_ffmpeg") { + "libavformat", + "libavutil", + ] ++ defines = [ "av_stream_get_first_dts(stream)=stream->first_dts" ] + } + + buildflag_header("ffmpeg_features") {