commit df914c25b9ef240e55dd990f97f5b58fcd99e038
Merge: bbcfc64 fe78c2d
Author: qvint <dotqvint(a)gmail.com>
Date: Thu Aug 13 11:39:59 2020 +0300
Sync spec and sources with free/chromium-freeworld
chromium-browser-privacy.spec | 14 ++++++++------
chromium-enable-vaapi.patch | 4 ++--
sources | 2 +-
3 files changed, 11 insertions(+), 9 deletions(-)
---
diff --cc chromium-browser-privacy.spec
index 7951f9d,dc129ad..638794a
--- a/chromium-browser-privacy.spec
+++ b/chromium-browser-privacy.spec
@@@ -65,12 -65,12 +65,12 @@@
# Enable building with ozone support
%global ozone 0
##############################Package Definitions######################################
-Name: chromium-freeworld
+Name: chromium-browser-privacy
- Version: 84.0.4147.89
+ Version: 84.0.4147.125
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...
@@@ -560,20 -537,11 +560,23 @@@ 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
+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
+ # Final link uses lots of file descriptors.
+ ulimit -n 2048
+
#export compilar variables
%if %{clang}
@@@ -807,30 -762,54 +806,33 @@@ appstream-util validate-relax --nonet "
%{chromiumdir}/swiftshader/libGLESv2.so
#########################################changelogs#################################################
%changelog
-* Tue Aug 11 2020 qvint <dotqvint(a)gmail.com> - 84.0.4147.125-1
-- Update to 84.0.4147.125
-- Stop using gold
-- Add 'ulimit -n 2048'
++* Thu Aug 13 2020 qvint <dotqvint(a)gmail.com> - 84.0.4147.125-1
++- Update Chromium to 84.0.4147.125
+
* 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
+- Update ungoogled-chromium to 84.0.4147.89-1
-* 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 afaf08c,5a53a32..81e4a06
--- a/sources
+++ b/sources
@@@ -1,4 -1,3 +1,4 @@@
- SHA512 (chromium-84.0.4147.89.tar.xz) =
cc207a5f09a89e42bc12fd491d5d0ef11c04daaa324aa696d2f8a37679b8f2171d3b265296968c3312e158b0fd2c059e12727a7463d3bd2f640d5bbd43c4f676
+ SHA512 (chromium-84.0.4147.125.tar.xz) =
a86439efbadce4cc157fe16e0e16732feda2025e14179a54df6a33446f744dc1db59f1ebcf7d5d29d7bfc42102af1283ddf108982152ec1f869d7623af7bed26
SHA512 (chromium-patches-chromium-84-patchset-3.tar.gz) =
ea7f5c9436bbbe3de2fa69f006e0e12be24e73a652d3ac780c30045dfd821b41d9b83779fd306eafc2455cbc8fced3477f5adff626318a4ab5e13b06d9a7234a
SHA512 (xcb-proto-1.13.tar.bz2) =
002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7
+SHA512 (ungoogled-chromium-84.0.4147.89-1.tar.gz) =
4b6de31a2eeb705ce1426bec8260b99bd332eff25359119d0f1af2d4ecaed3a9d94a8654b5f16815a03749a6e45d564c70ed141fa9b928d51a18cfdb8f1cda02