[chromium-browser-privacy/f32] Add rawhide fix and add ability to manually apply patches for ifdef patches

commit 78298fdc49de2ebf44d175233cc7202ecc29ed87 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Tue Mar 30 12:30:03 2021 +0100 Add rawhide fix and add ability to manually apply patches for ifdef patches chromium-browser-privacy.spec | 24 +++++++++++++++++------- chromium-rawhide-gcc-std-max-fix.patch | 24 ++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 7 deletions(-) --- diff --git a/chromium-browser-privacy.spec b/chromium-browser-privacy.spec index 53e81aa..d18efef 100644 --- a/chromium-browser-privacy.spec +++ b/chromium-browser-privacy.spec @@ -150,6 +150,10 @@ ExclusiveArch: x86_64 # Fedora patches: Patch300: chromium-py2-bootstrap.patch Patch320: chromium-widevine-locations.patch +Patch321: chromium-fstatfix.patch +Patch322: chromium-gcc11.patch +# Manually applied patches: +Patch701: chromium-rawhide-gcc-std-max-fix.patch # RPM Fusion patches [free/chromium-freeworld]: Patch400: chromium-hw-accel-mjpeg.patch @@ -158,11 +162,8 @@ Patch402: chromium-enable-widevine.patch Patch403: chromium-manpage.patch Patch404: chromium-md5-based-build-id.patch Patch405: chromium-names.patch -Patch406: chromium-fstatfix.patch -Patch407: chromium-gcc11.patch -%if %{freeworld} -Patch420: chromium-rpm-fusion-brand.patch -%endif +# Manually applied patches: +Patch700: chromium-rpm-fusion-brand.patch # RPM Fusion patches [free/chromium-browser-privacy]: Patch500: chromium-default-user-data-dir.patch @@ -207,8 +208,17 @@ browser, ungoogled-chromium is essentially a drop-in replacement for Chromium. python3 -B %{ungoogled_chromium_root}/utils/prune_binaries.py . \ %{ungoogled_chromium_root}/pruning.list -# Apply patches from this spec. -%autopatch -p1 +# Apply patches up to #600 from this spec. +%autopatch -M600 -p1 + +# Manually apply patches that need an ifdef +%if %{freeworld} +%patch700 -p1 +%endif + +%if 0%{?fedora} >= 35 +%patch701 -p1 +%endif #Let's change the default shebang of python files. find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' {} + diff --git a/chromium-rawhide-gcc-std-max-fix.patch b/chromium-rawhide-gcc-std-max-fix.patch new file mode 100644 index 0000000..d63c00a --- /dev/null +++ b/chromium-rawhide-gcc-std-max-fix.patch @@ -0,0 +1,24 @@ +diff -up chromium-88.0.4324.182/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc.stdmaxfix chromium-88.0.4324.182/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc +--- chromium-88.0.4324.182/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc.stdmaxfix 2021-02-17 13:16:27.120283969 -0500 ++++ chromium-88.0.4324.182/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc 2021-02-17 13:17:37.951617295 -0500 +@@ -135,7 +135,7 @@ static bool SetupAlternateStackOnce() { + #else + const size_t page_mask = sysconf(_SC_PAGESIZE) - 1; + #endif +- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask; ++ size_t stack_size = (std::max(SIGSTKSZ, static_cast<long>(65536)) + page_mask) & ~page_mask; + #if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \ + defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER) + // Account for sanitizer instrumentation requiring additional stack space. +diff -up chromium-88.0.4324.182/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.stdmaxfix chromium-88.0.4324.182/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +--- chromium-88.0.4324.182/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.stdmaxfix 2021-02-17 14:39:04.556382532 -0500 ++++ chromium-88.0.4324.182/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2021-02-17 14:39:34.002519173 -0500 +@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { + // SIGSTKSZ may be too small to prevent the signal handlers from overrunning + // the alternative stack. Ensure that the size of the alternative stack is + // large enough. +- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); ++ static const unsigned kSigStackSize = std::max(static_cast<long>(16384), SIGSTKSZ); + + // Only set an alternative stack if there isn't already one, or if the current + // one is too small.