2:44 p.m.
commit 532a378411537e112ecf670004a91a37113b1940
Merge: 88571ef 578480c
Author: qvint <dotqvint(a)gmail.com>
Date: Wed Sep 25 08:30:52 2019 +0300
Merge branch 'chromium-vaapi-f30' into chromium-browser-privacy-f30
...VPP-on-Linux-Add-some-info-logs-and-fix-v.patch | 154 -------------
UseNormalBAM.patch | 82 +++++++
brand.patch | 2 +-
chromium-base-location.patch | 13 ++
chromium-browser-privacy.spec | 146 ++++++------
chromium-gcc9-r666279.patch | 59 -----
chromium-gcc9-r666336.patch | 40 ----
chromium-gcc9-r666401.patch | 48 ----
chromium-gcc9-r666436.patch | 42 ----
chromium-gcc9-r666619.patch | 38 ----
chromium-gcc9-r666714.patch | 111 ----------
chromium-gcc9-r667064.patch | 114 ----------
chromium-gcc9-r667228.patch | 102 ---------
chromium-gcc9-r667260.patch | 46 ----
chromium-gcc9-r667484.patch | 68 ------
chromium-gcc9-r667901.patch | 105 ---------
chromium-gcc9-r668015.patch | 72 ------
chromium-gcc9-r668033.patch | 124 -----------
chromium-gcc9-r670973.patch | 55 -----
chromium-gcc9-r670980.patch | 61 -----
chromium-gcc9-r681321.patch | 35 +++
chromium-gcc9-r681333.patch | 71 ++++++
chromium-gcc9-r684731.patch | 138 ++++++++++++
chromium-quiche-gcc9.patch | 245 ---------------------
chromium-skia-harmony.patch | 14 --
chromium-unbundle-zlib.patch | 25 +++
enable-vaapi.patch | 62 +++---
link-against-harfbuzz-subset.patch | 55 +++++
sources | 4 +-
29 files changed, 529 insertions(+), 1602 deletions(-)
---
diff --cc chromium-browser-privacy.spec
index 43cb0a9,2e7183a..bb7145d
--- a/chromium-browser-privacy.spec
+++ b/chromium-browser-privacy.spec
@@@ -54,12 -60,12 +60,12 @@@
# Enable building with ozone support
%global ozone 0
##############################Package Definitions######################################
-Name: chromium-vaapi
+Name: chromium-browser-privacy
- Version: 76.0.3809.132
+ Version: 77.0.3865.90
Release: 1%{?dist}
-Summary: A Chromium web browser with video decoding acceleration
+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
@@@ -77,8 -83,6 +83,8 @@@
# ./chromium-latest.py --stable --ffmpegclean --ffmpegarm --deleteunrar
Source0: chromium-%{version}-clean.tar.xz
%endif
- %global ungoogled_chromium_revision 76.0.3809.132-1
++%global ungoogled_chromium_revision 77.0.3865.90-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.
@@@ -119,9 -123,15 +125,17 @@@ BuildRequires: pkgconfig(wayland-curso
BuildRequires: pkgconfig(wayland-scanner)
BuildRequires: pkgconfig(wayland-server)
%endif
+# ungoogled-chromium dependencies
+BuildRequires: python3
- # remove_bundled_libraries.py --do-remove
+
+ #Python stuffs
+ %if 0%{?bundlepylibs}
+
+ # Using bundled bits, do nothing.
+ #This is needed for remove_bundled_libraries.py
+ BuildRequires: /usr/bin/python2
+
+ %else
BuildRequires: python2-rpm-macros
BuildRequires: python2-beautifulsoup4
BuildRequires: python2-lxml
@@@ -223,60 -224,20 +230,36 @@@ Patch74: link-against-harfbuzz-subset.p
%description
- chromium-browser-privacy is an ungoogled-chromium distribution.
-%{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
-%autosetup -n chromium-%{version} -p1
+%setup -q -T -n ungoogled-chromium-%{ungoogled_chromium_revision} -b 300
+%setup -q -n chromium-%{version}
+
+# ungoogled-chromium: binary pruning
+%global ungoogled_chromium_root
%{_builddir}/ungoogled-chromium-%{ungoogled_chromium_revision}
+python3 -B %{ungoogled_chromium_root}/utils/prune_binaries.py . \
+ %{ungoogled_chromium_root}/pruning.list
+
- ## Apply patches here ##
- %patch300 -p1 -b .udd
- %patch1 -p1 -b .vaapi
- %patch2 -p1 -b .widevine
- %patch3 -p1 -b .fixvaapi
- %patch4 -p0 -b .skia
- %patch5 -p1 -b .cert
- %patch51 -p1 -b .py2boot
- %if %{with system_libicu}
- %patch52 -p1 -b .icu
++%autopatch -p1
+ %if !%{with system_libicu}
+ %patch52 -p1 -R
%endif
- %if %{freeworld}
- %patch54 -p1 -b .brand
+ %if !%{freeworld}
+ %patch54 -p1 -R
%endif
- %if 0%{?fedora} >= 29
- %patch65 -p1 -b .pipewire
- %endif
- %patch68 -p1 -b .socket
- # GCC patches area
- %patch70 -p1 -b .gcc1
- %patch71 -p1 -b .gcc2
- %patch72 -p1 -b .gcc2
- %patch73 -p1 -b .gcc3
- %patch74 -p1 -b .gcc4
- %patch75 -p1 -b .gcc5
- %patch76 -p1 -b .gcc6
- %patch77 -p1 -b .gcc7
- %patch78 -p1 -b .gcc8
- %patch79 -p1 -b .gcc9
- %patch80 -p1 -b .gcc10
- %patch81 -p1 -b .gcc11
- %patch82 -p1 -b .gcc12
- %patch83 -p1 -b .gcc13
- %patch84 -p1 -b .gcc14
- %patch85 -p1 -b .gcc15
+ %if !%{with system_harfbuzz}
+ %patch74 -p1 -R
+ %endif
+
#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}=' {} +
@@@ -667,6 -613,8 +664,7 @@@ ninja %{_smp_mflags} -C %{target} ch
%install
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{chromiumdir}/locales
-mkdir -p %{buildroot}%{chromiumdir}/MEIPreload
+ mkdir -p %{buildroot}%{chromiumdir}/swiftshader
mkdir -p %{buildroot}%{_mandir}/man1
mkdir -p %{buildroot}%{_metainfodir}
mkdir -p %{buildroot}%{_datadir}/applications
@@@ -694,6 -642,10 +692,9 @@@ install -m 644 %{target}/v8_context_sna
install -m 644 %{target}/*.pak %{buildroot}%{chromiumdir}/
install -m 644 %{target}/locales/*.pak %{buildroot}%{chromiumdir}/locales/
install -m 644 %{target}/xdg* %{buildroot}%{chromiumdir}/
-install -m 644 %{target}/MEIPreload/* %{buildroot}%{chromiumdir}/MEIPreload/
+ install -m 755 %{target}/swiftshader/*.so %{buildroot}%{chromiumdir}/swiftshader/
+
+ # Icons
for i in 16 32; do
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
install -m 644 chrome/app/theme/default_100_percent/chromium/product_logo_$i.png \
@@@ -739,9 -690,201 +739,19 @@@ appstream-util validate-relax --nonet "
%{chromiumdir}/*.pak
%{chromiumdir}/xdg-mime
%{chromiumdir}/xdg-settings
-%dir %{chromiumdir}/MEIPreload
-%{chromiumdir}/MEIPreload/manifest.json
-%{chromiumdir}/MEIPreload/preloaded_data.pb
%dir %{chromiumdir}/locales
%{chromiumdir}/locales/*.pak
+ %dir %{chromiumdir}/swiftshader
+ %{chromiumdir}/swiftshader/libEGL.so
+ %{chromiumdir}/swiftshader/libGLESv2.so
+ %{chromiumdir}/swiftshader/libvulkan.so
#########################################changelogs#################################################
%changelog
-* Sat Sep 21 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org> -
77.0.3865.90-1
-- Update to 77.0.3865.90
++* Wed Sep 25 2019 qvint <dotqvint(a)gmail.com> - 77.0.3865.90-1
++- Update Chromium to 77.0.3865.90
++- Update ungoogled-chromium to 77.0.3865.90-1
+ - Disabled Nvidia support
+ - Use the bundled python2 as python2 is going to be removed from Fedora
+
-* Fri Aug 30 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org> -
76.0.3809.132-2
-- Update to 76.0.3809.132
-
-* Mon Aug 12 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org> -
76.0.3809.100-2
-- Fix a bug which causes chromium to reject certificates by throwing
ERR_CERTIFICATE_TRANSPARENCY_REQUIRED
-
-* Sat Aug 10 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org> -
76.0.3809.100-1
-- Update to 76.0.3809.100
-
-* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> -
75.0.3770.142-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Aug 03 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org> -
76.0.3809.87-1
-- Update to 76.0.3809.87
-- Use system ffmpeg and libvpx
-
-* Wed Jul 17 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org> -
75.0.3770.142-1
-- Update to 75.0.3770.142
-- Removed Nvidia GPU video decode blacklist
-- Add a patch to fix a bug around RenderProcessHost to avoid crash
-
-* Wed Jul 03 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org> -
75.0.3770.100-2
-- Fix vaapi regression on few intel devices, disabled vaapi post processing for Nvidia
-
-* Wed Jun 19 2019 Vasiliy N. Glazov <vascom2(a)gmail.com> - 75.0.3770.100-1
-- Update to 75.0.3770.100
-
-* Sat Jun 15 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org>
75.0.3770.90-1
-- Update to 75.0.3770.90
-- Re bundle icu; requires 64 and up
-- Use system minizip again
-
-* Wed Jun 12 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org>
75.0.3770.80-2
-- Use %%autosetup and switch back to GCC (build fails on clang often which makes it non
beneficial to GCC)
-- Change recommends to libva-utils since acceleration is broken on few intel devices
-
-* Sat Jun 08 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org>
75.0.3770.80-1
-- Update to 75.0.3770.80
-
-* Fri May 24 2019 Vasiliy N. Glazov <vascom2(a)gmail.com> - 74.0.3729.169-1
-- Update to 74.0.3729.169
-
-* Thu May 16 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org> -
74.0.3729.157-1
-- Update to 74.0.3729.157
-
-* Sun May 05 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org> -
74.0.3729.131-1
-- Update to 74.0.3729.131 and spec cleanup
-
-* Thu Apr 25 2019 Vasiliy N. Glazov <vascom2(a)gmail.com> - 74.0.3729.108-1
-- Update to 74.0.3729.108
-- Install missing MEIPreload component
-
-* Fri Apr 05 2019 Vasiliy N. Glazov <vascom2(a)gmail.com> - 73.0.3683.103-1
-- Update to 73.0.3683.103
-
-* Tue Apr 02 2019 Vasiliy N. Glazov <vascom2(a)gmail.com> - 73.0.3683.86-3
-- Revert switching to GNU ar and nm
-
-* Tue Mar 26 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org> -
73.0.3683.86-2
-- Switched to GNU ar and nm to work around a bug in the current llvm in f30 #rhbz
1685029
-- Pipewire flag added to enable it by default on Fedora
-
-* Fri Mar 22 2019 Vasiliy N. Glazov <vascom2(a)gmail.com> - 73.0.3683.86-1
-- Update to 73.0.3683.86
-
-* Fri Mar 15 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org>
73.0.3683.75-2
-- Enable pipewire support
-- Added a patch from fedora to fix building with pipewire support
-- Add a patch from upstream to stop vsync error spam when running on wayland
-- Disable fedora compile flags and re enable gold on rawhide due to linker bugs
-
-* Fri Mar 15 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org>
73.0.3683.75-1
-- Update to 73.0.3683.75
-- Update BuildRequires for ozone, libva; used pkgconfig instead
-
-
-* Sun Mar 03 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org>
72.0.3626.121-1
-- Updated to 72.0.3626.121
-- spec cleanup
-
-* Tue Feb 19 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org>
72.0.3626.109-1
-- Update to 72.0.3626.109
-- remove ozone patches
-
-* Wed Feb 06 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org>
72.0.3626.81-2
-- Rebundle icu for fedora 29 and fedora 28; Need icu version >= 63.1
-
-* Tue Feb 05 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org>
72.0.3626.81-1
-- Update to 72.0.3626.81
-- Add a patch to fix missing includes in webrtc
-- ozone updates (WIP)
-- Fix gn where it now needs gold linker in bootstrap
-- remove clang building implementation in this spec (out of scope)
-- Make sure chromium uses the x11 GDK backend in wayland
-
-* Fri Dec 21 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 71.0.3578.98-2
-- Re enable the non effective enable_widevine flag
-
-* Sat Dec 15 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 71.0.3578.98-1
-- Update to 71.0.3578.98
-
-* Thu Dec 06 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 71.0.3578.80-1
-- Update to 71.0.3578.80
-- Add a patch to fix libva version mismatch error
-- Re bundle re2 as it's ancient on Fedora
-- Enable experimental support for wayland-ozone in the spec file (WIP; disabled by
default)
-- Bring patch definitions closer to %%prep so to find and apply patches easier.
-
-* Mon Nov 26 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.110-1
-- Update to 70.0.3538.110
-
-* Thu Nov 15 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.102-2
-- Add a patch from upstream to remove sysroot-related options from gn bootstrap
-
-* Wed Nov 14 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.102-1
-- Update to 70.0.3538.102
-
-* Wed Nov 07 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-4
-- Replace %%autosetup with %%setup and fix spec file because applying condition on patch
defines is wrong.
-
-* Wed Nov 07 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-3
-- Add a patch to fix building on rawhide with harfbuzz2
-
-* Tue Nov 06 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-2
-- Use correct branding in chromium
-- update vaapi patch
-
-* Fri Oct 26 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-1
-- Update to 70.0.3538.77
-- Add a patch to fix building with system libicu
-
-* Sun Oct 21 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.67-2
-- Reduce jumbo_file_merge_limit to a much lower number since rpmfusion koji can't
keep up.
-
-* Wed Oct 17 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.67-1
-- Update to 70.0.3538.67
-- brand new vaapi patch
-- Add few patches to fix gcc
-- turned on support for jumbo builds by default across all branches
-- Added -fpermissive flag as requirement
-
-* Fri Oct 12 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 69.0.3497.100-5
-- turned of gold in rawhide as it crashes with fedora flags
-- spec cleanup
-- Minor appdata typo fix
-
-* Thu Oct 11 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 69.0.3497.100-4
-- Rebuild for new libva version on fedora 29+
-- Use metainfodir for installing metadata
-
-* Fri Sep 28 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 69.0.3497.100-3
-- Remove dependency on minizip-compat
package(https://bugzilla.redhat.com/show_bug.cgi?id=1632170)
-- Add conditions to build with{out} system minizip
-
-* Sat Sep 22 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 69.0.3497.100-2
-- Produce an entire new package with unique appdata
-- Use desktop and default app template from the source
-- enable debug builds
-- Update chromium wrapper
-- Remove dependent on unrar
-
-* Tue Sep 18 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 69.0.3497.100-1
-- Updated chromium to 69.0.3497.100.
-- Enabled fedora GCC build flags and removed those flags which can cause confict with
chromium's gyp flags.
-- Removed some duplicate flags and added g1 to ease memory which building.
-
-* Thu Sep 13 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 69.0.3497.92-1
-- updated chromium to 69.0.3497.92
-- fixed vaapi patch
-- Moved appstream validation to check
-
-* Thu Sep 06 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 69.0.3497.81-1
-- updated chromium to 69.0.3497.81
-- removed useless requirements
-- turned on verbose
-- removed conditions on obsolete fedora releases
-- fixed fedora compilation flags
-
-* Wed Aug 29 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 68.0.3440.106-1
-- Deleted provides and excludes and added conflict
-
-
+* Mon Sep 23 2019 qvint <dotqvint(a)gmail.com> - 76.0.3809.132-1
+- Initial version based on Akarshan Biswas' <akarshanbiswas(a)fedoraproject.org>
work
diff --cc sources
index 1e074e2,1ecf8bb..4970878
--- a/sources
+++ b/sources
@@@ -1,2 -1,1 +1,2 @@@
- 389e62cd2f0d7a21159241e3a31df0c0 chromium-76.0.3809.132.tar.xz
- 1b6ed3fb865cd865cc91e95a9a8a5022 ungoogled-chromium-76.0.3809.132-1.tar.gz
+ 8580912b6c254d8c422f514be178a0a5 chromium-77.0.3865.90.tar.xz
++7f75f14b52782a8e5f5ccc3f25f0529b ungoogled-chromium-77.0.3865.90-1.tar.gz