waterfox 2020.06 rpm rc1

1 files changed, 220 insertions, 0 deletions

diff --git a/waterfox/stackrpms-2020-06-04.diff b/waterfox/stackrpms-2020-06-04.diff
new file mode 100644
index 0000000..5d8da37
--- /dev/null
+++ b/waterfox/stackrpms-2020-06-04.diff
@@ -0,0 +1,220 @@
+Message: This is the differences between the chinforpms srpm tree and stackrpms srpm tree. The cubeb file appears to have never been cleaned up by PhantomX.
+Date: 2020-06-04
+Author: bgstack15
+diff -x README.md -x bgstack15-waterfox-prefs.js -x debian -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/distribution.ini stackrpms/waterfox/distribution.ini
+--- chinforpms/waterfox/distribution.ini	2020-03-16 14:17:56.196146446 -0400
++++ stackrpms/waterfox/distribution.ini	2020-03-04 16:08:26.578716330 -0500
+@@ -1,9 +1,9 @@
+ [Global]
+-id=chinforpms
++id=stackrpms
+ version=1.0
+ about=Waterfox _BRANCH_ for Fedora
+ 
+ [Preferences]
+-app.distributor=chinforpms
+-app.distributor.channel=chinforpms
+-app.partner.fedora=chinforpms
++app.distributor=stackrpms
++app.distributor.channel=stackrpms
++app.partner.fedora=stackrpms
+diff -x README.md -x bgstack15-waterfox-prefs.js -x debian -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/.gitignore stackrpms/waterfox/.gitignore
+--- chinforpms/waterfox/.gitignore	2020-03-16 14:17:56.196146446 -0400
++++ stackrpms/waterfox/.gitignore	2020-03-04 16:08:26.575716294 -0500
+@@ -1 +1,2 @@
+-/waterfox-gh-*.patch
++/FreeBSD-*.patch
++/wf-*.patch
+diff -x README.md -x bgstack15-waterfox-prefs.js -x debian -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/waterfox-cubeb-build.patch stackrpms/waterfox/waterfox-cubeb-build.patch
+--- chinforpms/waterfox/waterfox-cubeb-build.patch	2020-03-16 14:17:56.198146471 -0400
++++ stackrpms/waterfox/waterfox-cubeb-build.patch	1969-12-31 19:00:00.000000000 -0500
+@@ -1,8 +0,0 @@
+---- Waterfox-56.0.2/media/libcubeb/src/moz.build.cubebbuild	2018-01-05 16:39:00.921101411 -0200
+-+++ Waterfox-56.0.2/media/libcubeb/src/moz.build	2018-01-05 16:40:44.948718748 -0200
+-@@ -89,4 +89,4 @@ CFLAGS += CONFIG['MOZ_ALSA_CFLAGS']
+- CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS']
+- 
+- # We allow warnings for third-party code that can be updated from upstream.
+--AllowCompilerWarnings()
+-+ALLOW_COMPILER_WARNINGS = True
+diff -x README.md -x bgstack15-waterfox-prefs.js -x debian -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/waterfox-mozconfig stackrpms/waterfox/waterfox-mozconfig
+--- chinforpms/waterfox/waterfox-mozconfig	2020-03-16 14:17:56.198146471 -0400
++++ stackrpms/waterfox/waterfox-mozconfig	2020-03-04 16:08:26.581716366 -0500
+@@ -35,4 +35,4 @@
+ ac_add_options --with-app-name=waterfox
+ ac_add_options --with-app-basename=Waterfox
+ ac_add_options --with-branding=browser/branding/unofficial
+-ac_add_options --with-distribution-id=chinforpms
++ac_add_options --with-distribution-id=stackrpms
+diff -x README.md -x bgstack15-waterfox-prefs.js -x debian -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/waterfox.spec stackrpms/waterfox/waterfox.spec
+--- chinforpms/waterfox/waterfox.spec	2020-06-04 13:46:08.786538725 -0400
++++ stackrpms/waterfox/waterfox.spec	2020-06-04 13:49:13.091692264 -0400
+@@ -70,7 +70,8 @@
+ %global debug_build       0
+ 
+ %global build_stylo       0
+-%global build_rust_simd   1
++# 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
+ # and a downgraded rust package exists
+@@ -125,10 +126,38 @@
+ 
+ %global build_langpacks         1
+ 
++# additional repos to get python27 and devtoolset-7
++# for el6 and el7: Software Collection;, for x86_64 only
++# http://mirror.centos.org/centos/6/sclo/x86_64/rh/
++# http://mirror.centos.org/centos/6/sclo/x86_64/sclo/
++# for el6.i386:
++# https://copr-be.cloud.fedoraproject.org/results/ewdurbin/pythons-el6/epel-6-$basearch/
++# https://copr-be.cloud.fedoraproject.org/results/mlampe/devtoolset-7/epel-6-$basearch/
++%define scl_env %{nil}
++%define scl_buildreq coreutils
++%if 0%{?rhel} == 7
++%define scl_env devtoolset-7
++%define scl_buildreq devtoolset-7-toolchain
++%global system_nss        0
++%global system_hunspell   0
++%global system_libevent   0
++%global system_sqlite     0
++%global system_libvpx     0
++%global build_stylo       0
++%global build_rust_simd   0
++%global build_with_pgo    0
++%if "%{?scl_env}" != ""
++BuildRequires: %{scl_buildreq}
++%endif
++%endif
++%if 0%{?rhel} >= 7
++%global system_webp       0
++%endif
++
+ Summary:        Waterfox Web browser
+ Name:           waterfox
+ Version:        2020.06
+-Release:        1%{?branch:.%{branch}}%{?gver}%{?dist}
++Release:        11%{?branch:.%{branch}}%{?gver}%{?dist}
+ URL:            https://www.waterfox.net
+ License:        MPLv1.1 or GPLv2+ or LGPLv2+
+ 
+@@ -148,7 +177,7 @@
+ Source602:      patch-bug1381815
+ 
+ Source10:       waterfox-mozconfig
+-Source12:       waterfox-chinfo-default-prefs.js
++Source12:       bgstack15-%{name}-prefs.js
+ Source20:       waterfox.desktop
+ Source21:       waterfox.sh.in
+ Source23:       waterfox.1
+@@ -267,21 +296,20 @@
+ BuildRequires:  yasm
+ BuildRequires:  llvm
+ BuildRequires:  llvm-devel
+-# clang is needed even with gcc
++%if !0%{?el7}
+ BuildRequires:  clang
++BuildRequires:  clang-libs
+ BuildRequires:  clang-devel
+-%if 0%{?build_with_clang}
+ BuildRequires:  lld
+ BuildRequires:  libstdc++-static
++%endif
+ %if 0%{?build_with_pgo}
+ BuildRequires:  compiler-rt
+ %endif
+-%else
+ %if 0%{?fedora} > 30
+ BuildRequires:  binutils-gold
+ %endif
+ BuildRequires:  gcc-c++
+-%endif
+ BuildRequires:  bash
+ BuildRequires:  patchutils
+ 
+@@ -300,7 +328,9 @@
+ Requires:       nss >= 3.29.1-2.1
+ 
+ BuildRequires:  desktop-file-utils
++%if 0%{?rhel} != 8
+ BuildRequires:  system-bookmarks
++%endif
+ %if 0%{?system_sqlite}
+ BuildRequires:  pkgconfig(sqlite3) >= %{sqlite_version}
+ Requires:       sqlite >= %{sqlite_build_version}
+@@ -758,6 +788,12 @@
+ %endif
+ EOF
+ 
++%if "%{?scl_env}" != ""
++   thispwd=$( pwd )
++   scl enable %{scl_env} /bin/bash << 'EOFSCL'
++   pushd $thispwd
++%endif
++
+ source ./%{name}-env
+ 
+ %if 0%{?build_with_pgo}
+@@ -768,6 +804,11 @@
+ SHELL=%{_prefix}/bin/bash ./mach build %{?verbose_mach}
+ %endif
+ 
++%if "%{?scl_env}" != ""
++   popd || :
++EOFSCL
++%endif
++
+ %if %{?run_tests}
+ %if 0%{?system_nss}
+ ln -s %{_prefix}/bin/certutil objdir/dist/bin/certutil
+@@ -801,9 +842,16 @@
+ #---------------------------------------------------------------------
+ 
+ %install
++%if "%{?scl_env}" != ""
++   thispwd=$( pwd )
++   scl enable %{scl_env} /bin/bash << 'EOFSCL'
++   pushd $thispwd
++%endif
+ 
++%if ! 0%{?rhel} >= 8
+ # set up our default bookmarks
+ cp -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/en-US/locale/browser/bookmarks.html
++%endif
+ 
+ # Make sure locale works for langpacks
+ cat > objdir/dist/bin/browser/defaults/preferences/firefox-l10n.js << EOF
+@@ -948,6 +996,11 @@
+ rm -f %{buildroot}%{mozappdirdev}/sdk/lib/libxul.so
+ #---------------------------------------------------------------------
+ 
++%if "%{?scl_env}" != ""
++   popd || :
++EOFSCL
++%endif
++
+ # Moves defaults/preferences to browser/defaults/preferences
+ %pretrans -p <lua>
+ require 'posix'
+@@ -990,7 +1043,7 @@
+ %license %{mozappdir}/LICENSE
+ %{mozappdir}/browser/chrome
+ %{mozappdir}/browser/chrome.manifest
+-%{mozappdir}/browser/defaults/preferences/*-default-prefs.js
++%{mozappdir}/browser/defaults/preferences/*.js
+ %{mozappdir}/browser/features
+ %{mozappdir}/distribution/distribution.ini
+ # That's Windows only
+@@ -1031,6 +1084,11 @@
+ #---------------------------------------------------------------------
+ 
+ %changelog
++* Thu Jun 04 2020 B Stack <bgstack15@gmail.com> - 2020.06-11.classic
++- add el7 and el8 support
++- repackage for stackrpms
++- disable simd globally
++
+ * Thu Jun 04 2020 Phantom X <megaphantomx at bol dot com dot br> - 2020.06-1.classic
+ - 2020.06
+