[chromium-browser-privacy/f32: 13/13] Update ungoogled-chromium to 87.0.4280.88-1

commit 9977861207730ef7e4c725f866329d559d451b64 Author: qvint <dotqvint(a)gmail.com&gt; Date: Fri Dec 11 09:32:24 2020 +0300 Update ungoogled-chromium to 87.0.4280.88-1 chromium-browser-privacy.spec | 9 ++++----- chromium-widevine-locations.patch | 40 ++++++++++----------------------------- sources | 2 +- 3 files changed, 15 insertions(+), 36 deletions(-) --- diff --git a/chromium-browser-privacy.spec b/chromium-browser-privacy.spec index 66ff834..cff56a5 100644 --- a/chromium-browser-privacy.spec +++ b/chromium-browser-privacy.spec @@ -57,7 +57,7 @@ Source0: chromium-%{version}-clean.tar.xz Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c... # ungoogled-chromium. -%global ungoogled_chromium_revision 85.0.4183.102-1 +%global ungoogled_chromium_revision 87.0.4280.88-1 Source300: https://github.com/Eloston/ungoogled-chromium/archive/%{ungoogled_chromiu... # The following two source files are copied and modified from the chromium source @@ -151,6 +151,7 @@ ExclusiveArch: x86_64 # Fedora patches: Patch300: chromium-py2-bootstrap.patch +Patch320: chromium-widevine-locations.patch # RPM Fusion patches [free/chromium-freeworld]: Patch400: chromium-hw-accel-mjpeg.patch @@ -168,9 +169,6 @@ Patch450: chromium-87-includes.patch # RPM Fusion patches [free/chromium-browser-privacy]: Patch500: chromium-default-user-data-dir.patch -# Additional patches: -Patch600: chromium-widevine-locations.patch - %description %{name} is a distribution of ungoogled-chromium. @@ -547,7 +545,7 @@ gn_args=( proprietary_codecs=false %endif enable_nacl=false - enable_hangout_services_extension=true + enable_hangout_services_extension=false fatal_linker_warnings=false treat_warnings_as_errors=false fieldtrial_testing_like_official_build=true @@ -704,6 +702,7 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda %changelog * Thu Dec 10 2020 qvint <dotqvint(a)gmail.com&gt; - 87.0.4280.88-1 - Update Chromium to 87.0.4280.88 +- Update ungoogled-chromium to 87.0.4280.88-1 * Mon Sep 14 2020 qvint <dotqvint(a)gmail.com&gt; - 85.0.4183.102-1 - Update Chromium to 85.0.4183.102 diff --git a/chromium-widevine-locations.patch b/chromium-widevine-locations.patch index 9e9acee..e94eda6 100644 --- a/chromium-widevine-locations.patch +++ b/chromium-widevine-locations.patch @@ -1,39 +1,19 @@ -Description: try alternative locations for the Widevine CDM library: - - $HOME/.local/lib/WidevineCdm/ (snap-friendly, see https://launchpad.net/bugs/1738149) - - /opt/google/chrome/WidevineCdm/ (installed by official google chrome package) - The manifest lives at the top level, whereas libwidevinecdm.so is inside - a platform specific directory, see media::GetPlatformSpecificDirectory(…). -Author: Olivier Tilloy <olivier.tilloy(a)canonical.com&gt; - -Source: https://bazaar.launchpad.net/~chromium-team/chromium-browser/disco-dev/vi... - --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc -@@ -374,8 +374,17 @@ bool PathProvider(int key, base::FilePat - cur = cur.Append(FILE_PATH_LITERAL("pnacl")); - break; - --#if defined(OS_LINUX) && BUILDFLAG(BUNDLE_WIDEVINE_CDM) -+#if defined(OS_LINUX) && BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) +@@ -379,6 +379,16 @@ bool PathProvider(int key, base::FilePat + #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ + BUILDFLAG(BUNDLE_WIDEVINE_CDM) case chrome::DIR_BUNDLED_WIDEVINE_CDM: + base::PathService::Get(base::DIR_HOME, &cur); -+ cur = cur.Append(FILE_PATH_LITERAL(".local/lib")) -+ .AppendASCII(kWidevineCdmBaseDirectory); -+ if (base::PathExists(cur)) ++ cur = cur.Append(FILE_PATH_LITERAL(".local/lib/libwidevinecdm.so")); ++ if (base::PathExists(cur)) { + break; -+ cur = base::FilePath(FILE_PATH_LITERAL("/opt/google/chrome")) -+ .AppendASCII(kWidevineCdmBaseDirectory); -+ if (base::PathExists(cur)) ++ } ++ // Yes, this has an arch hardcoded in the path, but at this time, it is the only place to find libwidevinecdm.so ++ if (base::PathExists(base::FilePath(FILE_PATH_LITERAL("/opt/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so")))) { ++ cur = base::FilePath(FILE_PATH_LITERAL("/opt/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so")); + break; ++ } if (!GetComponentDirectory(&cur)) return false; #if !defined(OS_CHROMEOS) -@@ -384,7 +393,7 @@ bool PathProvider(int key, base::FilePat - cur = cur.AppendASCII(kWidevineCdmBaseDirectory); - #endif // !defined(OS_CHROMEOS) - break; --#endif // defined(OS_LINUX) && BUILDFLAG(BUNDLE_WIDEVINE_CDM) -+#endif // defined(OS_LINUX) && BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) - - #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && \ - BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) diff --git a/sources b/sources index e789162..9474a3f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (chromium-87.0.4280.88.tar.xz) = ac3903b598bd69f4ee3065845eac3c85cb5524715b9ce629c9c2bd017f2ebd168b7ee8111bccc2e6b6cfd12ad07add834cb2cd3bf0e27a8a5076bb7842fca897 SHA512 (chromium-patches-chromium-87-patchset-9.tar.gz) = 7612d02b1e078bfd2bfefdd773b5931eff72e661111170d3c5497e5bef73aedd6e037cfadbb4ce62d7d68c5f7de0c2b560ffb7cbe90c73e88eb9c2b98298c691 -SHA512 (ungoogled-chromium-85.0.4183.102-1.tar.gz) = b4ce88df6faece921d258aeb1554fbda00e25d1577d71967943abc475905ffb8e427a00aad893d3f1cc4cc2fad3ad0015154f12b59ee5ef041a3d7903774b935 +SHA512 (ungoogled-chromium-87.0.4280.88-1.tar.gz) = 84478f743ebc98d581401245da5f764cd3d3ac67ef2fdeb8659077b10c6d09a909f8f6f4a0897ea0d72f33a7faaaea551481d67ddd64ea9d9ca63666e1420c27