diff options
| -rwxr-xr-x | waterfox/stackrpms-diff.sh | 2 | ||||
| -rw-r--r-- | waterfox/waterfox-disable-diagnostics-color.patch | 31 | ||||
| -rw-r--r-- | waterfox/waterfox.spec | 90 |
3 files changed, 90 insertions, 33 deletions
diff --git a/waterfox/stackrpms-diff.sh b/waterfox/stackrpms-diff.sh index 851f840..0a90beb 100755 --- a/waterfox/stackrpms-diff.sh +++ b/waterfox/stackrpms-diff.sh @@ -1,3 +1,3 @@ # use this file to display the differences between chinfo upstream and my work. # usage: stackrpms/waterfox/stackrpms-diff.sh | vi - -diff -x debian -x stackrpms*.diff -x stackrpms*.sh -x *z -x .*.swp -Naur chinforpms/waterfox stackrpms/waterfox +diff -x 'README.md' -x 'bgstack15-waterfox-prefs.js' -x debian -x stackrpms*.diff -x stackrpms*.sh -x *z -x .*.swp -Naur chinforpms/waterfox stackrpms/waterfox diff --git a/waterfox/waterfox-disable-diagnostics-color.patch b/waterfox/waterfox-disable-diagnostics-color.patch new file mode 100644 index 0000000..84e8c92 --- /dev/null +++ b/waterfox/waterfox-disable-diagnostics-color.patch @@ -0,0 +1,31 @@ +From 0bf3ae1ba71921b3725c0ac2830bbe5cbdb95656 Mon Sep 17 00:00:00 2001 +From: Phantom X <PhantomX@users.noreply.github.com> +Date: Wed, 11 Dec 2019 11:45:18 -0300 +Subject: [PATCH] Disable diagnostics color output + +This dump a lot of garbage in mock logs +--- + build/moz.configure/toolchain.configure | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure +index a31acb7..10868e0 100755 +--- a/build/moz.configure/toolchain.configure ++++ b/build/moz.configure/toolchain.configure +@@ -969,12 +969,7 @@ def color_cflags(info): + # value changes to e.g. "<x>=always", exact string match may fail and + # multiple color flags could be added. So examine downstream consumers + # before adding flags to return values. +- if info.type == 'gcc' and info.version >= '4.9.0': +- return '-fdiagnostics-color' +- elif info.type == 'clang': +- return '-fcolor-diagnostics' +- else: +- return '' ++ return '-fno-diagnostics-color' + + set_config('COLOR_CFLAGS', color_cflags) + +-- +2.24.1 + diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index 41a98b0..a0467ef 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -28,7 +28,11 @@ ExcludeArch: armv7hl %global system_cairo 0 %global system_harfbuzz 1 # libvpx is too new for Waterfox 56 +%if 0%{?fedora} < 30 %global system_libvpx 1 +%else +%global system_libvpx 0 +%endif %global system_webp 1 %global system_libicu 0 %global system_jpeg 1 @@ -37,13 +41,15 @@ ExcludeArch: armv7hl %global hardened_build 1 +%global disable_elfhack 0 + %global build_with_clang 0 %ifnarch %{ix86} ppc64 s390x -%global build_with_pgo 0 +%global build_with_pgo 1 %endif %ifarch x86_64 -%global build_with_lto 0 +%global build_with_lto 1 %endif # Big endian platforms @@ -54,6 +60,7 @@ ExcludeArch: armv7hl %if 0%{?build_with_pgo} %global use_xvfb 1 %global build_tests 1 +%global disable_elfhack 1 %endif %if !0%{?run_tests} @@ -63,9 +70,8 @@ ExcludeArch: armv7hl %global debug_build 0 -%global disable_elfhack 0 - %global build_stylo 0 +# stackrpms: disable simd because it only causes problems %global build_rust_simd 0 # Set to build with pinned rust version # This enables stylo build when default rust version is not supported @@ -109,6 +115,12 @@ ExcludeArch: armv7hl %global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536) %endif +%if %{branch} == "classic" +%global channel Classic +%else +%global channel Current +%endif + %global mozappdir %{_libdir}/%{name} %global mozappdirdev %{_libdir}/%{name}-devel-%{version} %global langpackdir %{mozappdir}/langpacks @@ -146,7 +158,7 @@ BuildRequires: %{scl_buildreq} Summary: Waterfox Web browser Name: waterfox Version: 2019.12 -Release: 11.%{branch}%{?gver}%{?dist} +Release: 13.%{branch}%{?gver}%{?dist} URL: https://www.waterfox.net License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -228,6 +240,7 @@ Patch700: %{name}-nolangpacks.patch Patch701: %{name}-waterfoxdir-1.patch Patch702: %{name}-waterfoxdir-2.patch Patch703: %{name}-fix-testing-file.patch +Patch704: %{name}-disable-diagnostics-color.patch %if 0%{?system_nss} BuildRequires: pkgconfig(nspr) >= %{nspr_version} @@ -465,6 +478,7 @@ done %patch701 -p1 -b .waterfoxdir-1 %patch702 -p1 -b .waterfoxdir-2 %patch703 -p1 -b .fix-testing-file +%patch704 -p1 -b .no-diagnostics-color # Patch for big endian platforms only %if 0%{?big_endian} @@ -728,39 +742,41 @@ MOZ_LINK_FLAGS="-Wl,--no-keep-memory" %endif %endif +# Source file to improve testing +cat > %{name}-env <<EOF %ifarch %{arm} %{ix86} -echo "export RUSTFLAGS=\"-Cdebuginfo=0"\" >> .mozconfig +export RUSTFLAGS="-Cdebuginfo=0" %endif %if 0%{?build_with_clang} -echo "export LLVM_PROFDATA=\"llvm-profdata"\" >> .mozconfig -echo "export CC=clang" >> .mozconfig -echo "export CXX=clang++" >> .mozconfig -echo "export AR=\"llvm-ar\"" >> .mozconfig -echo "export NM=\"llvm-nm\"" >> .mozconfig -echo "export RANLIB=\"llvm-ranlib\"" >> .mozconfig +export LLVM_PROFDATA="llvm-profdata" +export CC=clang +export CXX=clang++ +export AR="llvm-ar" +export NM="llvm-nm" +export RANLIB="llvm-ranlib" %else -echo "export CC=gcc" >> .mozconfig -echo "export CXX=g++" >> .mozconfig -echo "export AR=\"gcc-ar\"" >> .mozconfig -echo "export NM=\"gcc-nm\"" >> .mozconfig -echo "export RANLIB=\"gcc-ranlib\"" >> .mozconfig +export CC=gcc +export CXX=g++ +export AR="gcc-ar" +export NM="gcc-nm" +export RANLIB="gcc-ranlib" %endif -echo "export CFLAGS=\"$MOZ_OPT_FLAGS\"" >> .mozconfig -echo "export CXXFLAGS=\"$MOZ_OPT_FLAGS\"" >> .mozconfig -echo "export LDFLAGS=\"$MOZ_LINK_FLAGS\"" >> .mozconfig +export CFLAGS="$MOZ_OPT_FLAGS" +export CXXFLAGS="$MOZ_OPT_FLAGS" +export LDFLAGS="$MOZ_LINK_FLAGS" -echo "export MOZ_MAKE_FLAGS=\"$MOZ_SMP_FLAGS\"" >> .mozconfig -echo "export MOZ_SERVICES_SYNC=1" >> .mozconfig -echo "export MOZ_NOSPAM=1" >> .mozconfig -echo "export STRIP=%{_prefix}/bin/true" >> .mozconfig +export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" +export MOZ_SERVICES_SYNC="1" +export MOZ_NOSPAM=1 +export STRIP=%{_prefix}/bin/true -%if 0%{?build_with_lto} -TMPDIR="$(pwd)/tmpdir" -echo "export TMPDIR=\"$TMPDIR\"" >> .mozconfig -mkdir -p "$TMPDIR" +%if 0%{?build_with_lto} || 0%{?build_with_pgo} +export TMPDIR="$(pwd)/tmpdir" +mkdir -p "\$TMPDIR" %endif +EOF %if "%{?scl_env}" != "" thispwd=$( pwd ) @@ -768,7 +784,11 @@ mkdir -p "$TMPDIR" pushd $thispwd %endif +source ./%{name}-env + %if 0%{?build_with_pgo} +mkdir -p objdir/dist/%{name}-%{branch} +ln -sf %{name}-%{branch} objdir/dist/%{name} SHELL=%{_prefix}/bin/bash GDK_BACKEND=x11 xvfb-run ./mach build %{?verbose_mach} %else SHELL=%{_prefix}/bin/bash ./mach build %{?verbose_mach} @@ -838,7 +858,7 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE20} rm -rf %{buildroot}%{_bindir}/%{name} sed -e 's,/__PREFIX__,%{_prefix},g' %{SOURCE21} \ > %{buildroot}%{_bindir}/%{name} -chmod 755 %{buildroot}%{_bindir}/waterfox +chmod 755 %{buildroot}%{_bindir}/%{name} install -p -D -m 644 %{SOURCE23} %{buildroot}%{_mandir}/man1/%{name}.1 @@ -1054,14 +1074,20 @@ fi #--------------------------------------------------------------------- %changelog -* Wed Dec 11 2019 B Stack <bgstack15@gmail.com> - 2019.12-11.classic +* Thu Dec 19 2019 B Stack <bgstack15@gmail.com> - 2019.12-13.classic - add el7 and el8 support - repackage for stackrpms - disable simd globally -* Tue Dec 10 2019 Phantom X <megaphantomx at bol dot com dot br> - 2019.12-1.classic +* Thu Dec 12 2019 Phantom X <megaphantomx at bol dot com dot br> - 2019.12-3.classic +- PGO build from COPR crashing, try to fix disabling elfhack + +* Wed Dec 11 2019 Phantom X <megaphantomx at bol dot com dot br> - 2019.12-2.classic +- PGO again + +* Wed Dec 11 2019 Phantom X <megaphantomx at bol dot com dot br> - 2019.12-1.classic - 2019.12 -- Disable broken lto for the time +- Disable broken PGO for the time - Update FreeBSD patches. No system ogg/vorbis anymore * Thu Oct 24 2019 Phantom X <megaphantomx at bol dot com dot br> - 2019.10-4.classic.20191020gitf80144e |