From dd061771f4445a123768196dffc0df2d85a55a84 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Mon, 26 Apr 2021 11:24:09 -0400 Subject: [PATCH 1/4] drop patch109 for el7 --- chromium.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/chromium.spec b/chromium.spec index d3bdfd64..127a4c27 100644 --- a/chromium.spec +++ b/chromium.spec @@ -328,8 +328,6 @@ Patch106: chromium-77-clang.patch # libdrm on EL7 is rather old and chromium assumes newer # This gets us by for now Patch108: chromium-85.0.4183.83-el7-old-libdrm.patch -# EL-7 does not have sys/random.h -Patch109: chromium-87.0.4280.66-el7-no-sys-random.patch # VAAPI # Upstream turned VAAPI on in Linux in 86 @@ -950,7 +948,6 @@ udev. %patch103 -p1 -b .epel7-kcmp %patch104 -p1 -b .el7cups %patch108 -p1 -b .el7-old-libdrm -%patch109 -p1 -b .el7-no-sys-random %endif %if 0%{?rhel} == 8 From 0f80de2bab23d712cc71d9099dae981c96a786ef Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Mon, 26 Apr 2021 14:48:46 -0400 Subject: [PATCH 2/4] fix pipewire deps --- chromium.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/chromium.spec b/chromium.spec index 127a4c27..3a199aa2 100644 --- a/chromium.spec +++ b/chromium.spec @@ -439,7 +439,7 @@ BuildRequires: pulseaudio-libs-devel # For screen sharing on Wayland, currently Fedora only thing - no epel %if 0%{?fedora} -BuildRequires: pkgconfig(libpipewire-0.2) +BuildRequires: pkgconfig(libpipewire-0.3) %endif # for /usr/bin/appstream-util @@ -517,7 +517,6 @@ BuildRequires: pkgconfig(gtk+-3.0) %else BuildRequires: pkgconfig(gtk+-2.0) %endif -BuildRequires: pipewire-devel BuildRequires: /usr/bin/python2 BuildRequires: python2-devel %if 0%{?bundlepylibs} From 64dae9255ee6ec4afe0932569cf24ac5204c6c1f Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Tue, 27 Apr 2021 11:44:54 -0400 Subject: [PATCH 3/4] fix epel7 patch --- chromium-86.0.4240.75-epel7-no-kcmp-h.patch | 55 -------------- chromium-90.0.4430.85-epel7-no-kcmp-h.patch | 81 +++++++++++++++++++++ chromium.spec | 2 +- 3 files changed, 82 insertions(+), 56 deletions(-) delete mode 100644 chromium-86.0.4240.75-epel7-no-kcmp-h.patch create mode 100644 chromium-90.0.4430.85-epel7-no-kcmp-h.patch diff --git a/chromium-86.0.4240.75-epel7-no-kcmp-h.patch b/chromium-86.0.4240.75-epel7-no-kcmp-h.patch deleted file mode 100644 index 93d98715..00000000 --- a/chromium-86.0.4240.75-epel7-no-kcmp-h.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -up chromium-86.0.4240.75/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc.epel7-kcmp chromium-86.0.4240.75/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc ---- chromium-86.0.4240.75/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc.epel7-kcmp 2020-10-19 19:05:20.249786458 -0400 -+++ chromium-86.0.4240.75/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc 2020-10-20 10:50:21.560402023 -0400 -@@ -6,7 +6,24 @@ - - #include - #include --#include -+#ifndef KCMP_FILE -+#define KCMP_FILE 0 -+#endif -+#ifndef F_LINUX_SPECIFIC_BASE -+#define F_LINUX_SPECIFIC_BASE 1024 -+#endif -+#ifndef F_SEAL_SEAL -+#define F_SEAL_SEAL 0x0001 -+#endif -+#ifndef F_SEAL_SHRINK -+#define F_SEAL_SHRINK 0x0002 -+#endif -+#ifndef F_SEAL_GROW -+#define F_SEAL_GROW 0x0004 -+#endif -+#ifndef F_ADD_SEALS -+#define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9) -+#endif - #include - - // Some arch's (arm64 for instance) unistd.h don't pull in symbols used here -diff -up chromium-86.0.4240.75/sandbox/policy/linux/bpf_gpu_policy_linux.cc.epel7-kcmp chromium-86.0.4240.75/sandbox/policy/linux/bpf_gpu_policy_linux.cc ---- chromium-86.0.4240.75/sandbox/policy/linux/bpf_gpu_policy_linux.cc.epel7-kcmp 2020-10-20 11:58:00.449812627 -0400 -+++ chromium-86.0.4240.75/sandbox/policy/linux/bpf_gpu_policy_linux.cc 2020-10-20 11:58:32.919071919 -0400 -@@ -22,6 +22,22 @@ - #include "sandbox/policy/linux/sandbox_linux.h" - #include "sandbox/policy/linux/sandbox_seccomp_bpf_linux.h" - -+#ifndef F_LINUX_SPECIFIC_BASE -+#define F_LINUX_SPECIFIC_BASE 1024 -+#endif -+#ifndef F_SEAL_SEAL -+#define F_SEAL_SEAL 0x0001 -+#endif -+#ifndef F_SEAL_SHRINK -+#define F_SEAL_SHRINK 0x0002 -+#endif -+#ifndef F_SEAL_GROW -+#define F_SEAL_GROW 0x0004 -+#endif -+#ifndef F_ADD_SEALS -+#define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9) -+#endif -+ - using sandbox::bpf_dsl::Allow; - using sandbox::bpf_dsl::Arg; - using sandbox::bpf_dsl::Error; diff --git a/chromium-90.0.4430.85-epel7-no-kcmp-h.patch b/chromium-90.0.4430.85-epel7-no-kcmp-h.patch new file mode 100644 index 00000000..bebc2085 --- /dev/null +++ b/chromium-90.0.4430.85-epel7-no-kcmp-h.patch @@ -0,0 +1,81 @@ +diff -up chromium-90.0.4430.85/mojo/core/channel_linux.cc.epel7-kcmp chromium-90.0.4430.85/mojo/core/channel_linux.cc +--- chromium-90.0.4430.85/mojo/core/channel_linux.cc.epel7-kcmp 2021-04-27 11:42:46.207245608 -0400 ++++ chromium-90.0.4430.85/mojo/core/channel_linux.cc 2021-04-27 11:43:21.941841419 -0400 +@@ -37,6 +37,22 @@ + #include "mojo/core/core.h" + #include "mojo/core/embedder/features.h" + ++#ifndef F_LINUX_SPECIFIC_BASE ++#define F_LINUX_SPECIFIC_BASE 1024 ++#endif ++#ifndef F_SEAL_SEAL ++#define F_SEAL_SEAL 0x0001 ++#endif ++#ifndef F_SEAL_SHRINK ++#define F_SEAL_SHRINK 0x0002 ++#endif ++#ifndef F_SEAL_GROW ++#define F_SEAL_GROW 0x0004 ++#endif ++#ifndef F_ADD_SEALS ++#define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9) ++#endif ++ + namespace mojo { + namespace core { + +diff -up chromium-90.0.4430.85/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc.epel7-kcmp chromium-90.0.4430.85/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc +--- chromium-90.0.4430.85/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc.epel7-kcmp 2021-04-20 14:58:36.000000000 -0400 ++++ chromium-90.0.4430.85/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc 2021-04-26 11:13:36.743346891 -0400 +@@ -6,7 +6,24 @@ + + #include + #include +-#include ++#ifndef KCMP_FILE ++#define KCMP_FILE 0 ++#endif ++#ifndef F_LINUX_SPECIFIC_BASE ++#define F_LINUX_SPECIFIC_BASE 1024 ++#endif ++#ifndef F_SEAL_SEAL ++#define F_SEAL_SEAL 0x0001 ++#endif ++#ifndef F_SEAL_SHRINK ++#define F_SEAL_SHRINK 0x0002 ++#endif ++#ifndef F_SEAL_GROW ++#define F_SEAL_GROW 0x0004 ++#endif ++#ifndef F_ADD_SEALS ++#define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9) ++#endif + #include + + // Some arch's (arm64 for instance) unistd.h don't pull in symbols used here +diff -up chromium-90.0.4430.85/sandbox/policy/linux/bpf_gpu_policy_linux.cc.epel7-kcmp chromium-90.0.4430.85/sandbox/policy/linux/bpf_gpu_policy_linux.cc +--- chromium-90.0.4430.85/sandbox/policy/linux/bpf_gpu_policy_linux.cc.epel7-kcmp 2021-04-20 14:58:36.000000000 -0400 ++++ chromium-90.0.4430.85/sandbox/policy/linux/bpf_gpu_policy_linux.cc 2021-04-26 11:13:36.744346907 -0400 +@@ -23,6 +23,22 @@ + #include "sandbox/policy/linux/sandbox_linux.h" + #include "sandbox/policy/linux/sandbox_seccomp_bpf_linux.h" + ++#ifndef F_LINUX_SPECIFIC_BASE ++#define F_LINUX_SPECIFIC_BASE 1024 ++#endif ++#ifndef F_SEAL_SEAL ++#define F_SEAL_SEAL 0x0001 ++#endif ++#ifndef F_SEAL_SHRINK ++#define F_SEAL_SHRINK 0x0002 ++#endif ++#ifndef F_SEAL_GROW ++#define F_SEAL_GROW 0x0004 ++#endif ++#ifndef F_ADD_SEALS ++#define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9) ++#endif ++ + using sandbox::bpf_dsl::Allow; + using sandbox::bpf_dsl::Arg; + using sandbox::bpf_dsl::Error; diff --git a/chromium.spec b/chromium.spec index 3a199aa2..bbce9772 100644 --- a/chromium.spec +++ b/chromium.spec @@ -315,7 +315,7 @@ Patch101: chromium-75.0.3770.100-epel7-stdc++.patch # el7 only patch Patch102: chromium-80.0.3987.132-el7-noexcept.patch # No linux/kcmp.h on EPEL7 -Patch103: chromium-86.0.4240.75-epel7-no-kcmp-h.patch +Patch103: chromium-90.0.4430.85-epel7-no-kcmp-h.patch # Use old cups (chromium's code workaround breaks on gcc) # Revert: https://github.com/chromium/chromium/commit/c3213f8779ddc427e89d982514185ed5e4c94e91 Patch104: chromium-84.0.4147.89-epel7-old-cups.patch From 986d1b2df6bb77b4e1b1ac4c324f2943ec8b6f20 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Tue, 27 Apr 2021 12:07:26 -0400 Subject: [PATCH 4/4] update to 90.0.4430.93 --- chromium.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/chromium.spec b/chromium.spec index bbce9772..3286a4ee 100644 --- a/chromium.spec +++ b/chromium.spec @@ -215,7 +215,7 @@ Name: chromium%{chromium_channel}%{nsuffix} %else Name: chromium%{chromium_channel} %endif -Version: %{majorversion}.0.4430.85 +Version: %{majorversion}.0.4430.93 Release: 1%{?dist} %if %{?freeworld} %if %{?shared} @@ -1989,6 +1989,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %changelog +* Tue Apr 27 2021 Tom Callaway - 90.0.4430.93-1 +- update to 90.0.4430.93 + * Wed Apr 21 2021 Tom Callaway - 90.0.4430.85-1 - update to 90.0.4430.85 diff --git a/sources b/sources index 536de51c..2d45bdfa 100644 --- a/sources +++ b/sources @@ -20,4 +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-90.0.4430.85-clean.tar.xz) = 818a4b522382b0fd1d92aa1ea9d539610242c6f8aa657f7073fadfc691f50761ddb38bde6d4f317da21edc6b8b34b9629833174533d813e403282c7f64ffda5f +SHA512 (chromium-90.0.4430.93-clean.tar.xz) = 69da7a087f516d2f6d56914d941aa2f5e5563b6dc16191f1b5bc83b708bff72fa04e4d7cea19f68d8c493a1f86a9c8d907f727631b9342c7ca07765b9900e556