[chromium-browser-privacy: 100/103] Merge branch 'chromium-vaapi-f30' into chromium-browser-privacy-f30
commit 54087a4b1d79329f3dd5ae4cd98f0cf204c83ee5
Merge: 532a378 8d976e2
Author: qvint <dotqvint(a)gmail.com>
Date: Mon Oct 14 08:01:44 2019 +0300
Merge branch 'chromium-vaapi-f30' into chromium-browser-privacy-f30
# Conflicts:
# chromium-browser-privacy.spec
# sources
chromium-browser-privacy.spec | 9 ++++++---
sources | 4 ++--
2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --cc chromium-browser-privacy.spec
index bb7145d,32dd024..cc2ce0c
--- a/chromium-browser-privacy.spec
+++ b/chromium-browser-privacy.spec
@@@ -60,12 -60,12 +60,12 @@@
# Enable building with ozone support
%global ozone 0
##############################Package Definitions######################################
-Name: chromium-vaapi
+Name: chromium-browser-privacy
- Version: 77.0.3865.90
+ Version: 77.0.3865.120
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
@@@ -83,8 -83,6 +83,8 @@@
# ./chromium-latest.py --stable --ffmpegclean --ffmpegarm --deleteunrar
Source0: chromium-%{version}-clean.tar.xz
%endif
- %global ungoogled_chromium_revision 77.0.3865.90-1
++%global ungoogled_chromium_revision 99b98c530ff30c85434a5becc550bc1cfe255b63
+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.
@@@ -747,9 -700,11 +746,13 @@@ appstream-util validate-relax --nonet "
%{chromiumdir}/swiftshader/libvulkan.so
#########################################changelogs#################################################
%changelog
-* Sun Oct 13 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org> -
77.0.3865.120-1
-- Update to 77.0.3865.120
++* Mon Oct 14 2019 qvint <dotqvint(a)gmail.com> - 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> -
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
diff --cc sources
index 4970878,b5a9433..d8a44e3
--- a/sources
+++ b/sources
@@@ -1,2 -1,1 +1,2 @@@
- 8580912b6c254d8c422f514be178a0a5 chromium-77.0.3865.90.tar.xz
- 7f75f14b52782a8e5f5ccc3f25f0529b ungoogled-chromium-77.0.3865.90-1.tar.gz
+ SHA512 (chromium-77.0.3865.120.tar.xz) =
4c72c9e9cd9a5d7f89e33c52d117018418ce0f5d23a57341b26ce47c8f90fa55f52a0c976b6959026dc273d5b37aa57306253a9b533172cd133a815edc7bccb4
++SHA512 (ungoogled-chromium-99b98c530ff30c85434a5becc550bc1cfe255b63.tar.gz) =
06b2e700fee0f7e4d28ff3a1814fd8c6897bae4451fd45c9a779878893c6367fa16e6559d1a36378c1b3435b757eb9f2986345a5a076fc3afab50c3394615088