commit 38e10aea45b1e9b509a980f740033df7e65d6a26 Merge: 059e9e7 f726697 Author: qvint <dotqvint(a)gmail.com&gt; Date: Mon Aug 31 08:31:31 2020 +0300 Sync spec and sources with free/chromium-freeworld .gitignore | 1 - chromium-84-nss-r771840.patch | 38 ------------- chromium-85-ffmpeg-4.3-r796966.patch | 41 ++++++++++++++ chromium-browser-privacy.spec | 102 ++++++++++++++++++----------------- chromium-enable-vaapi.patch | 8 +-- chromium-manpage.patch | 34 ++++++++++++ chromium-symbolic.svg | 6 +++ sources | 5 +- 8 files changed, 140 insertions(+), 95 deletions(-) --- diff --cc .gitignore index ebe8c14,ae2e382..4bfa600 --- a/.gitignore +++ b/.gitignore @@@ -1,4 -1,2 +1,3 @@@ chromium-*.tar.xz chromium-patches-*.tar.gz - xcb-proto-*.tar.bz2 +ungoogled-chromium-*.tar.gz diff --cc chromium-browser-privacy.spec index e2e8294,5ed67f9..b07e114 --- a/chromium-browser-privacy.spec +++ b/chromium-browser-privacy.spec @@@ -65,12 -55,12 +55,12 @@@ # Enable building with ozone support %global ozone 0 ##############################Package Definitions###################################### -Name: chromium-freeworld +Name: chromium-browser-privacy - Version: 84.0.4147.125 + Version: 85.0.4183.83 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... @@@ -91,17 -81,9 +81,13 @@@ Source0: chromium-%{version}-cle %endif # Patchset composed by Stephan Hartmann. - %global patchset_revision chromium-84-patchset-3 + %global patchset_revision chromium-85-patchset-2 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 84.0.4147.125-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. @@@ -231,49 -215,38 +218,58 @@@ Patch300: chromium-py2-bootstrap. Patch400: chromium-enable-vaapi.patch Patch401: chromium-fix-vaapi-on-intel.patch Patch402: chromium-enable-widevine.patch + Patch403: chromium-manpage.patch %if %{freeworld} - Patch403: chromium-rpm-fusion-brand.patch + Patch420: 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} %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 + %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 +# 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 @@@ -806,34 -763,64 +807,37 @@@ appstream-util validate-relax --nonet " %{chromiumdir}/swiftshader/libGLESv2.so #########################################changelogs################################################# %changelog -* Wed Aug 26 2020 qvint <dotqvint(a)gmail.com&gt; - 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 -- 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&gt; - 84.0.4147.125-1 -- Update to 84.0.4147.125 -- Stop using gold -- Add 'ulimit -n 2048' ++* Mon Aug 31 2020 qvint <dotqvint(a)gmail.com&gt; - 85.0.4183.83-1 ++- Update Chromium to 85.0.4183.83 + -* 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 +* Thu Aug 13 2020 qvint <dotqvint(a)gmail.com&gt; - 84.0.4147.125-1 +- Update Chromium to 84.0.4147.125 +- Update ungoogled-chromium to 84.0.4147.125-1 -* Mon Jun 08 2020 qvint <dotqvint(a)gmail.com&gt; - 83.0.4103.97-2 -- Fix crash in ServiceWorker (rfbz#5671) +* Sat Jul 18 2020 qvint <dotqvint(a)gmail.com&gt; - 84.0.4147.89-1 +- Update Chromium to 84.0.4147.89 +- Update ungoogled-chromium to 84.0.4147.89-1 -* 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 d29961f,b360cf6..fb9656e --- a/sources +++ b/sources @@@ -1,4 -1,2 +1,3 @@@ - SHA512 (chromium-84.0.4147.125.tar.xz) = a86439efbadce4cc157fe16e0e16732feda2025e14179a54df6a33446f744dc1db59f1ebcf7d5d29d7bfc42102af1283ddf108982152ec1f869d7623af7bed26 - SHA512 (chromium-patches-chromium-84-patchset-3.tar.gz) = ea7f5c9436bbbe3de2fa69f006e0e12be24e73a652d3ac780c30045dfd821b41d9b83779fd306eafc2455cbc8fced3477f5adff626318a4ab5e13b06d9a7234a - SHA512 (xcb-proto-1.13.tar.bz2) = 002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7 + SHA512 (chromium-85.0.4183.83.tar.xz) = 9b491133ad5a04a9a65d8be2a8102102e6698dc30e9dd310825f9a6648655595656bef1ba2d9d5a6d64c1e0adb755010672986a0de46ce00cd0a5769bff30436 + SHA512 (chromium-patches-chromium-85-patchset-2.tar.gz) = b8252b778ff16f1fbb0be22ebd1b9f711fafe6d6837e0806e4281aa659756a091c79609e2e4dd865b5f2d377f159c12d47feab201d4d72a93de5fc5ff596ff2e +SHA512 (ungoogled-chromium-84.0.4147.125-1.tar.gz) = 6db46f7aefe886a5df1d3872a4cab744c8f567ae6090f0612b42812843ae7a509e146efd9ed99ba237763708a787431d485311e2673eabe87ec64e5bccecdd8a