commit 04d8ac5a29fb3d988b63769dcde207068ebe8e38 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Wed May 25 06:09:52 2022 +0100 Update to 102.0.5005.61 chromium-freeworld.spec | 21 ++++++++++----------- clang_fix.patch | 10 ++++++++++ gcc12.patch | 20 -------------------- sources | 4 ++-- 4 files changed, 22 insertions(+), 33 deletions(-) --- diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec index e564012..823e009 100644 --- a/chromium-freeworld.spec +++ b/chromium-freeworld.spec @@ -42,7 +42,7 @@ ##############################Package Definitions###################################### Name: chromium-freeworld -Version: 101.0.4951.64 +Version: 102.0.5005.61 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) @@ -50,7 +50,7 @@ URL: https://www.chromium.org/Home Source0: https://commondatastorage.googleapis.com/chromium-browser-official/chromi... # Patchset composed by Stephan Hartmann. -%global patchset_revision chromium-101-patchset-4 +%global patchset_revision chromium-102-patchset-6 Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c... # The following two source files are copied and modified from the chromium source @@ -69,7 +69,7 @@ BuildRequires: lld BuildRequires: llvm # Basic tools and libraries needed for building BuildRequires: ninja-build, nodejs, bison, gperf, hwdata -BuildRequires: libatomic, flex, perl-Switch, elfutils +BuildRequires: libatomic, flex, perl-Switch, elfutils, git BuildRequires: libcap-devel, cups-devel, alsa-lib-devel BuildRequires: mesa-libGL-devel, mesa-libEGL-devel # Pipewire need this. @@ -199,6 +199,7 @@ Patch405: chromium-names.patch Patch406: gcc12.patch Patch407: allow-to-override-clang-through-env-variables.patch Patch408: chromium-rpm-fusion-brand.patch +Patch409: clang_fix.patch %description %{name} is an open-source web browser, powered by WebKit (Blink) @@ -215,7 +216,9 @@ Patch408: chromium-rpm-fusion-brand.patch %{__scm_apply_patch -p1} <%{patchset_root}/%{1} %patchset_apply chromium-78-protobuf-RepeatedPtrField-export.patch -%patchset_apply chromium-101-segmentation_platform-type.patch +%patchset_apply chromium-102-fenced_frame_utils-include.patch +%patchset_apply chromium-102-regex_pattern-array.patch +%patchset_apply chromium-102-swiftshader-template-instantiation.patch # Apply patches up to #1000 from this spec. %autopatch -M1000 -p1 @@ -402,7 +405,6 @@ tools/gn/bootstrap/bootstrap.py --gn-gen-args="$CHROMIUM_GN_DEFINES" --build-pat mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{chromiumdir}/locales mkdir -p %{buildroot}%{chromiumdir}/MEIPreload -mkdir -p %{buildroot}%{chromiumdir}/swiftshader mkdir -p %{buildroot}%{_mandir}/man1 mkdir -p %{buildroot}%{_metainfodir} mkdir -p %{buildroot}%{_datadir}/applications @@ -444,7 +446,6 @@ install -m 644 %{target}/*.pak %{buildroot}%{chromiumdir}/ install -m 644 %{target}/locales/*.pak %{buildroot}%{chromiumdir}/locales/ install -m 755 %{target}/xdg* %{buildroot}%{chromiumdir}/ install -m 644 %{target}/MEIPreload/* %{buildroot}%{chromiumdir}/MEIPreload/ -install -m 755 %{target}/swiftshader/*.so %{buildroot}%{chromiumdir}/swiftshader/ install -m 755 %{target}/libvk_swiftshader.so %{buildroot}%{chromiumdir}/ install -m 755 %{target}/libvulkan.so.1 %{buildroot}%{chromiumdir}/ install -m 644 %{target}/vk_swiftshader_icd.json %{buildroot}%{chromiumdir}/ @@ -472,8 +473,6 @@ strip %{buildroot}%{chromiumdir}/libEGL.so strip %{buildroot}%{chromiumdir}/libGLESv2.so strip %{buildroot}%{chromiumdir}/libvk_swiftshader.so strip %{buildroot}%{chromiumdir}/libvulkan.so.1 -strip %{buildroot}%{chromiumdir}/swiftshader/libEGL.so -strip %{buildroot}%{chromiumdir}/swiftshader/libGLESv2.so ####################################check################################################## %check @@ -515,14 +514,14 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda %{chromiumdir}/MEIPreload/preloaded_data.pb %dir %{chromiumdir}/locales %{chromiumdir}/locales/*.pak -%dir %{chromiumdir}/swiftshader -%{chromiumdir}/swiftshader/libEGL.so -%{chromiumdir}/swiftshader/libGLESv2.so %{chromiumdir}/libvk_swiftshader.so %{chromiumdir}/libvulkan.so.1 %{chromiumdir}/vk_swiftshader_icd.json #########################################changelogs################################################# %changelog +* Tue May 24 2022 Leigh Scott <leigh123linux(a)gmail.com&gt; - 102.0.5005.61-1 +- Update to 102.0.5005.61 + * Wed May 11 2022 Leigh Scott <leigh123linux(a)gmail.com&gt; - 101.0.4951.64-1 - Update to 101.0.4951.64 diff --git a/clang_fix.patch b/clang_fix.patch new file mode 100644 index 0000000..f047d26 --- /dev/null +++ b/clang_fix.patch @@ -0,0 +1,10 @@ +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -1543,7 +1543,6 @@ config("default_warnings") { + # TODO(https://crbug.com/1316298): Re-enable once test failure is figured out + cflags += [ + "-Xclang", +- "-no-opaque-pointers", + ] + } + diff --git a/gcc12.patch b/gcc12.patch index 7de4378..6e33fad 100644 --- a/gcc12.patch +++ b/gcc12.patch @@ -18,23 +18,3 @@ #if defined(__ELF__) // defined by gcc #if defined(__OpenBSD__) ---- a/net/base/address_list.h -+++ b/net/base/address_list.h -@@ -10,6 +10,7 @@ - #include <string> - #include <utility> - #include <vector> -+#include <tuple> - - #include "base/compiler_specific.h" - #include "net/base/ip_endpoint.h" ---- a/media/capabilities/webrtc_video_stats_db.h -+++ b/media/capabilities/webrtc_video_stats_db.h -@@ -7,6 +7,7 @@ - - #include <memory> - #include <string> -+#include <vector> - - #include "base/callback_forward.h" - #include "base/check.h" diff --git a/sources b/sources index 1216a94..17e9d32 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (chromium-101.0.4951.64.tar.xz) = ca1ba0994c75eda67f37a9e8333beb595b237b7266503cca4c259c48b8687214b35703fdda0d6cfd2c7bbdce0b66d68cede3bc22581453f035a173caf7d4985f -SHA512 (chromium-patches-chromium-101-patchset-4.tar.gz) = fa2f578f5e5468bdc5f7774444db84e9ce49cec3f0e66d28fa196d1a294eda5a149e175475e068ed03b286033c2ca3f1eef8098274d7618d08bbe9623b652150 +SHA512 (chromium-102.0.5005.61.tar.xz) = 4b5d48debafef0a38105e259f97eac6e25eae1147ce67e357c3ce1e8e7700950af63117ff104b71cfbdfcaa0b31925d1b686ab1be6c52b32dad819c7e38f1846 +SHA512 (chromium-patches-chromium-102-patchset-6.tar.gz) = 11da49934346e0f06929224d8f60eb78c76913d3dba80dce9da2c83e67f6dfe4e77f87a30c90d9677e4bbee1ded73700762387f27f7ec882a76298b46231a810