6:09 p.m.
commit c3148ec8ce31539ac3aae1d5bc30cbde275d5394
Merge: 9977861 dbd5ceb
Author: qvint <dotqvint(a)gmail.com>
Date: Fri Jan 22 23:10:27 2021 +0300
Sync spec and sources with free/chromium-freeworld
chromium-87-includes.patch | 10 -----
chromium-browser-privacy.sh | 16 +++----
chromium-browser-privacy.spec | 34 +++++++++------
chromium-enable-widevine.patch | 2 +-
chromium-fix-vaapi-on-intel.patch | 4 +-
chromium-hw-accel-mjpeg.patch | 34 ++++++++-------
chromium-md5-based-build-id.patch | 2 +-
chromium-names.patch | 91 +++++++++++++++++++++++++++++++++++++++
sources | 4 +-
9 files changed, 143 insertions(+), 54 deletions(-)
---
diff --cc chromium-browser-privacy.sh
index 20c04f6,fbba10d..e29e60d
--- a/chromium-browser-privacy.sh
+++ b/chromium-browser-privacy.sh
@@@ -52,15 -49,11 +49,14 @@@ exec < /dev/nul
exec > >(exec cat)
exec 2> >(exec cat >&2)
-
- CHROMIUM_DISTRO_FLAGS+=" --enable-plugins \
+ CHROMIUM_DISTRO_FLAGS=" --enable-plugins \
--enable-extensions \
--enable-user-scripts \
- --enable-features=WebRTCPipeWireCapturer \
--enable-printing \
+ --enable-gpu-rasterization \
- --enable-sync"
+ --disable-sync \
+ --disable-background-networking \
+ --force-local-ntp \
+ --disallow-signin"
exec -a "$0" "@@CHROMIUMDIR@@/$(basename "$0" | sed
's/\.sh$//')" $CHROMIUM_DISTRO_FLAGS "$@"
diff --cc chromium-browser-privacy.spec
index cff56a5,030f2ea..e9f59bb
--- a/chromium-browser-privacy.spec
+++ b/chromium-browser-privacy.spec
@@@ -11,9 -9,7 +11,7 @@@
### Note: These are for Fedora use ONLY.
### For your own distribution, please get your own set of keys.
### http://lists.debian.org/debian-legal/2013/11/msg00006.html
-%global api_key AIzaSyDUIXvzVrt5OkVsgXhQ6NFfvWlA44by-aw
+%global api_key %{nil}
- %global default_client_id %{nil}
- %global default_client_secret %{nil}
###############################Exclude Private chromium libs###########################
%global __requires_exclude %{chromiumdir}/.*\\.so
%global __provides_exclude_from %{chromiumdir}/.*\\.so
@@@ -27,12 -23,12 +25,12 @@@
%global system_minizip 1
%global system_re2 1
##############################Package Definitions######################################
-Name: chromium-freeworld
+Name: chromium-browser-privacy
- Version: 87.0.4280.88
+ Version: 88.0.4324.96
Release: 1%{?dist}
-Summary: Chromium 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...
@@@ -53,13 -49,9 +51,13 @@@ Source0: chromium-%{version}-cle
%endif
# Patchset composed by Stephan Hartmann.
- %global patchset_revision chromium-87-patchset-9
+ %global patchset_revision chromium-88-patchset-3
Source1:
https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c...
+# ungoogled-chromium.
+%global ungoogled_chromium_revision 87.0.4280.88-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.
@@@ -163,22 -157,8 +162,19 @@@ Patch405: chromium-names.patc
Patch420: chromium-rpm-fusion-brand.patch
%endif
- # RPM Fusion patches [free/chromium-freeworld] -- short-term:
- Patch450: chromium-87-includes.patch
-
+# RPM Fusion patches [free/chromium-browser-privacy]:
+Patch500: chromium-default-user-data-dir.patch
+
%description
-%{name} is an open-source web browser, powered by WebKit (Blink)
+%{name} is a distribution of ungoogled-chromium.
+
+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
@@@ -552,22 -525,6 +561,20 @@@ gn_args=
'custom_toolchain="//build/toolchain/linux/unbundle:default"'
'host_toolchain="//build/toolchain/linux/unbundle:default"'
'google_api_key="%{api_key}"'
- 'google_default_client_id="%{default_client_id}"'
- 'google_default_client_secret="%{default_client_secret}"'
+
+ enable_js_type_check=false
+ enable_mdns=false
+ enable_mse_mpeg2ts_stream_parser=true
+ enable_nacl_nonsfi=false
+ enable_one_click_signin=false
+ enable_reading_list=false
+ enable_remoting=false
+ enable_reporting=false
+ enable_service_discovery=false
+ exclude_unwind_tables=true
+ safe_browsing_mode=0
+ use_official_google_api_keys=false
+ use_unofficial_version_number=false
)
# Optimizations
@@@ -700,45 -662,105 +707,48 @@@ appstream-util validate-relax --nonet "
%{chromiumdir}/swiftshader/libGLESv2.so
#########################################changelogs#################################################
%changelog
-* Wed Jan 20 2021 qvint <dotqvint(a)gmail.com> - 88.0.4324.96-1
-- Update to 88.0.4324.96
-- Comply with new Google API key rules for derivatives
-- Fix Icon key in chrome-apps.directory (rfbz#5895)
-- Fix PulseAudio application name and icon
-- Don't depend on CHROME_DESKTOP env var
-- Sync shell wrapper with Fedora Chromium (rfbz#5859, rhbz#1902983)
-
-* Tue Dec 08 2020 qvint <dotqvint(a)gmail.com> - 87.0.4280.88-1
-- Update to 87.0.4280.88
-
-* Fri Nov 27 2020 qvint <dotqvint(a)gmail.com> - 87.0.4280.66-1
-- Update to 87.0.4280.66
-
-* Tue Oct 27 2020 qvint <dotqvint(a)gmail.com> - 86.0.4240.111-2
-- Fix invalid "end" iterator usage in CookieMonster
-- Only fall back to the i965 driver if we're on iHD
-- Check for enable-accelerated-video-decode
-- Fix mouse movements near window edges
-- Fix crash in UserInputMonitorLinuxCore (rfbz#5807)
-
-* Wed Oct 21 2020 qvint <dotqvint(a)gmail.com> - 86.0.4240.111-1
-- Update to 86.0.4240.111
-
-* Wed Sep 23 2020 qvint <dotqvint(a)gmail.com> - 85.0.4183.121-1
-- Update to 85.0.4183.121
-- Enable Hangout services extension (rfbz#5758)
-- Use MD5-based BuildID (rfbz#5743)
-- Use %%ninja_build macro
-- Remove debug_pkg toggle
-- Replace bconds with ordinary macros
-- Use system re2
-- Use system libicu (f33+)
-
-* Thu Sep 10 2020 qvint <dotqvint(a)gmail.com> - 85.0.4183.102-1
-- Update to 85.0.4183.102
-- Remove bundlepylibs and clang toggles
-
-* Mon Aug 31 2020 qvint <dotqvint(a)gmail.com> - 85.0.4183.83-2
-- Ship ANGLE libEGL.so and libGLESv2.so (rfbz#5738)
-
-* Wed Aug 26 2020 qvint <dotqvint(a)gmail.com> - 85.0.4183.83-1
-- Update to 85.0.4183.83
-- Use xcb-proto bundled in Chromium tarball
-- Drop Fedora 30 support
-- Fix XDG paths in manpage
++* Fri Jan 22 2021 qvint <dotqvint(a)gmail.com> - 88.0.4324.96-1
++- Update Chromium to 88.0.4324.96
++
+* Thu Dec 10 2020 qvint <dotqvint(a)gmail.com> - 87.0.4280.88-1
+- Update Chromium to 87.0.4280.88
+- Update ungoogled-chromium to 87.0.4280.88-1
+
+* Mon Sep 14 2020 qvint <dotqvint(a)gmail.com> - 85.0.4183.102-1
+- Update Chromium to 85.0.4183.102
+- Update ungoogled-chromium to 85.0.4183.102-1
+- Add domain_substitution switch
+- Fix manpage and desktop metadata files
- Update AppStream metadata
-- Fix name in .desktop file (rfbz#5717)
-- Fix name in GNOME default-apps XML
-- Add symbolic app icon
-* 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
+- Update ungoogled-chromium to 84.0.4147.125-1
* 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
+- Update Chromium to 84.0.4147.89
+- Update ungoogled-chromium to 84.0.4147.89-1
-* 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
-
-* 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 9474a3f,f66572c..05351e3
--- a/sources
+++ b/sources
@@@ -1,3 -1,2 +1,3 @@@
- SHA512 (chromium-87.0.4280.88.tar.xz) =
ac3903b598bd69f4ee3065845eac3c85cb5524715b9ce629c9c2bd017f2ebd168b7ee8111bccc2e6b6cfd12ad07add834cb2cd3bf0e27a8a5076bb7842fca897
- SHA512 (chromium-patches-chromium-87-patchset-9.tar.gz) =
7612d02b1e078bfd2bfefdd773b5931eff72e661111170d3c5497e5bef73aedd6e037cfadbb4ce62d7d68c5f7de0c2b560ffb7cbe90c73e88eb9c2b98298c691
+ SHA512 (chromium-88.0.4324.96.tar.xz) =
f51e6dbbd4ea2b6528a601c1bd7e76820a4b614f05366d2999b4a30d8e13581279f69a1a76d3f417ae1cea38f9f834d011f754d078784a70388e2cde0ccba6b6
+ SHA512 (chromium-patches-chromium-88-patchset-3.tar.gz) =
ba3965e8b3c611490d47d909dd0478b381bec6ce1defe3dce9b09b33856afe321e951df42ab42533a3d6bf11c2213b4741834d617fe3c4827315859c25c0fad3
+SHA512 (ungoogled-chromium-87.0.4280.88-1.tar.gz) =
84478f743ebc98d581401245da5f764cd3d3ac67ef2fdeb8659077b10c6d09a909f8f6f4a0897ea0d72f33a7faaaea551481d67ddd64ea9d9ca63666e1420c27