commit e21fe2a7127b0a767f1bec990da7dac137e6db74 Merge: 65000f7 f6143e9 Author: qvint <dotqvint(a)gmail.com&gt; Date: Fri Apr 10 08:09:15 2020 +0300 Sync spec and sources with free/chromium-freeworld Add-missing-header-to-fix-webrtc-build.patch | 16 -- cert-trans-google.patch | 13 -- chromium-71.0.3578.98-py2-bootstrap.patch | 31 +++ chromium-77.0.3865.75-gcc-include-memory.patch | 34 --- ...-use-c++17-to-work-around-ugly-angle-code.patch | 28 --- chromium-80-gcc-abstract.patch | 41 ---- chromium-80-gcc-blink.patch | 45 ---- chromium-80-gcc-incomplete-type.patch | 229 ------------------- chromium-80-gcc-permissive.patch | 33 --- chromium-80-gcc-quiche.patch | 30 --- chromium-80-include.patch | 33 --- chromium-80-unbundle-libxml.patch | 101 --------- ...mium-80.0.3987.106-missing-cstddef-header.patch | 44 ---- ...mium-80.0.3987.106-missing-cstring-header.patch | 34 --- chromium-80.0.3987.87-fix-for-c++17.patch | 190 ---------------- chromium-80.0.3987.87-missing-cstdint-header.patch | 55 ----- chromium-80.0.3987.87-missing-string-header.patch | 11 - chromium-81-gcc-10.patch | 86 ++++++++ chromium-81-gcc-r742632.patch | 27 +++ chromium-81-gcc-r742834.patch | 35 +++ chromium-81-gcc-r743910.patch | 62 ++++++ chromium-81-vaapi-r737459.patch | 52 +++++ chromium-81-vaapi-r738595.patch | 31 +++ chromium-base-location.patch | 13 -- chromium-browser-privacy.spec | 244 ++++++++++----------- enable-vaapi.patch => chromium-enable-vaapi.patch | 38 +--- widevine.patch => chromium-enable-widevine.patch | 2 - ...ntel.patch => chromium-fix-vaapi-on-intel.patch | 19 +- brand.patch => chromium-rpm-fusion-brand.patch | 9 - chromium-system-icu.patch | 20 -- chromium-unbundle-zlib.patch | 13 -- py2-bootstrap.patch | 33 --- sources | 2 +- 33 files changed, 452 insertions(+), 1202 deletions(-) --- diff --cc chromium-browser-privacy.spec index 1f36fd7,0413938..cde4eb3 --- a/chromium-browser-privacy.spec +++ b/chromium-browser-privacy.spec @@@ -68,14 -68,14 +68,14 @@@ # Enable building with ozone support %global ozone 0 ##############################Package Definitions###################################### - Name: chromium-browser-privacy - Version: 80.0.3987.122 - Release: 1%{?dist} - 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://github.com/Eloston/ungoogled-chromium -Name: chromium-freeworld ++Name: chromium-browser-privacy + Version: 81.0.4044.92 + 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... + Source0: https://commondatastorage.googleapis.com/chromium-browser-official/chromi... %else # Unfortunately, Fedora & Copr forbids uploading sources with patent-encumbered # ffmpeg code even if they are never compiled and linked to target binaries, @@@ -89,16 -89,14 +89,16 @@@ # to 1 to use the upstreanm packaged source. # The repackaged source tarball used here is produced by: # ./chromium-latest.py --stable --ffmpegclean --ffmpegarm --deleteunrar - Source0: chromium-%{version}-clean.tar.xz + Source0: chromium-%{version}-clean.tar.xz %endif +%global ungoogled_chromium_revision 80.0.3987.122-1 - Source300: https://github.com/Eloston/ungoogled-chromium/archive/%{ungoogled_chromiu... ++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. - Source11: %{name}.appdata.xml + Source10: %{name}.sh + #Add our own appdata file. + Source11: %{name}.appdata.xml #Personal stuff - Source15: LICENSE + Source15: LICENSE ######################## Installation Folder ################################################# #Our installation folder %global chromiumdir %{_libdir}/%{name} @@@ -137,8 -135,6 +137,8 @@@ BuildRequires: pkgconfig(wayland-curso BuildRequires: pkgconfig(wayland-scanner) BuildRequires: pkgconfig(wayland-server) %endif +# ungoogled-chromium dependencies - BuildRequires: python3 ++BuildRequires: python3 #Python stuffs %if 0%{?bundlepylibs} @@@ -201,87 -198,45 +202,61 @@@ 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 + Recommends: libva-utils %if !%{debug_pkg} %global debug_package %{nil} %endif # This build should be only available to amd64 - ExclusiveArch: x86_64 - # Define Patches here ## - # Enable video acceleration on chromium for Linux - Patch1: enable-vaapi.patch - # Enable support for widevine - Patch2: widevine.patch - # Fix vaapi on Intel - Patch3: fixvaapionintel.patch - #Fix certificare transperancy error introduced by the current stable version of chromium - Patch5: cert-trans-google.patch - # Bootstrap still uses python command - Patch51: py2-bootstrap.patch - # Fix building with system icu - Patch52: chromium-system-icu.patch - # Let's brand chromium! - Patch54: brand.patch - # Fix header - Patch68: Add-missing-header-to-fix-webrtc-build.patch - Patch69: chromium-unbundle-zlib.patch - Patch70: chromium-base-location.patch - - # ungoogled-chromium tweaks: - Patch300: chromium-default-user-data-dir.patch - - # Gentoo: - Patch400: chromium-80-include.patch - Patch401: chromium-80-gcc-incomplete-type.patch - Patch402: chromium-80-gcc-quiche.patch - Patch403: chromium-80-gcc-permissive.patch - Patch404: chromium-80-gcc-blink.patch - Patch405: chromium-80-gcc-abstract.patch - %if %{with system_libxml2} - Patch406: chromium-80-unbundle-libxml.patch - %endif + ExclusiveArch: x86_64 - # Fedora: - Patch500: chromium-80.0.3987.87-missing-string-header.patch - Patch501: chromium-80.0.3987.106-missing-cstddef-header.patch - Patch502: chromium-80.0.3987.87-missing-cstdint-header.patch - Patch503: chromium-77.0.3865.75-gcc-include-memory.patch - Patch504: chromium-80.0.3987.106-missing-cstring-header.patch + # Google patches (short-term fixes and backports): + Patch150: chromium-81-vaapi-r737459.patch + Patch151: chromium-81-vaapi-r738595.patch + Patch152: chromium-81-gcc-r742632.patch + Patch153: chromium-81-gcc-r742834.patch + Patch154: chromium-81-gcc-r743910.patch + + # Gentoo patches (short-term fixes): %if 0%{?fedora} >= 32 - Patch505: chromium-79.0.3945.130-gcc10-use-c++17-to-work-around-ugly-angle-code.patch - Patch506: chromium-80.0.3987.87-fix-for-c++17.patch + Patch250: chromium-81-gcc-10.patch + %endif + + # Fedora patches: + Patch300: chromium-71.0.3578.98-py2-bootstrap.patch + + # RPM Fusion patches [free/chromium-freeworld]: + Patch400: chromium-enable-vaapi.patch + Patch401: chromium-fix-vaapi-on-intel.patch + Patch402: chromium-enable-widevine.patch + %if %{freeworld} + Patch403: chromium-rpm-fusion-brand.patch %endif ++# 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 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 + +%autopatch -p1 - %if !%{with system_libicu} - %patch52 -p1 -R - %endif - %if !%{freeworld} - %patch54 -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}=' {} + @@@ -798,9 -733,24 +775,12 @@@ appstream-util validate-relax --nonet " %{chromiumdir}/swiftshader/libGLESv2.so #########################################changelogs################################################# %changelog -* Thu Apr 09 2020 qvint <dotqvint(a)gmail.com&gt; - 81.0.4044.92-1 -- Update to 81.0.4044.92 - -* Sun Apr 05 2020 qvint <dotqvint(a)gmail.com&gt; - 80.0.3987.163-1 -- Update to 80.0.3987.163 - -* Thu Apr 02 2020 qvint <dotqvint(a)gmail.com&gt; - 80.0.3987.162-1 -- Update to 80.0.3987.162 ++* Fri Apr 10 2020 qvint <dotqvint(a)gmail.com&gt; - 81.0.4044.92-1 ++- Update Chromium to 81.0.4044.92 + -* Wed Mar 18 2020 qvint <dotqvint(a)gmail.com&gt; - 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&gt; - 80.0.3987.132-1 -- Update to 80.0.3987.132 - -* Sun Mar 01 2020 qvint <dotqvint(a)gmail.com&gt; - 80.0.3987.122-1 -- Update to 80.0.3987.122 +* Thu Feb 27 2020 qvint <dotqvint(a)gmail.com&gt; - 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&gt; - 79.0.3945.130-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --cc sources index 5c93a06,7a4e91a..257b259 --- a/sources +++ b/sources @@@ -1,2 -1,1 +1,2 @@@ - SHA512 (chromium-80.0.3987.122.tar.xz) = 3a022c55f5745f2cfb7e28efb113f78ff686da638cd02f0585ef1ae8620f81ece864bc27b4e0a88daf3f409ff565a9b80b8859d1fd7d62c8b1d26cb8b311acc5 + SHA512 (chromium-81.0.4044.92.tar.xz) = 2d5817c84ac17e7b4d2e4473df841f53a074528e0ac997345ee68db4a9f8b45d84ef50c1d475608428f49ae40fe5315cda9d501ee22b829156c9e533044fb5af +SHA512 (ungoogled-chromium-80.0.3987.122-1.tar.gz) = 702c79caf1797d53e602222e51bc1352d527dc8ac9f538fe9017670061b8e6d1838681076b17b3c409a88837316796390f982f5fc431d383758b5d2839c99553