From 8bc6287eb941f98364d43cb80213e4f813c5bb98 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Fri, 10 Nov 2023 14:56:28 +0100 Subject: [PATCH 1/2] We need to build dump_syms into separate vendored sources - to avoid collision with cbindgen --- firefox.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/firefox.spec b/firefox.spec index 8d1209d..4407487 100644 --- a/firefox.spec +++ b/firefox.spec @@ -40,7 +40,7 @@ ExcludeArch: i686 # https://bugzilla.redhat.com/show_bug.cgi?id=1951606 %global enable_mozilla_crashreporter 0 %ifarch x86_64 %{ix86} -%global enable_mozilla_crashreporter 0 +%global enable_mozilla_crashreporter 1 %endif %if %{build_with_asan} %global enable_mozilla_crashreporter 0 @@ -711,8 +711,8 @@ export CBINDGEN=/usr/bin/cbindgen %endif %if %{enable_mozilla_crashreporter} -mkdir -p my_rust_vendor -cd my_rust_vendor +mkdir -p my_rust_vendor_dump_syms +cd my_rust_vendor_dump_syms tar xf %{SOURCE3} mkdir -p .cargo cat > .cargo/config < Date: Mon, 13 Nov 2023 09:04:53 +0100 Subject: [PATCH 2/2] Enable crash reporter again --- firefox.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/firefox.spec b/firefox.spec index 4407487..76e922a 100644 --- a/firefox.spec +++ b/firefox.spec @@ -169,7 +169,7 @@ ExcludeArch: i686 Summary: Mozilla Firefox Web browser Name: firefox Version: 119.0.1 -Release: 1%{?pre_tag}%{?dist} +Release: 2%{?pre_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz @@ -1153,7 +1153,7 @@ fi #--------------------------------------------------------------------- %changelog -* Fri Nov 10 2023 Martin Stransky - 119.0.1-1 +* Fri Nov 10 2023 Martin Stransky - 119.0.1-2 - Updated to 119.0.1 * Tue Nov 07 2023 Martin Stransky - 119.0-5