WIP: waterfox-56.2.9 with some fixes

   move the hard-coded rust-simd option from the mozconfig
   to the spec, which in turn will modify the mozconfig.

2 files changed, 11 insertions, 14 deletions

diff --git a/waterfox/waterfox-mozconfig b/waterfox/waterfox-mozconfig
index f362cbc..df66111 100644
--- a/waterfox/waterfox-mozconfig
+++ b/waterfox/waterfox-mozconfig
@@ -35,8 +35,6 @@ ac_add_options --disable-profiling
 ac_add_options --disable-signmar
 ac_add_options --disable-verify-mar
 
-ac_add_options --disable-rust-simd
-
 ac_add_options --with-app-name=waterfox
 ac_add_options --with-app-basename=Waterfox
 ac_add_options --with-branding=browser/branding/unofficial
diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec
index 775293f..77ec533 100644
--- a/waterfox/waterfox.spec
+++ b/waterfox/waterfox.spec
@@ -1,6 +1,6 @@
-%global commit eeb3b0b1fd0e42ea902f3f3731f1265597e6627d
+%global commit cd00fc4ae708bccfc6bebeaedf803845ec9b5e20
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global date 20190411
+%global date 20190416
 %global with_snapshot 1
 
 %global freebsd_rev 480450
@@ -157,8 +157,8 @@ BuildRequires: %{scl_buildreq}
 
 Summary:        Waterfox Web browser
 Name:           waterfox
-Version:        56.2.8
-Release:        12%{?gver}%{?dist}
+Version:        56.2.9
+Release:        11%{?gver}%{?dist}
 URL:            https://www.waterfoxproject.org
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 
@@ -305,8 +305,8 @@ BuildRequires:  yasm
 BuildRequires:  llvm
 BuildRequires:  llvm-devel
 BuildRequires:  clang
-%if 0%{?build_with_clang}
 BuildRequires:  clang-libs
+%if 0%{?build_with_clang}
 BuildRequires:  lld
 BuildRequires:  libstdc++-static
 %if 0%{?build_with_pgo}
@@ -632,8 +632,10 @@ echo "ac_add_options --disable-ion" >> .mozconfig
 
 %if 0%{?build_with_pinned_rust}
 echo "ac_add_options --enable-stylo=build" >> .mozconfig
+echo "ac_add_options --enable-rust-simd" >> .mozconfig
 %else
 echo "ac_add_options --disable-stylo" >> .mozconfig
+echo "ac_add_options --disable-rust-simd" >> .mozconfig
 %endif
 
 # Remove executable bit to make brp-mangle-shebangs happy.
@@ -643,7 +645,6 @@ chmod -x third_party/rust/itertools/src/lib.rs
 #---------------------------------------------------------------------
 
 %build
-
 %if 0%{?system_sqlite}
 # Do not proceed with build if the sqlite require would be broken:
 # make sure the minimum requirement is non-empty, ...
@@ -717,7 +718,7 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | sed -e 's/-O2//' -e 's/-O3//')
 export MOZ_DEBUG_FLAGS=" "
 %endif
 %if 0%{?build_with_lto}
-MOZ_OPT_FLAGS="$(echo "$MOZ_OPT_FLAGS" | sed -e 's/-O2/-O3/' -e 's/-g/-g1/')"
+MOZ_OPT_FLAGS="$(echo "$MOZ_OPT_FLAGS" | sed -e 's/-O2/-O3/' -e 's/ -g\b/ -g1/')"
 %if 0%{?build_with_clang}
 RPM_FLTO_FLAGS="-flto=thin -Wl,--thinlto-jobs=$RPM_NCPUS"
 %else
@@ -727,14 +728,14 @@ MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS $RPM_FLTO_FLAGS"
 MOZ_LINK_FLAGS="$MOZ_OPT_FLAGS"
 %endif
 %ifarch s390
-MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | sed -e 's/-g/-g1/')
+MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | sed -e 's/ -g\b/ -g1/')
 # If MOZ_DEBUG_FLAGS is empty, waterfox's build will default it to "-g" which
 # overrides the -g1 from line above and breaks building on s390
 # (OOM when linking, rhbz#1238225)
 export MOZ_DEBUG_FLAGS=" "
 %endif
 %ifarch %{arm}
-MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | sed -e 's/-g/-g0/')
+MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | sed -e 's/ -g\b/-g0 /')
 export MOZ_DEBUG_FLAGS=" "
 %endif
 %if !0%{?build_with_clang}
@@ -1075,10 +1076,8 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
-* Mon Apr 23 2019 B Stack <bgstack15@gmail.com> - 56.2.8-12.20190411giteeb3b0b
+* Thu May 09 2019 B Stack <bgstack15@gmail.com> - 56.2.9-11.20190416gitcd00fc4
 - add el7 support, which uses provided libs for the most part, and disables lto
-
-* Mon Apr 15 2019 B Stack <bgstack15@gmail.com> - 56.2.8.1-4.20190411giteeb3b0b
 - repackage for stackrpms
 
 * Fri Apr 12 2019 Phantom X <megaphantomx at bol dot com dot br> - 56.2.8-2.20190411giteeb3b0b