Merge branch 'waterfox-bump' into 'master'

Waterfox bump to 56.2.4

See merge request bgstack15/stackrpms!11

5 files changed, 60 insertions, 5 deletions

diff --git a/waterfox/.gitignore b/waterfox/.gitignore
new file mode 100644
index 0000000..44c08e1
--- /dev/null
+++ b/waterfox/.gitignore
@@ -0,0 +1,3 @@
+/FreeBSD-*.patch
+/wf-*.patch
+!/wf-pull-547.patch
diff --git a/waterfox/waterfox-FreeBSD-patches-r478244.tar.xz b/waterfox/waterfox-FreeBSD-patches-r478244.tar.xz
deleted file mode 100644
index ecccbb6..0000000
--- a/waterfox/waterfox-FreeBSD-patches-r478244.tar.xz
+++ /dev/null
diff --git a/waterfox/waterfox-FreeBSD-patches-r480450.tar.xz b/waterfox/waterfox-FreeBSD-patches-r480450.tar.xz
new file mode 100644
index 0000000..cf2ed52
--- /dev/null
+++ b/waterfox/waterfox-FreeBSD-patches-r480450.tar.xz
diff --git a/waterfox/waterfox-FreeBSD-patches-snapshot.sh b/waterfox/waterfox-FreeBSD-patches-snapshot.sh
new file mode 100755
index 0000000..b94f850
--- /dev/null
+++ b/waterfox/waterfox-FreeBSD-patches-snapshot.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -e
+
+module=$(basename "$0" -snapshot.sh)
+snaproot="https://svn.freebsd.org/ports/head/www/waterfox/files"
+
+tmp=$(mktemp -d)
+
+trap cleanup EXIT
+cleanup() {
+  set +e
+  ([ -z "${tmp}" ] || [ ! -d "${tmp}" ]) || rm -rf "${tmp}"
+}
+
+unset CDPATH
+unset SNAP_COOPTS
+pwd=$(pwd)
+snap=${snap:-$(date +%Y%m%d)}
+
+[ "${snap}" = "$(date +%Y%m%d)" ] || SNAP_COOPTS="-r {$snap}"
+if [ -n "${rev}" ] ; then
+  SNAP_COOPTS="-r ${rev}"
+  snap="${rev}"
+fi
+
+pushd "${tmp}"
+  svn co ${SNAP_COOPTS} ${snaproot} ${module}
+  rev=$(svnversion "${module}")
+  rev="${rev//[!0-9]/}"
+  mv "${module}" "${module}-r${rev}"
+  tar -Jcf "${pwd}/${module}-r${rev}.tar.xz" --exclude=.svn "${module}-r${rev}"
+popd >/dev/null
diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec
index d45d31f..70248d7 100644
--- a/waterfox/waterfox.spec
+++ b/waterfox/waterfox.spec
@@ -1,9 +1,9 @@
-%global commit 432b42717b0678a933f9d0731f02f9d1d32bdec2
+%global commit 9c2c0e0c5593abb40b6093d9b2a28b294b2b0ce9
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global date 20180911
+%global date 20181008
 %global with_snapshot 1
 
-%global freebsd_rev 478244
+%global freebsd_rev 480450
 %global freebsd_root %{name}-FreeBSD-patches-r%{freebsd_rev}
 
 %if 0%{?with_snapshot}
@@ -69,6 +69,11 @@
 # Build as a debug package?
 %global debug_build       0
 
+%global disable_elfhack       0
+%if 0%{?fedora} > 28
+%global disable_elfhack       1
+%endif
+
 %global default_bookmarks_file  %{_datadir}/bookmarks/default-bookmarks.html
 %global waterfox_app_id  \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 # Minimal required versions
@@ -118,7 +123,7 @@
 
 Summary:        Waterfox Web browser
 Name:           waterfox
-Version:        56.2.3
+Version:        56.2.4
 Release:        2%{?gver}%{?dist}
 URL:            https://www.waterfoxproject.org
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -286,6 +291,7 @@ BuildRequires:  xorg-x11-server-Xvfb
 %endif
 BuildRequires:  rust
 BuildRequires:  cargo
+BuildRequires:  clang-devel
 
 Obsoletes:      mozilla <= 37:1.7.13
 Provides:       webclient
@@ -388,7 +394,7 @@ done
 # 2: no apply
 # 3: uncertain
 for i in \
-  702179 991253 1021761 1144632 1288587 1452576 1425930 1469914 1469309 1470260 1472925 \
+  702179 991253 1021761 1144632 1288587 1452576 \
   1388744 1413143 \
   1447519
 do
@@ -460,6 +466,10 @@ echo "ac_add_options --enable-system-ffi" >> .mozconfig
 echo "ac_add_options --disable-elf-hack" >> .mozconfig
 %endif
 
+%if 0%{?disable_elfhack}
+echo "ac_add_options --disable-elf-hack" >> .mozconfig
+%endif
+
 %if %{?alsa_backend}
 echo "ac_add_options --enable-alsa" >> .mozconfig
 %endif
@@ -893,6 +903,15 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Sun Oct 14 2018 Phantom X <megaphantomx at bol dot com dot br> - 56.2.4-1.20181008git9c2c0e0
+- New release/snapshot
+
+* Mon Oct 08 2018 Phantom X <megaphantomx at bol dot com dot br> - 56.2.3-2.20180911git432b427
+- Some spec cleanups adapted from Fedora Firefox
+- BR: clang-devel
+- Disable elfhack for Fedora 29+
+- Remove old gcc 7.2 fix
+
 * Fri Sep 14 2018 Phantom X <megaphantomx at bol dot com dot br> - 56.2.3-1.20180911git432b427
 - New release/snapshot