6:38 a.m.
commit 7e521a80eecec9e743248a9bf42426fd7fd82696
Merge: ec6df29 10a2944
Author: qvint <dotqvint(a)gmail.com>
Date: Fri Dec 11 01:02:58 2020 +0300
Sync spec and sources with free/chromium-freeworld
chromium-85-ffmpeg-4.3-r796966.patch | 41 -----
chromium-87-includes.patch | 10 ++
chromium-browser-privacy.spec | 172 ++++++++-------------
chromium-fix-vaapi-on-intel.patch | 10 +-
...le-vaapi.patch => chromium-hw-accel-mjpeg.patch | 42 +----
chromium-md5-based-build-id.patch | 14 ++
sources | 4 +-
7 files changed, 103 insertions(+), 190 deletions(-)
---
diff --cc chromium-browser-privacy.spec
index 235e2db,76c42b3..66ff834
--- a/chromium-browser-privacy.spec
+++ b/chromium-browser-privacy.spec
@@@ -18,39 -16,21 +18,21 @@@
%global __requires_exclude %{chromiumdir}/.*\\.so
%global __provides_exclude_from %{chromiumdir}/.*\\.so
#######################################CONFIGS###########################################
- #Require harfbuzz >= 2.4.0 for hb_subset_input_set_retain_gids
- %bcond_without system_harfbuzz
- # Require libxml2 > 2.9.4 for XML_PARSE_NOXXE
- %bcond_without system_libxml2
- # Allow testing whether icu can be unbundled
- # A patch fix building so enabled by default for Fedora 30
- # Need icu version >= 64
- %bcond_with system_libicu
- # Allow testing whether libvpx can be unbundled
- %bcond_with system_libvpx
- # Allow testing whether ffmpeg can be unbundled
- %bcond_without system_ffmpeg
- #Allow minizip to be unbundled
- #mini-compat is going to be removed from fedora 30!
- %bcond_without system_minizip
-
- # Need re2 ver. 2016.07.21 for re2::LazyRE2
- %bcond_with system_re2
-
- #Turn on verbose mode
- %global debug_logs 0
- #------------------------------------------------------
- #Build debug packages for debugging
- %global debug_pkg 0
- # Enable building with ozone support
- %global ozone 0
+ # System libraries to use.
+ %global system_ffmpeg 1
+ %global system_harfbuzz 1
+ %global system_libicu 0
+ %global system_libvpx 0
+ %global system_libxml2 1
+ %global system_minizip 1
+ %global system_re2 1
##############################Package Definitions######################################
-Name: chromium-freeworld
+Name: chromium-browser-privacy
- Version: 85.0.4183.102
+ Version: 87.0.4280.88
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...
@@@ -71,13 -51,9 +53,13 @@@ Source0: chromium-%{version}-cle
%endif
# Patchset composed by Stephan Hartmann.
- %global patchset_revision chromium-85-patchset-2
+ %global patchset_revision chromium-87-patchset-9
Source1:
https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c...
+# ungoogled-chromium.
+%global ungoogled_chromium_revision 85.0.4183.102-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.
@@@ -116,11 -91,9 +97,10 @@@ BuildRequires: pkgconfig(wayland-clien
BuildRequires: pkgconfig(wayland-cursor)
BuildRequires: pkgconfig(wayland-scanner)
BuildRequires: pkgconfig(wayland-server)
- %endif
+BuildRequires: python3
BuildRequires: /usr/bin/python2
BuildRequires: python2-setuptools
- %if %{with system_re2}
+ %if %{system_re2}
BuildRequires: re2-devel
%endif
# replace_gn_files.py --system-libraries
@@@ -163,11 -136,12 +143,9 @@@ BuildRequires: java-1.8.0-openjd
BuildRequires: libstdc++-static
#Runtime Requirements
Requires: hicolor-icon-theme
-# Make sure chromium-freeworld replaces chromium-vaapi
-Provides: chromium-vaapi = %{version}-%{release}
-Obsoletes: chromium-vaapi < %{version}-%{release}
#Some recommendations
Recommends: libva-utils
- %if !%{debug_pkg}
%global debug_package %{nil}
- %endif
# This build should be only available to amd64
ExclusiveArch: x86_64
@@@ -190,22 -158,11 +162,25 @@@ Patch404: chromium-md5-based-buil
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
+
+# Additional patches:
+Patch600: chromium-widevine-locations.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
@@@ -217,26 -172,17 +192,21 @@@
# Apply patchset composed by Stephan Hartmann.
%global patchset_apply() %{__scm_apply_patch -p1} <%{patchset_root}/%{1}
- %patchset_apply chromium-blink-gcc-diagnostic-pragma.patch
%patchset_apply chromium-fix-char_traits.patch
- %patchset_apply chromium-quiche-invalid-offsetof.patch
%patchset_apply chromium-78-protobuf-RepeatedPtrField-export.patch
%patchset_apply chromium-79-gcc-protobuf-alignas.patch
- %patchset_apply chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch
%patchset_apply chromium-84-blink-disable-clang-format.patch
- %patchset_apply chromium-85-DelayNode-cast.patch
- %patchset_apply chromium-85-FrameWidget-namespace.patch
- %patchset_apply chromium-85-NearbyConnection-abstract.patch
- %patchset_apply chromium-85-NearbyShareEncryptedMetadataKey-include.patch
- %patchset_apply chromium-85-oscillator_node-cast.patch
- %patchset_apply chromium-85-ostream-operator.patch
- %patchset_apply chromium-85-ozone-include.patch
- %patchset_apply chromium-85-sim_hash-include.patch
+ %patchset_apply chromium-86-nearby-explicit.patch
+ %patchset_apply chromium-86-nearby-include.patch
+ %patchset_apply chromium-87-ServiceWorkerContainerHost-crash.patch
+ %patchset_apply chromium-87-openscreen-include.patch
+ %patchset_apply chromium-88-ityp-include.patch
+ %patchset_apply chromium-88-vaapi-attribute.patch
+# 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
@@@ -745,41 -655,97 +702,44 @@@ appstream-util validate-relax --nonet "
%{chromiumdir}/swiftshader/libGLESv2.so
#########################################changelogs#################################################
%changelog
-* 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
++* Thu Dec 10 2020 qvint <dotqvint(a)gmail.com> - 87.0.4280.88-1
++- Update Chromium to 87.0.4280.88
++
+* 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
-
-* 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 9a1543b,40f2301..e789162
--- a/sources
+++ b/sources
@@@ -1,3 -1,2 +1,3 @@@
- SHA512 (chromium-85.0.4183.102.tar.xz) =
acd6f0a7b74018098752b6598e09a2bd6d1c9f1120c39a5c6cd3d924c466be92b854f3c7f91693ba9506e47b173ef12c14427f998362524b2497fbe5587a6b6c
- SHA512 (chromium-patches-chromium-85-patchset-2.tar.gz) =
b8252b778ff16f1fbb0be22ebd1b9f711fafe6d6837e0806e4281aa659756a091c79609e2e4dd865b5f2d377f159c12d47feab201d4d72a93de5fc5ff596ff2e
+ SHA512 (chromium-87.0.4280.88.tar.xz) =
ac3903b598bd69f4ee3065845eac3c85cb5524715b9ce629c9c2bd017f2ebd168b7ee8111bccc2e6b6cfd12ad07add834cb2cd3bf0e27a8a5076bb7842fca897
+ SHA512 (chromium-patches-chromium-87-patchset-9.tar.gz) =
7612d02b1e078bfd2bfefdd773b5931eff72e661111170d3c5497e5bef73aedd6e037cfadbb4ce62d7d68c5f7de0c2b560ffb7cbe90c73e88eb9c2b98298c691
+SHA512 (ungoogled-chromium-85.0.4183.102-1.tar.gz) =
b4ce88df6faece921d258aeb1554fbda00e25d1577d71967943abc475905ffb8e427a00aad893d3f1cc4cc2fad3ad0015154f12b59ee5ef041a3d7903774b935