commit 1b2cf7df18fb863180f73c46520e25b4e6005d16 Merge: 2fdd830 c4c8cd7 Author: qvint <dotqvint(a)gmail.com&gt; Date: Sat Jul 18 16:40:12 2020 +0300 Sync spec and sources with free/chromium-freeworld .gitignore | 2 + ...-b794998819088f76b4cf44c8db6940240c563cf4.patch | 18 --- chromium-82-gcc-noexcept.patch | 31 ----- chromium-82-gcc-template.patch | 48 -------- chromium-83-gcc-10-r31184.patch | 35 ------ chromium-83-gcc-10-r766427.patch | 27 ----- chromium-83-gcc-10.patch | 20 --- chromium-83-gcc-include.patch | 22 ---- chromium-83-gcc-iterator.patch | 36 ------ chromium-83-gcc-r756880.patch | 69 ----------- chromium-83-gcc-r760272.patch | 27 ----- chromium-83-gcc-r760588.patch | 58 --------- chromium-83-gcc-r762806.patch | 43 ------- chromium-83-gcc-r766770.patch | 134 --------------------- chromium-84-nss-r771840.patch | 38 ++++++ chromium-browser-privacy.spec | 74 ++++++++---- chromium-enable-vaapi.patch | 8 +- chromium-fix-vaapi-on-intel.patch | 8 +- ...bootstrap.patch => chromium-py2-bootstrap.patch | 0 sources | 4 +- 20 files changed, 99 insertions(+), 603 deletions(-) --- diff --cc .gitignore index 8dcfed7,9d45c0d..ebe8c14 --- a/.gitignore +++ b/.gitignore @@@ -1,2 -1,3 +1,4 @@@ chromium-*.tar.xz + chromium-patches-*.tar.gz + xcb-proto-*.tar.bz2 +ungoogled-chromium-*.tar.gz diff --cc chromium-browser-privacy.spec index 8bf0e15,b730fe8..a0d7e39 --- a/chromium-browser-privacy.spec +++ b/chromium-browser-privacy.spec @@@ -65,12 -65,13 +65,13 @@@ # Enable building with ozone support %global ozone 0 ##############################Package Definitions###################################### -Name: chromium-freeworld +Name: chromium-browser-privacy - Version: 83.0.4103.116 + Version: 84.0.4147.89 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... %else @@@ -88,8 -89,15 +89,19 @@@ # ./chromium-latest.py --stable --ffmpegclean --ffmpegarm --deleteunrar Source0: chromium-%{version}-clean.tar.xz %endif + + # Patchset composed by Stephan Hartmann. + %global patchset_revision chromium-84-patchset-3 + Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c... + + # Bundled xcb-proto. Chromium needs python2 version of this package. + %global xcb_proto_version 1.13 + Source2: https://xcb.freedesktop.org/dist/xcb-proto-%{xcb_proto_version}.tar.bz2 + ++# ungoogled-chromium. +%global ungoogled_chromium_revision 83.0.4103.116-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. @@@ -240,32 -232,26 +235,46 @@@ Patch402: chromium-enable-widevin Patch403: chromium-rpm-fusion-brand.patch %endif +# 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 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 + %setup -q -T -n chromium-patches-%{patchset_revision} -b 1 + %setup -q -T -n xcb-proto-%{xcb_proto_version} -b 2 +%setup -q -T -n ungoogled-chromium-%{ungoogled_chromium_revision} -b 300 - %setup -q -n chromium-%{version} - # ungoogled-chromium: binary pruning + %global patchset_root %{_builddir}/chromium-patches-%{patchset_revision} + %global xcb_proto_root %{_builddir}/xcb-proto-%{xcb_proto_version} +%global ungoogled_chromium_root %{_builddir}/ungoogled-chromium-%{ungoogled_chromium_revision} + + %setup -q -n chromium-%{version} + + # Apply patchset composed by Stephan Hartmann. + rm %{patchset_root}/chromium-84-compiler.patch + for patch in %{patchset_root}/*.patch; do + echo "Applying ${patch}" + %{__patch} -p1 <"${patch}" + done + ++# 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 #Let's change the default shebang of python files. @@@ -548,19 -537,6 +560,20 @@@ 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 +sed -i '/extra\/inox-patchset\/chromium-widevine.patch/d' \ + %{ungoogled_chromium_root}/patches/series +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 #export compilar variables @@@ -790,26 -763,49 +809,29 @@@ appstream-util validate-relax --nonet " %{chromiumdir}/swiftshader/libGLESv2.so #########################################changelogs################################################# %changelog + * Sat Jul 18 2020 qvint <dotqvint(a)gmail.com&gt; - 84.0.4147.89-1 -- Update to 84.0.4147.89 -- Use patchset composed by Stephan Hartmann <stha09(a)googlemail.com&gt; -- Bundle xcb-proto - -* Thu Jun 25 2020 qvint <dotqvint(a)gmail.com&gt; - 83.0.4103.116-1 -- Update to 83.0.4103.116 - -* Wed Jun 17 2020 qvint <dotqvint(a)gmail.com&gt; - 83.0.4103.106-1 -- Update to 83.0.4103.106 -- Disable python byte compiling ++- Update Chromium to 84.0.4147.89 + -* Mon Jun 08 2020 qvint <dotqvint(a)gmail.com&gt; - 83.0.4103.97-2 -- Fix crash in ServiceWorker (rfbz#5671) - -* Fri Jun 05 2020 qvint <dotqvint(a)gmail.com&gt; - 83.0.4103.97-1 -- Update to 83.0.4103.97 +* Sat Jun 27 2020 qvint <dotqvint(a)gmail.com&gt; - 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&gt; - 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&gt; - 81.0.4044.129-1 -- Update to 81.0.4044.129 - -* Thu Apr 09 2020 qvint <dotqvint(a)gmail.com&gt; - 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&gt; - 80.0.3987.163-1 -- Update to 80.0.3987.163 +* Fri Apr 10 2020 qvint <dotqvint(a)gmail.com&gt; - 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&gt; - 80.0.3987.162-1 -- Update to 80.0.3987.162 - -* 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 5d1e78c,f5f739a..ed1f9b3 --- a/sources +++ b/sources @@@ -1,2 -1,3 +1,4 @@@ - SHA512 (chromium-83.0.4103.116.tar.xz) = dbd92fb04183ec1402401388f70b18b95040083c9ea8bf2ea6b1692fddc375b090968b13afb010ebf412b480b34747eb2c82709adbeb386cccf60b972f23254f + SHA512 (chromium-84.0.4147.89.tar.xz) = cc207a5f09a89e42bc12fd491d5d0ef11c04daaa324aa696d2f8a37679b8f2171d3b265296968c3312e158b0fd2c059e12727a7463d3bd2f640d5bbd43c4f676 + SHA512 (chromium-patches-chromium-84-patchset-3.tar.gz) = ea7f5c9436bbbe3de2fa69f006e0e12be24e73a652d3ac780c30045dfd821b41d9b83779fd306eafc2455cbc8fced3477f5adff626318a4ab5e13b06d9a7234a + SHA512 (xcb-proto-1.13.tar.bz2) = 002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7 +SHA512 (ungoogled-chromium-83.0.4103.116-1.tar.gz) = ca535b9cd702292f1b861dd1ce9330eac1b4fe7927738d46c2a2ce353f920117e3cbd71cd39c79426643f148cd1c3bcfedd6d3afb23690361ac4dc6546f71be9