[chromium-browser-privacy: 39/51] Merge branch 'f32' into f31

commit ed3ed890f4d7c2e3c8f8ea5798948bc25c664965 Merge: a3b2592 03d6f4b Author: qvint <dotqvint(a)gmail.com&gt; Date: Sun Mar 1 10:10:54 2020 +0300 Merge branch 'f32' into f31 add-missing-include-for-unique_ptr.patch | 30 ------------------------------ chromium-freeworld.spec | 7 +++++-- 2 files changed, 5 insertions(+), 32 deletions(-) --- diff --cc chromium-freeworld.spec index 0892723,0775962..6ae20c2 --- a/chromium-freeworld.spec +++ b/chromium-freeworld.spec @@@ -54,7 -54,7 +54,7 @@@ %bcond_with system_ffmpeg #Allow minizip to be unbundled #mini-compat is going to be removed from fedora 30! --%bcond_with system_minizip ++%bcond_without system_minizip %endif # Need re2 ver. 2016.07.21 for re2::LazyRE2