[chromium-browser-privacy: 3/3] Update ungoogled-chromium to 84.0.4147.89-1
by qvint
commit bbcfc6469f3878f57504646ca4d86ad0bb2dec8c
Author: qvint <dotqvint(a)gmail.com>
Date: Sat Jul 18 16:58:35 2020 +0300
Update ungoogled-chromium to 84.0.4147.89-1
chromium-browser-privacy.spec | 5 ++---
sources | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/chromium-browser-privacy.spec b/chromium-browser-privacy.spec
index a0d7e39..7951f9d 100644
--- a/chromium-browser-privacy.spec
+++ b/chromium-browser-privacy.spec
@@ -99,7 +99,7 @@ Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_re
Source2: https://xcb.freedesktop.org/dist/xcb-proto-%{xcb_proto_version}.tar.bz2
# ungoogled-chromium.
-%global ungoogled_chromium_revision 83.0.4103.116-1
+%global ungoogled_chromium_revision 84.0.4147.89-1
Source300: https://github.com/Eloston/ungoogled-chromium/archive/%{ungoogled_chromiu...
# The following two source files are copied and modified from the chromium source
@@ -562,8 +562,6 @@ mkdir -p third_party/node/linux/node-linux-x64/bin
ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node
# ungoogled-chromium: patches
-sed -i '/extra\/inox-patchset\/chromium-widevine.patch/d' \
- %{ungoogled_chromium_root}/patches/series
python3 -B %{ungoogled_chromium_root}/utils/patches.py apply . \
%{ungoogled_chromium_root}/patches
@@ -811,6 +809,7 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%changelog
* Sat Jul 18 2020 qvint <dotqvint(a)gmail.com> - 84.0.4147.89-1
- Update Chromium to 84.0.4147.89
+- Update ungoogled-chromium to 84.0.4147.89-1
* Sat Jun 27 2020 qvint <dotqvint(a)gmail.com> - 83.0.4103.116-1
- Update Chromium to 83.0.4103.116
diff --git a/sources b/sources
index ed1f9b3..afaf08c 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (chromium-84.0.4147.89.tar.xz) = cc207a5f09a89e42bc12fd491d5d0ef11c04daaa324aa696d2f8a37679b8f2171d3b265296968c3312e158b0fd2c059e12727a7463d3bd2f640d5bbd43c4f676
SHA512 (chromium-patches-chromium-84-patchset-3.tar.gz) = ea7f5c9436bbbe3de2fa69f006e0e12be24e73a652d3ac780c30045dfd821b41d9b83779fd306eafc2455cbc8fced3477f5adff626318a4ab5e13b06d9a7234a
SHA512 (xcb-proto-1.13.tar.bz2) = 002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7
-SHA512 (ungoogled-chromium-83.0.4103.116-1.tar.gz) = ca535b9cd702292f1b861dd1ce9330eac1b4fe7927738d46c2a2ce353f920117e3cbd71cd39c79426643f148cd1c3bcfedd6d3afb23690361ac4dc6546f71be9
+SHA512 (ungoogled-chromium-84.0.4147.89-1.tar.gz) = 4b6de31a2eeb705ce1426bec8260b99bd332eff25359119d0f1af2d4ecaed3a9d94a8654b5f16815a03749a6e45d564c70ed141fa9b928d51a18cfdb8f1cda02
3 years, 9 months
[chromium-browser-privacy: 2/3] Sync spec and sources with free/chromium-freeworld
by qvint
commit 1b2cf7df18fb863180f73c46520e25b4e6005d16
Merge: 2fdd830 c4c8cd7
Author: qvint <dotqvint(a)gmail.com>
Date: Sat Jul 18 16:40:12 2020 +0300
Sync spec and sources with free/chromium-freeworld
.gitignore | 2 +
...-b794998819088f76b4cf44c8db6940240c563cf4.patch | 18 ---
chromium-82-gcc-noexcept.patch | 31 -----
chromium-82-gcc-template.patch | 48 --------
chromium-83-gcc-10-r31184.patch | 35 ------
chromium-83-gcc-10-r766427.patch | 27 -----
chromium-83-gcc-10.patch | 20 ---
chromium-83-gcc-include.patch | 22 ----
chromium-83-gcc-iterator.patch | 36 ------
chromium-83-gcc-r756880.patch | 69 -----------
chromium-83-gcc-r760272.patch | 27 -----
chromium-83-gcc-r760588.patch | 58 ---------
chromium-83-gcc-r762806.patch | 43 -------
chromium-83-gcc-r766770.patch | 134 ---------------------
chromium-84-nss-r771840.patch | 38 ++++++
chromium-browser-privacy.spec | 74 ++++++++----
chromium-enable-vaapi.patch | 8 +-
chromium-fix-vaapi-on-intel.patch | 8 +-
...bootstrap.patch => chromium-py2-bootstrap.patch | 0
sources | 4 +-
20 files changed, 99 insertions(+), 603 deletions(-)
---
diff --cc .gitignore
index 8dcfed7,9d45c0d..ebe8c14
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,4 @@@
chromium-*.tar.xz
+ chromium-patches-*.tar.gz
+ xcb-proto-*.tar.bz2
+ungoogled-chromium-*.tar.gz
diff --cc chromium-browser-privacy.spec
index 8bf0e15,b730fe8..a0d7e39
--- a/chromium-browser-privacy.spec
+++ b/chromium-browser-privacy.spec
@@@ -65,12 -65,13 +65,13 @@@
# Enable building with ozone support
%global ozone 0
##############################Package Definitions######################################
-Name: chromium-freeworld
+Name: chromium-browser-privacy
- Version: 83.0.4103.116
+ Version: 84.0.4147.89
Release: 1%{?dist}
-Summary: Chromium web browser built with all freeworld codecs and VA-API support
+Summary: Chromium, sans integration with Google
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)
-URL: https://www.chromium.org/Home
+URL: https://github.com/Eloston/ungoogled-chromium
+
%if %{freeworld}
Source0: https://commondatastorage.googleapis.com/chromium-browser-official/chromi...
%else
@@@ -88,8 -89,15 +89,19 @@@
# ./chromium-latest.py --stable --ffmpegclean --ffmpegarm --deleteunrar
Source0: chromium-%{version}-clean.tar.xz
%endif
+
+ # Patchset composed by Stephan Hartmann.
+ %global patchset_revision chromium-84-patchset-3
+ Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c...
+
+ # Bundled xcb-proto. Chromium needs python2 version of this package.
+ %global xcb_proto_version 1.13
+ Source2: https://xcb.freedesktop.org/dist/xcb-proto-%{xcb_proto_version}.tar.bz2
+
++# ungoogled-chromium.
+%global ungoogled_chromium_revision 83.0.4103.116-1
+Source300: https://github.com/Eloston/ungoogled-chromium/archive/%{ungoogled_chromiu...
++
# The following two source files are copied and modified from the chromium source
Source10: %{name}.sh
#Add our own appdata file.
@@@ -240,32 -232,26 +235,46 @@@ Patch402: chromium-enable-widevin
Patch403: chromium-rpm-fusion-brand.patch
%endif
+# RPM Fusion patches [free/chromium-browser-privacy]:
+Patch500: chromium-default-user-data-dir.patch
+
+# Additional patches:
+Patch600: chromium-widevine-locations.patch
+
%description
-%{name} is an open-source web browser, powered by WebKit (Blink)
+%{name} is an ungoogled-chromium distribution.
+
+ungoogled-chromium is Chromium, sans integration with Google. It also features
+some tweaks to enhance privacy, control, and transparency (almost all of which
+require manual activation or enabling).
+
+ungoogled-chromium retains the default Chromium experience as closely as
+possible. Unlike other Chromium forks that have their own visions of a web
+browser, ungoogled-chromium is essentially a drop-in replacement for Chromium.
############################################PREP###########################################################
%prep
+ %setup -q -T -n chromium-patches-%{patchset_revision} -b 1
+ %setup -q -T -n xcb-proto-%{xcb_proto_version} -b 2
+%setup -q -T -n ungoogled-chromium-%{ungoogled_chromium_revision} -b 300
- %setup -q -n chromium-%{version}
- # ungoogled-chromium: binary pruning
+ %global patchset_root %{_builddir}/chromium-patches-%{patchset_revision}
+ %global xcb_proto_root %{_builddir}/xcb-proto-%{xcb_proto_version}
+%global ungoogled_chromium_root %{_builddir}/ungoogled-chromium-%{ungoogled_chromium_revision}
+
+ %setup -q -n chromium-%{version}
+
+ # Apply patchset composed by Stephan Hartmann.
+ rm %{patchset_root}/chromium-84-compiler.patch
+ for patch in %{patchset_root}/*.patch; do
+ echo "Applying ${patch}"
+ %{__patch} -p1 <"${patch}"
+ done
+
++# ungoogled-chromium: binary pruning.
+python3 -B %{ungoogled_chromium_root}/utils/prune_binaries.py . \
+ %{ungoogled_chromium_root}/pruning.list
+
+ # Apply patches from this spec.
%autopatch -p1
#Let's change the default shebang of python files.
@@@ -548,19 -537,6 +560,20 @@@ ln -s %{python2_sitelib}/ply third_part
# Fix the path to nodejs binary
mkdir -p third_party/node/linux/node-linux-x64/bin
ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node
++
+# ungoogled-chromium: patches
+sed -i '/extra\/inox-patchset\/chromium-widevine.patch/d' \
+ %{ungoogled_chromium_root}/patches/series
+python3 -B %{ungoogled_chromium_root}/utils/patches.py apply . \
+ %{ungoogled_chromium_root}/patches
+
+# ungoogled-chromium: domain substitution
+rm -f %{_builddir}/dsc.tar.gz
+python3 -B %{ungoogled_chromium_root}/utils/domain_substitution.py apply . \
+ -r %{ungoogled_chromium_root}/domain_regex.list \
+ -f %{ungoogled_chromium_root}/domain_substitution.list \
+ -c %{_builddir}/dsc.tar.gz
+
#####################################BUILD#############################################
%build
#export compilar variables
@@@ -790,26 -763,49 +809,29 @@@ appstream-util validate-relax --nonet "
%{chromiumdir}/swiftshader/libGLESv2.so
#########################################changelogs#################################################
%changelog
+ * Sat Jul 18 2020 qvint <dotqvint(a)gmail.com> - 84.0.4147.89-1
-- Update to 84.0.4147.89
-- Use patchset composed by Stephan Hartmann <stha09(a)googlemail.com>
-- Bundle xcb-proto
-
-* Thu Jun 25 2020 qvint <dotqvint(a)gmail.com> - 83.0.4103.116-1
-- Update to 83.0.4103.116
-
-* Wed Jun 17 2020 qvint <dotqvint(a)gmail.com> - 83.0.4103.106-1
-- Update to 83.0.4103.106
-- Disable python byte compiling
++- Update Chromium to 84.0.4147.89
+
-* Mon Jun 08 2020 qvint <dotqvint(a)gmail.com> - 83.0.4103.97-2
-- Fix crash in ServiceWorker (rfbz#5671)
-
-* Fri Jun 05 2020 qvint <dotqvint(a)gmail.com> - 83.0.4103.97-1
-- Update to 83.0.4103.97
+* Sat Jun 27 2020 qvint <dotqvint(a)gmail.com> - 83.0.4103.116-1
+- Update Chromium to 83.0.4103.116
+- Update ungoogled-chromium to 83.0.4103.116-1
+- Try alternative locations for the Widevine CDM library
* Wed May 06 2020 qvint <dotqvint(a)gmail.com> - 81.0.4044.138-1
-- Update to 81.0.4044.138
-- Fix touchpad scrolling under XWayland (rfbz#5621)
+- Update Chromium to 81.0.4044.138
+- Update ungoogled-chromium to 38e86b5
* Thu Apr 30 2020 qvint <dotqvint(a)gmail.com> - 81.0.4044.129-1
-- Update to 81.0.4044.129
-
-* Thu Apr 09 2020 qvint <dotqvint(a)gmail.com> - 81.0.4044.92-1
-- Update to 81.0.4044.92
+- Update Chromium to 81.0.4044.129
+- Update ungoogled-chromium to 81.0.4044.129-1
-* Sun Apr 05 2020 qvint <dotqvint(a)gmail.com> - 80.0.3987.163-1
-- Update to 80.0.3987.163
+* Fri Apr 10 2020 qvint <dotqvint(a)gmail.com> - 81.0.4044.92-1
+- Update Chromium to 81.0.4044.92
+- Update ungoogled-chromium to 209e24b
-* Thu Apr 02 2020 qvint <dotqvint(a)gmail.com> - 80.0.3987.162-1
-- Update to 80.0.3987.162
-
-* Wed Mar 18 2020 qvint <dotqvint(a)gmail.com> - 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> - 80.0.3987.132-1
-- Update to 80.0.3987.132
-
-* Sun Mar 01 2020 qvint <dotqvint(a)gmail.com> - 80.0.3987.122-1
-- Update to 80.0.3987.122
+* Thu Feb 27 2020 qvint <dotqvint(a)gmail.com> - 80.0.3987.122-1
+- Update Chromium to 80.0.3987.122
+- Update ungoogled-chromium to 80.0.3987.122-1
* Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 79.0.3945.130-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --cc sources
index 5d1e78c,f5f739a..ed1f9b3
--- a/sources
+++ b/sources
@@@ -1,2 -1,3 +1,4 @@@
- SHA512 (chromium-83.0.4103.116.tar.xz) = dbd92fb04183ec1402401388f70b18b95040083c9ea8bf2ea6b1692fddc375b090968b13afb010ebf412b480b34747eb2c82709adbeb386cccf60b972f23254f
+ SHA512 (chromium-84.0.4147.89.tar.xz) = cc207a5f09a89e42bc12fd491d5d0ef11c04daaa324aa696d2f8a37679b8f2171d3b265296968c3312e158b0fd2c059e12727a7463d3bd2f640d5bbd43c4f676
+ SHA512 (chromium-patches-chromium-84-patchset-3.tar.gz) = ea7f5c9436bbbe3de2fa69f006e0e12be24e73a652d3ac780c30045dfd821b41d9b83779fd306eafc2455cbc8fced3477f5adff626318a4ab5e13b06d9a7234a
+ SHA512 (xcb-proto-1.13.tar.bz2) = 002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7
+SHA512 (ungoogled-chromium-83.0.4103.116-1.tar.gz) = ca535b9cd702292f1b861dd1ce9330eac1b4fe7927738d46c2a2ce353f920117e3cbd71cd39c79426643f148cd1c3bcfedd6d3afb23690361ac4dc6546f71be9
3 years, 9 months
[chromium-browser-privacy: 1/3] Update to 84.0.4147.89
by qvint
commit c4c8cd7ec7085d88fc8789db67d0e709182ad050
Author: qvint <dotqvint(a)gmail.com>
Date: Sat Jul 18 15:19:46 2020 +0300
Update to 84.0.4147.89
- Use patchset composed by Stephan Hartmann
- Bundle xcb-proto
.gitignore | 2 +
...-b794998819088f76b4cf44c8db6940240c563cf4.patch | 18 ---
chromium-82-gcc-noexcept.patch | 31 -----
chromium-82-gcc-template.patch | 48 --------
chromium-83-gcc-10-r31184.patch | 35 ------
chromium-83-gcc-10-r766427.patch | 27 -----
chromium-83-gcc-10.patch | 20 ---
chromium-83-gcc-include.patch | 22 ----
chromium-83-gcc-iterator.patch | 36 ------
chromium-83-gcc-r756880.patch | 69 -----------
chromium-83-gcc-r760272.patch | 27 -----
chromium-83-gcc-r760588.patch | 58 ---------
chromium-83-gcc-r762806.patch | 43 -------
chromium-83-gcc-r766770.patch | 134 ---------------------
chromium-84-nss-r771840.patch | 38 ++++++
chromium-enable-vaapi.patch | 8 +-
chromium-fix-vaapi-on-intel.patch | 8 +-
chromium-freeworld.spec | 73 +++++++----
...bootstrap.patch => chromium-py2-bootstrap.patch | 0
sources | 4 +-
20 files changed, 99 insertions(+), 602 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e912076..9d45c0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
chromium-*.tar.xz
+chromium-patches-*.tar.gz
+xcb-proto-*.tar.bz2
diff --git a/chromium-84-nss-r771840.patch b/chromium-84-nss-r771840.patch
new file mode 100644
index 0000000..6d01c11
--- /dev/null
+++ b/chromium-84-nss-r771840.patch
@@ -0,0 +1,38 @@
+From 3a3effdd81e97bfc4f2698cd1f41b008355b0469 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.costa(a)intel.com>
+Date: Tue, 26 May 2020 16:34:45 +0000
+Subject: [PATCH] scoped_nss_types.h: Include <certt.h> instead of
+ <nss/certt.h>
+
+Follow-up to commit 701cae5de ("Introduce a function to format a DER-encoded
+SPKI for UI").
+
+That is the format used by other files that include <certt.h>, and the
+pkg-config configuration already passes -I/path/to/nss to the compiler.
+
+This can potentially fix the non-sysroot build, as the NSS headers might be
+installed in e.g. /usr/include/nss3 rather than /usr/include/nss.
+
+Change-Id: I0461a7a7f8c93459f2281ea71c96434a74687ee8
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2214390
+Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa(a)intel.com>
+Commit-Queue: David Benjamin <davidben(a)chromium.org>
+Reviewed-by: David Benjamin <davidben(a)chromium.org>
+Cr-Commit-Position: refs/heads/master@{#771840}
+---
+ crypto/scoped_nss_types.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/crypto/scoped_nss_types.h
++++ b/crypto/scoped_nss_types.h
+@@ -5,9 +5,9 @@
+ #ifndef CRYPTO_SCOPED_NSS_TYPES_H_
+ #define CRYPTO_SCOPED_NSS_TYPES_H_
+
++#include <certt.h>
+ #include <keyhi.h>
+ #include <nss.h>
+-#include <nss/certt.h>
+ #include <pk11pub.h>
+ #include <plarena.h>
+
diff --git a/chromium-enable-vaapi.patch b/chromium-enable-vaapi.patch
index ece03af..50bb0f0 100644
--- a/chromium-enable-vaapi.patch
+++ b/chromium-enable-vaapi.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Enable VAAPI on Linux
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
-@@ -2153,7 +2153,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2367,7 +2367,7 @@ const FeatureEntry kFeatureEntries[] = {
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
flag_descriptions::kAcceleratedVideoDecodeDescription,
@@ -14,7 +14,7 @@ Subject: [PATCH] Enable VAAPI on Linux
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
},
{
-@@ -2585,12 +2585,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2798,12 +2798,12 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop,
MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)},
#endif // ENABLE_VR
@@ -32,7 +32,7 @@ Subject: [PATCH] Enable VAAPI on Linux
FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)},
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
-@@ -2980,16 +2980,19 @@ const char kMetalDescription[] =
+@@ -3136,16 +3136,19 @@ const char kMetalDescription[] =
#endif
@@ -57,7 +57,7 @@ Subject: [PATCH] Enable VAAPI on Linux
"Use the aggregated ML model to rank the suggested apps.";
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
-@@ -1711,13 +1711,19 @@ extern const char kMetalDescription[];
+@@ -1820,13 +1820,19 @@ extern const char kMetalDescription[];
#endif // defined(OS_MACOSX)
diff --git a/chromium-fix-vaapi-on-intel.patch b/chromium-fix-vaapi-on-intel.patch
index 73281f4..f54cb69 100644
--- a/chromium-fix-vaapi-on-intel.patch
+++ b/chromium-fix-vaapi-on-intel.patch
@@ -21,7 +21,7 @@ Subject: [PATCH] Move offending function to chromeos only
} // namespace
-@@ -1155,6 +1157,8 @@ VaapiVideoDecodeAccelerator::DecideBuffe
+@@ -1169,6 +1171,8 @@ VaapiVideoDecodeAccelerator::DecideBuffe
if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
return BufferAllocationMode::kNormal;
@@ -30,11 +30,11 @@ Subject: [PATCH] Move offending function to chromeos only
// On Gemini Lake, Kaby Lake and later we can pass to libva the client's
// PictureBuffers to decode onto, which skips the use of the Vpp unit and its
// associated format reconciliation copy, avoiding all internal buffer
-@@ -1171,6 +1175,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe
+@@ -1184,6 +1188,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe
num_extra_pics_ = 3;
return BufferAllocationMode::kNone;
}
+#endif
- // If we're here, we have to use the Vpp unit and allocate buffers for
- // |decoder_|; usually we'd have to allocate the |decoder_|s
+ // For H.264 on older devices, another +1 is experimentally needed for
+ // high-to-high resolution changes.
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 10146e7..b730fe8 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -66,11 +66,12 @@
%global ozone 0
##############################Package Definitions######################################
Name: chromium-freeworld
-Version: 83.0.4103.116
+Version: 84.0.4147.89
Release: 1%{?dist}
Summary: Chromium web browser 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)
URL: https://www.chromium.org/Home
+
%if %{freeworld}
Source0: https://commondatastorage.googleapis.com/chromium-browser-official/chromi...
%else
@@ -88,6 +89,15 @@ Source0: https://commondatastorage.googleapis.com/chromium-browser-offici
# ./chromium-latest.py --stable --ffmpegclean --ffmpegarm --deleteunrar
Source0: chromium-%{version}-clean.tar.xz
%endif
+
+# Patchset composed by Stephan Hartmann.
+%global patchset_revision chromium-84-patchset-3
+Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c...
+
+# Bundled xcb-proto. Chromium needs python2 version of this package.
+%global xcb_proto_version 1.13
+Source2: https://xcb.freedesktop.org/dist/xcb-proto-%{xcb_proto_version}.tar.bz2
+
# The following two source files are copied and modified from the chromium source
Source10: %{name}.sh
#Add our own appdata file.
@@ -181,7 +191,6 @@ BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(libxslt)
BuildRequires: opus-devel
BuildRequires: snappy-devel
-BuildRequires: yasm
BuildRequires: expat-devel
BuildRequires: pciutils-devel
BuildRequires: speech-dispatcher-devel
@@ -208,28 +217,12 @@ Recommends: libva-utils
ExclusiveArch: x86_64
# Google patches (short-term fixes and backports):
-Patch150: chromium-83-gcc-r756880.patch
-Patch151: chromium-83-gcc-r760272.patch
-Patch152: chromium-83-gcc-r760588.patch
-Patch153: chromium-83-gcc-r762806.patch
-%if 0%{?fedora} >= 32
-Patch154: chromium-83-gcc-10-r31184.patch
-Patch155: chromium-83-gcc-10-r766427.patch
-%endif
-Patch156: chromium-83-gcc-r766770.patch
+Patch150: chromium-84-nss-r771840.patch
# Gentoo patches (short-term fixes):
-Patch250: chromium-83-gcc-include.patch
-Patch251: chromium-83-gcc-iterator.patch
-Patch252: chromium-82-gcc-template.patch
-Patch253: chromium-82-gcc-noexcept.patch
-%if 0%{?fedora} >= 32
-Patch254: chromium-83-gcc-10.patch
-%endif
# Fedora patches:
-Patch300: chromium-71.0.3578.98-py2-bootstrap.patch
-Patch301: chromium-58.0.3029.96-revert-b794998819088f76b4cf44c8db6940240c563cf4.patch
+Patch300: chromium-py2-bootstrap.patch
# RPM Fusion patches [free/chromium-freeworld]:
Patch400: chromium-enable-vaapi.patch
@@ -243,7 +236,23 @@ Patch403: chromium-rpm-fusion-brand.patch
%{name} is an open-source web browser, powered by WebKit (Blink)
############################################PREP###########################################################
%prep
-%autosetup -n chromium-%{version} -p1
+%setup -q -T -n chromium-patches-%{patchset_revision} -b 1
+%setup -q -T -n xcb-proto-%{xcb_proto_version} -b 2
+
+%global patchset_root %{_builddir}/chromium-patches-%{patchset_revision}
+%global xcb_proto_root %{_builddir}/xcb-proto-%{xcb_proto_version}
+
+%setup -q -n chromium-%{version}
+
+# Apply patchset composed by Stephan Hartmann.
+rm %{patchset_root}/chromium-84-compiler.patch
+for patch in %{patchset_root}/*.patch; do
+ echo "Applying ${patch}"
+ %{__patch} -p1 <"${patch}"
+done
+
+# Apply patches from this spec.
+%autopatch -p1
#Let's change the default shebang of python files.
find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' {} +
@@ -325,6 +334,8 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/dav1d \
third_party/devscripts \
third_party/devtools-frontend \
+ third_party/devtools-frontend/src/front_end/third_party/acorn \
+ 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/lighthouse \
third_party/devtools-frontend/src/front_end/third_party/wasmparser \
@@ -359,6 +370,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/libaom \
third_party/libaom/source/libaom/third_party/vector \
third_party/libaom/source/libaom/third_party/x86inc \
+ third_party/libavif \
third_party/libjingle \
third_party/libphonenumber \
third_party/libsecret \
@@ -377,6 +389,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
%endif
third_party/libXNVCtrl \
third_party/libyuv \
+ third_party/lottie \
third_party/lss \
third_party/lzma_sdk \
third_party/mako \
@@ -398,6 +411,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/one_euro_filter \
third_party/openh264 \
third_party/openscreen \
+ third_party/openscreen/src/third_party/mozilla \
third_party/openscreen/src/third_party/tinycbor/src/src \
third_party/ots \
third_party/pdfium \
@@ -455,7 +469,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/web-animations-js \
third_party/webdriver \
third_party/webrtc \
- third_party/webrtc/common_audio/third_party/fft4g \
+ third_party/webrtc/common_audio/third_party/ooura \
third_party/webrtc/common_audio/third_party/spl_sqrt_floor \
third_party/webrtc/modules/third_party/fft \
third_party/webrtc/modules/third_party/g711 \
@@ -465,7 +479,6 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/widevine \
third_party/woff2 \
third_party/xdg-utils \
- third_party/yasm/run_yasm.py \
third_party/zlib/google \
tools/grit/third_party/six \
%if !%{with system_minizip}
@@ -505,7 +518,6 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
re2 \
%endif
snappy \
- yasm \
%if %{with system_minizip}
zlib
%endif
@@ -593,7 +605,6 @@ gn_args=(
enable_hangout_services_extension=false
fatal_linker_warnings=false
treat_warnings_as_errors=false
- linux_use_bundled_binutils=false
fieldtrial_testing_like_official_build=true
'custom_toolchain="//build/toolchain/linux/unbundle:default"'
'host_toolchain="//build/toolchain/linux/unbundle:default"'
@@ -649,6 +660,13 @@ gn_args+=(
blink_symbol_level=0
%endif
)
+
+# Bundled xcb-proto.
+gn_args+=(
+ 'xcbproto_path="%{xcb_proto_root}/src"'
+)
+export PYTHONPATH="${PYTHONPATH}${PYTHONPATH+:}%{xcb_proto_root}"
+
tools/gn/bootstrap/bootstrap.py --gn-gen-args "${gn_args[*]}"
%{target}/gn --script-executable=%{__python2} gen --args="${gn_args[*]}" %{target}
%if %{debug_logs}
@@ -745,6 +763,11 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/swiftshader/libGLESv2.so
#########################################changelogs#################################################
%changelog
+* Sat Jul 18 2020 qvint <dotqvint(a)gmail.com> - 84.0.4147.89-1
+- Update to 84.0.4147.89
+- Use patchset composed by Stephan Hartmann <stha09(a)googlemail.com>
+- Bundle xcb-proto
+
* Thu Jun 25 2020 qvint <dotqvint(a)gmail.com> - 83.0.4103.116-1
- Update to 83.0.4103.116
diff --git a/chromium-71.0.3578.98-py2-bootstrap.patch b/chromium-py2-bootstrap.patch
similarity index 100%
rename from chromium-71.0.3578.98-py2-bootstrap.patch
rename to chromium-py2-bootstrap.patch
diff --git a/sources b/sources
index f3aa70a..f5f739a 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-SHA512 (chromium-83.0.4103.116.tar.xz) = dbd92fb04183ec1402401388f70b18b95040083c9ea8bf2ea6b1692fddc375b090968b13afb010ebf412b480b34747eb2c82709adbeb386cccf60b972f23254f
+SHA512 (chromium-84.0.4147.89.tar.xz) = cc207a5f09a89e42bc12fd491d5d0ef11c04daaa324aa696d2f8a37679b8f2171d3b265296968c3312e158b0fd2c059e12727a7463d3bd2f640d5bbd43c4f676
+SHA512 (chromium-patches-chromium-84-patchset-3.tar.gz) = ea7f5c9436bbbe3de2fa69f006e0e12be24e73a652d3ac780c30045dfd821b41d9b83779fd306eafc2455cbc8fced3477f5adff626318a4ab5e13b06d9a7234a
+SHA512 (xcb-proto-1.13.tar.bz2) = 002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7
3 years, 9 months
[vlc/f31: 14/14] Merge branch 'master' into f31
by Leigh Scott
commit a18d81a4be783f77fd3c5ef83fff2862a18a17cc
Merge: 60c88ba a3f7b2e
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jul 19 12:45:34 2020 +0100
Merge branch 'master' into f31
replace_deprecated_luaL_checkint.patch | 261 +++++++++++++++++++++++++++++++++
vlc.spec | 39 +++--
2 files changed, 291 insertions(+), 9 deletions(-)
---
3 years, 9 months
[vlc/f31] (14 commits) ...Merge branch 'master' into f31
by Leigh Scott
Summary of changes:
8137439... Clean-up old f30 patch (*)
9e8f30f... Clean-up srt (*)
7cb3507... Switch to devtoolset-8 (*)
4b8399b... Don't disable shortcommit0 (*)
ffe738c... Fix dts_ver occurence (*)
3e89a0d... Rebuilt (*)
6012dba... Add BuildRequires qt5-qtbase-private-devel for f33 (*)
fb55b06... Rebuilt (*)
8110bab... Add conditional (*)
50a2ce2... Rebuilt for new dav1d and libplacebo (*)
75ffdd7... Mass rebuild for x264 (*)
37ba87a... Rebuilt (*)
a3f7b2e... Rebuilt (*)
a18d81a... Merge branch 'master' into f31
(*) This commit already existed in another branch; no separate mail sent
3 years, 9 months
[vlc/f32] (3 commits) ...Rebuilt
by Leigh Scott
Summary of changes:
75ffdd7... Mass rebuild for x264 (*)
37ba87a... Rebuilt (*)
a3f7b2e... Rebuilt (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 9 months
[chromium-freeworld] Update to 84.0.4147.89
by qvint
commit c4c8cd7ec7085d88fc8789db67d0e709182ad050
Author: qvint <dotqvint(a)gmail.com>
Date: Sat Jul 18 15:19:46 2020 +0300
Update to 84.0.4147.89
- Use patchset composed by Stephan Hartmann
- Bundle xcb-proto
.gitignore | 2 +
...-b794998819088f76b4cf44c8db6940240c563cf4.patch | 18 ---
chromium-82-gcc-noexcept.patch | 31 -----
chromium-82-gcc-template.patch | 48 --------
chromium-83-gcc-10-r31184.patch | 35 ------
chromium-83-gcc-10-r766427.patch | 27 -----
chromium-83-gcc-10.patch | 20 ---
chromium-83-gcc-include.patch | 22 ----
chromium-83-gcc-iterator.patch | 36 ------
chromium-83-gcc-r756880.patch | 69 -----------
chromium-83-gcc-r760272.patch | 27 -----
chromium-83-gcc-r760588.patch | 58 ---------
chromium-83-gcc-r762806.patch | 43 -------
chromium-83-gcc-r766770.patch | 134 ---------------------
chromium-84-nss-r771840.patch | 38 ++++++
chromium-enable-vaapi.patch | 8 +-
chromium-fix-vaapi-on-intel.patch | 8 +-
chromium-freeworld.spec | 73 +++++++----
...bootstrap.patch => chromium-py2-bootstrap.patch | 0
sources | 4 +-
20 files changed, 99 insertions(+), 602 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e912076..9d45c0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
chromium-*.tar.xz
+chromium-patches-*.tar.gz
+xcb-proto-*.tar.bz2
diff --git a/chromium-84-nss-r771840.patch b/chromium-84-nss-r771840.patch
new file mode 100644
index 0000000..6d01c11
--- /dev/null
+++ b/chromium-84-nss-r771840.patch
@@ -0,0 +1,38 @@
+From 3a3effdd81e97bfc4f2698cd1f41b008355b0469 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.costa(a)intel.com>
+Date: Tue, 26 May 2020 16:34:45 +0000
+Subject: [PATCH] scoped_nss_types.h: Include <certt.h> instead of
+ <nss/certt.h>
+
+Follow-up to commit 701cae5de ("Introduce a function to format a DER-encoded
+SPKI for UI").
+
+That is the format used by other files that include <certt.h>, and the
+pkg-config configuration already passes -I/path/to/nss to the compiler.
+
+This can potentially fix the non-sysroot build, as the NSS headers might be
+installed in e.g. /usr/include/nss3 rather than /usr/include/nss.
+
+Change-Id: I0461a7a7f8c93459f2281ea71c96434a74687ee8
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2214390
+Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa(a)intel.com>
+Commit-Queue: David Benjamin <davidben(a)chromium.org>
+Reviewed-by: David Benjamin <davidben(a)chromium.org>
+Cr-Commit-Position: refs/heads/master@{#771840}
+---
+ crypto/scoped_nss_types.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/crypto/scoped_nss_types.h
++++ b/crypto/scoped_nss_types.h
+@@ -5,9 +5,9 @@
+ #ifndef CRYPTO_SCOPED_NSS_TYPES_H_
+ #define CRYPTO_SCOPED_NSS_TYPES_H_
+
++#include <certt.h>
+ #include <keyhi.h>
+ #include <nss.h>
+-#include <nss/certt.h>
+ #include <pk11pub.h>
+ #include <plarena.h>
+
diff --git a/chromium-enable-vaapi.patch b/chromium-enable-vaapi.patch
index ece03af..50bb0f0 100644
--- a/chromium-enable-vaapi.patch
+++ b/chromium-enable-vaapi.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Enable VAAPI on Linux
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
-@@ -2153,7 +2153,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2367,7 +2367,7 @@ const FeatureEntry kFeatureEntries[] = {
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
flag_descriptions::kAcceleratedVideoDecodeDescription,
@@ -14,7 +14,7 @@ Subject: [PATCH] Enable VAAPI on Linux
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
},
{
-@@ -2585,12 +2585,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2798,12 +2798,12 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop,
MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)},
#endif // ENABLE_VR
@@ -32,7 +32,7 @@ Subject: [PATCH] Enable VAAPI on Linux
FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)},
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
-@@ -2980,16 +2980,19 @@ const char kMetalDescription[] =
+@@ -3136,16 +3136,19 @@ const char kMetalDescription[] =
#endif
@@ -57,7 +57,7 @@ Subject: [PATCH] Enable VAAPI on Linux
"Use the aggregated ML model to rank the suggested apps.";
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
-@@ -1711,13 +1711,19 @@ extern const char kMetalDescription[];
+@@ -1820,13 +1820,19 @@ extern const char kMetalDescription[];
#endif // defined(OS_MACOSX)
diff --git a/chromium-fix-vaapi-on-intel.patch b/chromium-fix-vaapi-on-intel.patch
index 73281f4..f54cb69 100644
--- a/chromium-fix-vaapi-on-intel.patch
+++ b/chromium-fix-vaapi-on-intel.patch
@@ -21,7 +21,7 @@ Subject: [PATCH] Move offending function to chromeos only
} // namespace
-@@ -1155,6 +1157,8 @@ VaapiVideoDecodeAccelerator::DecideBuffe
+@@ -1169,6 +1171,8 @@ VaapiVideoDecodeAccelerator::DecideBuffe
if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
return BufferAllocationMode::kNormal;
@@ -30,11 +30,11 @@ Subject: [PATCH] Move offending function to chromeos only
// On Gemini Lake, Kaby Lake and later we can pass to libva the client's
// PictureBuffers to decode onto, which skips the use of the Vpp unit and its
// associated format reconciliation copy, avoiding all internal buffer
-@@ -1171,6 +1175,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe
+@@ -1184,6 +1188,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe
num_extra_pics_ = 3;
return BufferAllocationMode::kNone;
}
+#endif
- // If we're here, we have to use the Vpp unit and allocate buffers for
- // |decoder_|; usually we'd have to allocate the |decoder_|s
+ // For H.264 on older devices, another +1 is experimentally needed for
+ // high-to-high resolution changes.
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 10146e7..b730fe8 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -66,11 +66,12 @@
%global ozone 0
##############################Package Definitions######################################
Name: chromium-freeworld
-Version: 83.0.4103.116
+Version: 84.0.4147.89
Release: 1%{?dist}
Summary: Chromium web browser 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)
URL: https://www.chromium.org/Home
+
%if %{freeworld}
Source0: https://commondatastorage.googleapis.com/chromium-browser-official/chromi...
%else
@@ -88,6 +89,15 @@ Source0: https://commondatastorage.googleapis.com/chromium-browser-offici
# ./chromium-latest.py --stable --ffmpegclean --ffmpegarm --deleteunrar
Source0: chromium-%{version}-clean.tar.xz
%endif
+
+# Patchset composed by Stephan Hartmann.
+%global patchset_revision chromium-84-patchset-3
+Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c...
+
+# Bundled xcb-proto. Chromium needs python2 version of this package.
+%global xcb_proto_version 1.13
+Source2: https://xcb.freedesktop.org/dist/xcb-proto-%{xcb_proto_version}.tar.bz2
+
# The following two source files are copied and modified from the chromium source
Source10: %{name}.sh
#Add our own appdata file.
@@ -181,7 +191,6 @@ BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(libxslt)
BuildRequires: opus-devel
BuildRequires: snappy-devel
-BuildRequires: yasm
BuildRequires: expat-devel
BuildRequires: pciutils-devel
BuildRequires: speech-dispatcher-devel
@@ -208,28 +217,12 @@ Recommends: libva-utils
ExclusiveArch: x86_64
# Google patches (short-term fixes and backports):
-Patch150: chromium-83-gcc-r756880.patch
-Patch151: chromium-83-gcc-r760272.patch
-Patch152: chromium-83-gcc-r760588.patch
-Patch153: chromium-83-gcc-r762806.patch
-%if 0%{?fedora} >= 32
-Patch154: chromium-83-gcc-10-r31184.patch
-Patch155: chromium-83-gcc-10-r766427.patch
-%endif
-Patch156: chromium-83-gcc-r766770.patch
+Patch150: chromium-84-nss-r771840.patch
# Gentoo patches (short-term fixes):
-Patch250: chromium-83-gcc-include.patch
-Patch251: chromium-83-gcc-iterator.patch
-Patch252: chromium-82-gcc-template.patch
-Patch253: chromium-82-gcc-noexcept.patch
-%if 0%{?fedora} >= 32
-Patch254: chromium-83-gcc-10.patch
-%endif
# Fedora patches:
-Patch300: chromium-71.0.3578.98-py2-bootstrap.patch
-Patch301: chromium-58.0.3029.96-revert-b794998819088f76b4cf44c8db6940240c563cf4.patch
+Patch300: chromium-py2-bootstrap.patch
# RPM Fusion patches [free/chromium-freeworld]:
Patch400: chromium-enable-vaapi.patch
@@ -243,7 +236,23 @@ Patch403: chromium-rpm-fusion-brand.patch
%{name} is an open-source web browser, powered by WebKit (Blink)
############################################PREP###########################################################
%prep
-%autosetup -n chromium-%{version} -p1
+%setup -q -T -n chromium-patches-%{patchset_revision} -b 1
+%setup -q -T -n xcb-proto-%{xcb_proto_version} -b 2
+
+%global patchset_root %{_builddir}/chromium-patches-%{patchset_revision}
+%global xcb_proto_root %{_builddir}/xcb-proto-%{xcb_proto_version}
+
+%setup -q -n chromium-%{version}
+
+# Apply patchset composed by Stephan Hartmann.
+rm %{patchset_root}/chromium-84-compiler.patch
+for patch in %{patchset_root}/*.patch; do
+ echo "Applying ${patch}"
+ %{__patch} -p1 <"${patch}"
+done
+
+# Apply patches from this spec.
+%autopatch -p1
#Let's change the default shebang of python files.
find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' {} +
@@ -325,6 +334,8 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/dav1d \
third_party/devscripts \
third_party/devtools-frontend \
+ third_party/devtools-frontend/src/front_end/third_party/acorn \
+ 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/lighthouse \
third_party/devtools-frontend/src/front_end/third_party/wasmparser \
@@ -359,6 +370,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/libaom \
third_party/libaom/source/libaom/third_party/vector \
third_party/libaom/source/libaom/third_party/x86inc \
+ third_party/libavif \
third_party/libjingle \
third_party/libphonenumber \
third_party/libsecret \
@@ -377,6 +389,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
%endif
third_party/libXNVCtrl \
third_party/libyuv \
+ third_party/lottie \
third_party/lss \
third_party/lzma_sdk \
third_party/mako \
@@ -398,6 +411,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/one_euro_filter \
third_party/openh264 \
third_party/openscreen \
+ third_party/openscreen/src/third_party/mozilla \
third_party/openscreen/src/third_party/tinycbor/src/src \
third_party/ots \
third_party/pdfium \
@@ -455,7 +469,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/web-animations-js \
third_party/webdriver \
third_party/webrtc \
- third_party/webrtc/common_audio/third_party/fft4g \
+ third_party/webrtc/common_audio/third_party/ooura \
third_party/webrtc/common_audio/third_party/spl_sqrt_floor \
third_party/webrtc/modules/third_party/fft \
third_party/webrtc/modules/third_party/g711 \
@@ -465,7 +479,6 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/widevine \
third_party/woff2 \
third_party/xdg-utils \
- third_party/yasm/run_yasm.py \
third_party/zlib/google \
tools/grit/third_party/six \
%if !%{with system_minizip}
@@ -505,7 +518,6 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
re2 \
%endif
snappy \
- yasm \
%if %{with system_minizip}
zlib
%endif
@@ -593,7 +605,6 @@ gn_args=(
enable_hangout_services_extension=false
fatal_linker_warnings=false
treat_warnings_as_errors=false
- linux_use_bundled_binutils=false
fieldtrial_testing_like_official_build=true
'custom_toolchain="//build/toolchain/linux/unbundle:default"'
'host_toolchain="//build/toolchain/linux/unbundle:default"'
@@ -649,6 +660,13 @@ gn_args+=(
blink_symbol_level=0
%endif
)
+
+# Bundled xcb-proto.
+gn_args+=(
+ 'xcbproto_path="%{xcb_proto_root}/src"'
+)
+export PYTHONPATH="${PYTHONPATH}${PYTHONPATH+:}%{xcb_proto_root}"
+
tools/gn/bootstrap/bootstrap.py --gn-gen-args "${gn_args[*]}"
%{target}/gn --script-executable=%{__python2} gen --args="${gn_args[*]}" %{target}
%if %{debug_logs}
@@ -745,6 +763,11 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/swiftshader/libGLESv2.so
#########################################changelogs#################################################
%changelog
+* Sat Jul 18 2020 qvint <dotqvint(a)gmail.com> - 84.0.4147.89-1
+- Update to 84.0.4147.89
+- Use patchset composed by Stephan Hartmann <stha09(a)googlemail.com>
+- Bundle xcb-proto
+
* Thu Jun 25 2020 qvint <dotqvint(a)gmail.com> - 83.0.4103.116-1
- Update to 83.0.4103.116
diff --git a/chromium-71.0.3578.98-py2-bootstrap.patch b/chromium-py2-bootstrap.patch
similarity index 100%
rename from chromium-71.0.3578.98-py2-bootstrap.patch
rename to chromium-py2-bootstrap.patch
diff --git a/sources b/sources
index f3aa70a..f5f739a 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-SHA512 (chromium-83.0.4103.116.tar.xz) = dbd92fb04183ec1402401388f70b18b95040083c9ea8bf2ea6b1692fddc375b090968b13afb010ebf412b480b34747eb2c82709adbeb386cccf60b972f23254f
+SHA512 (chromium-84.0.4147.89.tar.xz) = cc207a5f09a89e42bc12fd491d5d0ef11c04daaa324aa696d2f8a37679b8f2171d3b265296968c3312e158b0fd2c059e12727a7463d3bd2f640d5bbd43c4f676
+SHA512 (chromium-patches-chromium-84-patchset-3.tar.gz) = ea7f5c9436bbbe3de2fa69f006e0e12be24e73a652d3ac780c30045dfd821b41d9b83779fd306eafc2455cbc8fced3477f5adff626318a4ab5e13b06d9a7234a
+SHA512 (xcb-proto-1.13.tar.bz2) = 002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7
3 years, 9 months
