commit 7fe40f582384669debd7835a7ddd1257fec20b44 Merge: d96de2d e94ee3a Author: qvint <dotqvint(a)gmail.com&gt; Date: Thu Oct 31 19:53:30 2019 +0300 Merge remote-tracking branch 'remotes/vaapi/master' # Conflicts: # chromium-browser-privacy.spec # sources UseNormalBAM.patch | 82 -- chromium-browser-privacy.spec | 53 +- chromium-gcc9-dns_util-ambiguous-ctor.patch | 20 + chromium-gcc9-r681321.patch | 35 - chromium-gcc9-r681333.patch | 71 -- chromium-gcc9-r684731.patch | 138 --- chromium-gcc9-r688676.patch | 1471 +++++++++++++++++++++++++++ chromium-gcc9-r694853.patch | 51 + chromium-gcc9-r696834.patch | 89 ++ chromium-gcc9-r706467.patch | 48 + chromium-unbundle-zlib.patch | 32 +- chromium-v8-gcc9.patch | 32 + enable-vaapi.patch | 55 +- fixvaapionintel.patch | 49 + link-against-harfbuzz-subset.patch | 55 - sources | 2 +- 16 files changed, 1827 insertions(+), 456 deletions(-) --- diff --cc chromium-browser-privacy.spec index 20930db,cc106e8..a2add15 --- a/chromium-browser-privacy.spec +++ b/chromium-browser-privacy.spec @@@ -69,12 -69,12 +69,12 @@@ # Enable building with ozone support %global ozone 0 ##############################Package Definitions###################################### -Name: chromium-vaapi +Name: chromium-browser-privacy - Version: 77.0.3865.120 + Version: 78.0.3904.70 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 @@@ -227,38 -221,21 +227,37 @@@ Patch54: brand.patc Patch65: chromium-73.0.3683.75-pipewire-cstring-fix.patch # Fix header Patch68: Add-missing-header-to-fix-webrtc-build.patch + Patch69: chromium-unbundle-zlib.patch + Patch70: chromium-base-location.patch # GCC patches - Patch69: chromium-gcc9-r681333.patch - Patch70: chromium-gcc9-r681321.patch - Patch71: chromium-unbundle-zlib.patch - Patch72: chromium-base-location.patch - Patch73: chromium-gcc9-r684731.patch - - # This patch fixes linking when build with system harfbuzz is enabled - Patch74: link-against-harfbuzz-subset.patch - + Patch73: chromium-gcc9-r688676.patch + Patch74: chromium-gcc9-r694853.patch + Patch75: chromium-gcc9-r696834.patch + Patch76: chromium-gcc9-r706467.patch + Patch77: chromium-v8-gcc9.patch + Patch78: chromium-gcc9-dns_util-ambiguous-ctor.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 @@@ -604,27 -572,9 +608,24 @@@ gn_args= 'google_api_key="%{api_key}"' 'google_default_client_id="%{default_client_id}"' 'google_default_client_secret="%{default_client_secret}"' + + closure_compile=false + enable_hevc_demuxing=true + enable_mdns=false + enable_mse_mpeg2ts_stream_parser=true + enable_nacl_nonsfi=false + enable_one_click_signin=false + enable_reading_list=false + enable_remoting=false + enable_reporting=false + enable_service_discovery=false + exclude_unwind_tables=true + safe_browsing_mode=0 + use_official_google_api_keys=false + use_unofficial_version_number=false ) - #compiler settings - # 'clang_base_path = "/usr"' - # use_lld=false - # clang_use_chrome_plugins=false + gn_args+=( is_clang=false ) @@@ -752,16 -708,17 +754,19 @@@ appstream-util validate-relax --nonet " %dir %{chromiumdir}/swiftshader %{chromiumdir}/swiftshader/libEGL.so %{chromiumdir}/swiftshader/libGLESv2.so - %{chromiumdir}/swiftshader/libvulkan.so + %{chromiumdir}/swiftshader/libvk_swiftshader.so #########################################changelogs################################################# %changelog -* Mon Oct 28 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org&gt; - 78.0.3904.70-1 -- Update to 78.0.3904.70 ++* Thu Oct 31 2019 qvint <dotqvint(a)gmail.com&gt; - 78.0.3904.70-1 ++- Update Chromium to 78.0.3904.70 + -* Sun Oct 13 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org&gt; - 77.0.3865.120-1 -- Update to 77.0.3865.120 +* Mon Oct 14 2019 qvint <dotqvint(a)gmail.com&gt; - 77.0.3865.120-1 +- Update Chromium to 77.0.3865.120 +- Update ungoogled-chromium to 99b98c5 -* Sat Sep 21 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org&gt; - 77.0.3865.90-1 -- Update to 77.0.3865.90 +* Wed Sep 25 2019 qvint <dotqvint(a)gmail.com&gt; - 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 diff --cc sources index d8a44e3,9e9cab3..38294ec --- a/sources +++ b/sources @@@ -1,2 -1,1 +1,2 @@@ - SHA512 (chromium-77.0.3865.120.tar.xz) = 4c72c9e9cd9a5d7f89e33c52d117018418ce0f5d23a57341b26ce47c8f90fa55f52a0c976b6959026dc273d5b37aa57306253a9b533172cd133a815edc7bccb4 + SHA512 (chromium-78.0.3904.70.tar.xz) = 95d926ea92a0e744284a4c5fca619e3a067dd0fdfaa7c05b5a069d2a8d1159bf849335e21e5803bd28175c1994bd4ff15337ad0a3063445fab74eef113275545 +SHA512 (ungoogled-chromium-99b98c530ff30c85434a5becc550bc1cfe255b63.tar.gz) = 06b2e700fee0f7e4d28ff3a1814fd8c6897bae4451fd45c9a779878893c6367fa16e6559d1a36378c1b3435b757eb9f2986345a5a076fc3afab50c3394615088