Merge branch 'master' into epel8
This commit is contained in:
Tom Callaway
commit
688908aa72
1135
chromium-86.0.4240.111-el7-limit-nearby-sharing-to-chromeos.patch
Normal file
1135
chromium-86.0.4240.111-el7-limit-nearby-sharing-to-chromeos.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,14 +1,55 @@
|
||||
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 11:33:27.395594061 -0400
|
||||
+++ chromium-86.0.4240.75/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc 2020-10-19 11:33:41.703706818 -0400
|
||||
@@ -6,7 +6,9 @@
|
||||
--- 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 <errno.h>
|
||||
#include <fcntl.h>
|
||||
-#include <linux/kcmp.h>
|
||||
+#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 <sys/socket.h>
|
||||
|
||||
// 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;
|
||||
|
||||
36
chromium-87-CursorFactory-include.patch
Normal file
36
chromium-87-CursorFactory-include.patch
Normal file
@ -0,0 +1,36 @@
|
||||
From c4f6e8cd34a245c3640b86a91c9694d69594d80b Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Hartmann <stha09@googlemail.com>
|
||||
Date: Wed, 16 Sep 2020 15:05:02 +0000
|
||||
Subject: [PATCH] IWYU: ui::CursorFactory is now required independent from
|
||||
Ozone
|
||||
|
||||
---
|
||||
.../ui/views/chrome_browser_main_extra_parts_views_linux.cc | 5 +----
|
||||
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
|
||||
index 5a97d61..ccedd2a 100644
|
||||
--- a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
|
||||
+++ b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
|
||||
@@ -7,6 +7,7 @@
|
||||
#include "chrome/browser/themes/theme_service_aura_linux.h"
|
||||
#include "chrome/browser/ui/browser_list.h"
|
||||
#include "chrome/browser/ui/views/theme_profile_key.h"
|
||||
+#include "ui/base/cursor/cursor_factory.h"
|
||||
#include "ui/display/screen.h"
|
||||
#include "ui/views/linux_ui/linux_ui.h"
|
||||
|
||||
@@ -15,10 +16,6 @@
|
||||
#include "ui/gtk/gtk_ui_delegate.h"
|
||||
#endif
|
||||
|
||||
-#if defined(USE_OZONE)
|
||||
-#include "ui/base/cursor/cursor_factory.h"
|
||||
-#endif
|
||||
-
|
||||
#if defined(USE_X11)
|
||||
#include "ui/gfx/x/connection.h" // nogncheck
|
||||
#if BUILDFLAG(USE_GTK)
|
||||
--
|
||||
2.26.2
|
||||
|
||||
25
chromium-87-openscreen-include.patch
Normal file
25
chromium-87-openscreen-include.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From 0c0af4cabb7490db473cd2c28f069956974a4d98 Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Hartmann <stha09@googlemail.com>
|
||||
Date: Fri, 2 Oct 2020 12:11:58 +0000
|
||||
Subject: [PATCH] IWYU: uint8_t is defined in stdint.h
|
||||
|
||||
---
|
||||
third_party/openscreen/src/util/crypto/random_bytes.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/third_party/openscreen/src/util/crypto/random_bytes.h b/third_party/openscreen/src/util/crypto/random_bytes.h
|
||||
index 3cb2fa8..025b52c 100644
|
||||
--- a/third_party/openscreen/src/util/crypto/random_bytes.h
|
||||
+++ b/third_party/openscreen/src/util/crypto/random_bytes.h
|
||||
@@ -7,6 +7,8 @@
|
||||
|
||||
#include <array>
|
||||
|
||||
+#include <stdint.h>
|
||||
+
|
||||
namespace openscreen {
|
||||
|
||||
std::array<uint8_t, 16> GenerateRandomBytes16();
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@ -118,6 +118,13 @@ BuildRequires: libicu-devel >= 5.4
|
||||
# This can be revisited once we upgrade to Python 3
|
||||
%global bundlepylibs 1
|
||||
|
||||
# RHEL 7.9 dropped minizip.
|
||||
# It exists everywhere else though.
|
||||
%global bundleminizip 0
|
||||
%if 0%{?rhel} == 7
|
||||
%global bundleminizip 1
|
||||
%endif
|
||||
|
||||
# Chromium used to break on wayland, hidpi, and colors with gtk3 enabled.
|
||||
# Hopefully it does not anymore.
|
||||
%global gtk3 1
|
||||
@ -177,7 +184,7 @@ Name: chromium%{chromium_channel}%{nsuffix}
|
||||
%else
|
||||
Name: chromium%{chromium_channel}
|
||||
%endif
|
||||
Version: %{majorversion}.0.4240.75
|
||||
Version: %{majorversion}.0.4240.111
|
||||
Release: 1%{?dist}
|
||||
%if %{?freeworld}
|
||||
%if %{?shared}
|
||||
@ -287,6 +294,10 @@ Patch107: chromium-84.0.4147.89-el8-arm-incompatible-ints.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
|
||||
# Move nearby_share code to chromeos only on EL7
|
||||
# Why? Because something in it fails to build on EL7 (and only there)
|
||||
# And upstream later sets it to chromeos only anyway
|
||||
Patch109: chromium-86.0.4240.111-el7-limit-nearby-sharing-to-chromeos.patch
|
||||
|
||||
# VAAPI
|
||||
# Upstream turned VAAPI on in Linux in 86
|
||||
@ -379,8 +390,8 @@ BuildRequires: minizip-compat-devel
|
||||
%if 0%{?rhel} >= 8
|
||||
BuildRequires: minizip-compat-devel
|
||||
%else
|
||||
# RHEL 7 and older uses the old minizip
|
||||
BuildRequires: minizip-devel
|
||||
# RHEL 7 used to have minizip, but as of 7.9, it does not.
|
||||
# BuildRequires: minizip-devel
|
||||
%endif
|
||||
%endif
|
||||
# RHEL 7's nodejs is too old
|
||||
@ -754,8 +765,12 @@ Summary: Files needed for both the headless_shell and full Chromium
|
||||
%if 0%{?fedora} >= 30
|
||||
Requires: minizip-compat%{_isa}
|
||||
%else
|
||||
%if %{?rhel} == 7
|
||||
# Do nothing
|
||||
%else
|
||||
Requires: minizip%{_isa}
|
||||
%endif
|
||||
%endif
|
||||
# -common doesn't have chrome-remote-desktop bits
|
||||
# but we need to clean it up if it gets disabled again
|
||||
# NOTE: Check obsoletes version to be sure it matches
|
||||
@ -858,7 +873,9 @@ udev.
|
||||
# Short term fixes (usually gcc and backports)
|
||||
%patch50 -p1 -b .gettid-fix
|
||||
%patch51 -p1 -b .gcc-remoting-constexpr
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
%patch52 -p1 -b .unbundle-zlib
|
||||
%endif
|
||||
%patch53 -p1 -b .gcc-include-memory
|
||||
%patch54 -p1 -b .base-gcc-no-alignas
|
||||
%patch55 -p1 -b .protobuf-export
|
||||
@ -892,6 +909,7 @@ udev.
|
||||
%patch103 -p1 -b .epel7-kcmp
|
||||
%patch104 -p1 -b .el7cups
|
||||
%patch108 -p1 -b .el7-old-libdrm
|
||||
%patch109 -p1 -b .disable-nearby_sharing
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel} == 8
|
||||
@ -1327,7 +1345,6 @@ sed -i 's|/opt/google/chrome-remote-desktop|%{crd_path}|g' remoting/host/setup/d
|
||||
export PATH=$PATH:%{_builddir}/depot_tools
|
||||
|
||||
build/linux/unbundle/replace_gn_files.py --system-libraries \
|
||||
flac \
|
||||
%if 0%{?bundlefontconfig}
|
||||
%else
|
||||
fontconfig \
|
||||
@ -1377,7 +1394,11 @@ build/linux/unbundle/replace_gn_files.py --system-libraries \
|
||||
%else
|
||||
re2 \
|
||||
%endif
|
||||
zlib
|
||||
%if 0%{?bundleminizip}
|
||||
%else
|
||||
zlib \
|
||||
%endif
|
||||
flac
|
||||
|
||||
# fix arm gcc
|
||||
sed -i 's|arm-linux-gnueabihf-|arm-linux-gnu-|g' build/toolchain/linux/BUILD.gn
|
||||
@ -1905,6 +1926,12 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Oct 21 2020 Tom Callaway <spot@fedoraproject.org> - 86.0.4240.111-1
|
||||
- update to 86.0.4240.111
|
||||
|
||||
* Tue Oct 20 2020 Tom Callaway <spot@fedoraproject.org> - 86.0.4240.75-2
|
||||
- use bundled zlib/minizip on el7 (thanks Red Hat. :P)
|
||||
|
||||
* Wed Oct 14 2020 Tom Callaway <spot@fedoraproject.org> - 86.0.4240.75-1
|
||||
- update to 86.0.4240.75
|
||||
|
||||
|
||||
2
sources
2
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-86.0.4240.75-clean.tar.xz) = 9832895a138758522c1ea926bdf05116b3494196b19852ef0ee85c6fb333afea0d19d9950b74aa93cc6731bafc119768ae610d7c69fd21da10de2b4599006963
|
||||
SHA512 (chromium-86.0.4240.111-clean.tar.xz) = 51f779e6f6549442e4392087c3aff48931e254b69ab2bbe9d25c3523de7a62dc9fadd99ba7dd22c614b2031ca93f35184bf14de7fdfb79abc0d5139078d695de
|
||||
|
||||
Loading…
Reference in New Issue
Block a user