summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2019-07-06 22:55:42 +0000
committerB Stack <bgstack15@gmail.com>2019-07-06 22:55:42 +0000
commitff7ef50a0181c00016c5408779f382d2b2260e0a (patch)
tree09765f4a5a89750127813013a72de6606bdaf983
parentMerge branch 'obs' into 'master' (diff)
parentdisable install-dir for wf (diff)
downloadstackrpms-ff7ef50a0181c00016c5408779f382d2b2260e0a.tar.gz
stackrpms-ff7ef50a0181c00016c5408779f382d2b2260e0a.tar.bz2
stackrpms-ff7ef50a0181c00016c5408779f382d2b2260e0a.zip
Merge branch 'waterfox-bump' into 'master'
Waterfox 56.2.11 and also in OBS See merge request bgstack15/stackrpms!70
-rw-r--r--waterfox/debian/changelog17
-rw-r--r--waterfox/debian/mozconfig3
-rw-r--r--waterfox/debian/patches/series3
-rw-r--r--waterfox/waterfox-chinfo-default-prefs.js11
-rw-r--r--waterfox/waterfox-nolangpacks.patch2
-rw-r--r--waterfox/waterfox.sh.in18
-rw-r--r--waterfox/waterfox.spec77
7 files changed, 76 insertions, 55 deletions
diff --git a/waterfox/debian/changelog b/waterfox/debian/changelog
index 84d934f..cd01481 100644
--- a/waterfox/debian/changelog
+++ b/waterfox/debian/changelog
@@ -1,3 +1,20 @@
+waterfox (56.2.11-2+devuan) manual; urgency=medium
+
+ * Repackaged for obs, which required disabling rust-simd.
+
+ -- B Stack <bgstack15@gmail.com> Mon, 01 Jul 2019 13:56:48 -0400
+
+waterfox (56.2.11-1+devuan) manual; urgency=medium
+
+ * New logo
+ * Security fix for CVE-2019-11707.
+ * Fixed issues that prevented themes from AMO installing.
+ * Added some more overrides for popular websites.
+ * Fixed issues where the Gecko Media Plugins were not downloading, preventing websites that required DRM such as Netflix from working.
+ * Enabled support for JavaScript modules.
+
+ -- B Stack <bgstack15@gmail.com> Thu, 28 Jun 2019 08:12:23 -0400
+
waterfox (56.2.10.1-1+devuan) manual; urgency=medium
* Add Unity/Global Menu support
diff --git a/waterfox/debian/mozconfig b/waterfox/debian/mozconfig
index ab7112d..6448a69 100644
--- a/waterfox/debian/mozconfig
+++ b/waterfox/debian/mozconfig
@@ -26,7 +26,8 @@ ac_add_options --disable-updater
ac_add_options --enable-release
-if ! test `lsb_release -sc` = "stretch" && ! test `lsb_release -sc` = "jessie"; then
+# this line works for OBS, but not on private infrastructure.
+if ! test `lsb_release -sc` = "stretch" && ! test `lsb_release -sc` = "jessie" && ! test `lsb_release -sc` = "buster"; then
ac_add_options --enable-rust-simd # on x86 requires SSE2
fi
diff --git a/waterfox/debian/patches/series b/waterfox/debian/patches/series
index 9dd6a33..cb8ded3 100644
--- a/waterfox/debian/patches/series
+++ b/waterfox/debian/patches/series
@@ -1,3 +1,4 @@
-waterfox-install-dir.patch -p1
+# disabled for 56.2.11 from git; probably should turn on when an official (fixed) release is out
+#waterfox-install-dir.patch -p1
dont-statically-link-libstdc++.patch -p1
bgstack15.patch -p1
diff --git a/waterfox/waterfox-chinfo-default-prefs.js b/waterfox/waterfox-chinfo-default-prefs.js
index cc12293..09e8768 100644
--- a/waterfox/waterfox-chinfo-default-prefs.js
+++ b/waterfox/waterfox-chinfo-default-prefs.js
@@ -14,17 +14,18 @@ pref("browser.shell.checkDefaultBrowser", false);
pref("browser.urlbar.trimURLs", false);
pref("network.manage-offline-status", true);
pref("extensions.shownSelectionUI", true);
+pref("ui.use_unity_menubar", false);
pref("ui.SpellCheckerUnderlineStyle", 1);
pref("startup.homepage_override_url", "");
pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=https://start.fedoraproject.org/");
pref("browser.newtabpage.pinned", '[{"url":"https://start.fedoraproject.org/","title":"Fedora Project - Start Page"}]');
pref("media.gmp-gmpopenh264.provider.enabled",false);
-pref("media.gmp-gmpopenh264.autoupdate",false);
-pref("media.gmp-gmpopenh264.enabled",false);
-pref("media.gmp-gmpopenh264.enabled",false);
-pref("plugins.notifyMissingFlash", false);
+pref("media.gmp-gmpopenh264.autoupdate", false);
+pref("media.gmp-gmpopenh264.enabled", false);
+pref("media.gmp-gmpopenh264.enabled", false);
+pref("plugins.notifyMissingFlash", false);
/* See https://bugzilla.redhat.com/show_bug.cgi?id=1226489 */
-pref("browser.display.use_system_colors", false);
+pref("browser.display.use_system_colors", false);
pref("layers.use-image-offscreen-surfaces", false);
/* Allow sending credetials to all https:// sites */
pref("network.negotiate-auth.trusted-uris", "https://");
diff --git a/waterfox/waterfox-nolangpacks.patch b/waterfox/waterfox-nolangpacks.patch
index e5fc1c2..e6608cf 100644
--- a/waterfox/waterfox-nolangpacks.patch
+++ b/waterfox/waterfox-nolangpacks.patch
@@ -103,7 +103,7 @@ diff -up Waterfox-7b7aa8b4b5d17ce21072054285618fd6434e5482/browser/installer/pac
--- Waterfox-7b7aa8b4b5d17ce21072054285618fd6434e5482/browser/installer/package-manifest.in.nolangpacks 2017-12-13 19:42:11.000000000 -0200
+++ Waterfox-7b7aa8b4b5d17ce21072054285618fd6434e5482/browser/installer/package-manifest.in 2017-12-14 00:42:50.480760374 -0200
@@ -625,7 +625,6 @@
- @RESPATH@/browser/chrome/icons/default/default48.png
+ @RESPATH@/browser/chrome/icons/default/default128.png
@RESPATH@/browser/chrome/icons/default/default256.png
#endif
-@RESPATH@/browser/features/*
diff --git a/waterfox/waterfox.sh.in b/waterfox/waterfox.sh.in
index 2dd1ee8..c5c0967 100644
--- a/waterfox/waterfox.sh.in
+++ b/waterfox/waterfox.sh.in
@@ -39,12 +39,12 @@ cmdname=`basename $0`
MOZ_ARCH=$(uname -m)
case $MOZ_ARCH in
x86_64 | s390x | sparc64)
- MOZ_LIB_DIR="/usr/lib64"
- SECONDARY_LIB_DIR="/usr/lib"
+ MOZ_LIB_DIR="/__PREFIX__/lib64"
+ SECONDARY_LIB_DIR="/__PREFIX__/lib"
;;
* )
- MOZ_LIB_DIR="/usr/lib"
- SECONDARY_LIB_DIR="/usr/lib64"
+ MOZ_LIB_DIR="/__PREFIX__/lib"
+ SECONDARY_LIB_DIR="/__PREFIX__/lib64"
;;
esac
@@ -70,7 +70,7 @@ MOZ_LAUNCHER="$MOZ_DIST_BIN/run-mozilla.sh"
## Set MOZ_GRE_CONF
##
MOZ_GRE_CONF=/etc/gre.d/gre.conf
-if [ "$MOZ_LIB_DIR" == "/usr/lib64" ]; then
+if [ "$MOZ_LIB_DIR" == "/__PREFIX__/lib64" ]; then
MOZ_GRE_CONF=/etc/gre.d/gre64.conf
fi
export MOZ_GRE_CONF
@@ -98,7 +98,7 @@ export MOZ_PLUGIN_PATH
##
## Set MOZ_APP_LAUNCHER for gnome-session
##
-export MOZ_APP_LAUNCHER="/usr/bin/waterfox"
+export MOZ_APP_LAUNCHER="/__PREFIX__/bin/waterfox"
##
## Set FONTCONFIG_PATH for Xft/fontconfig
@@ -157,7 +157,7 @@ MOZILLA_DOWN=0
if ! [ $MOZ_DISABLE_LANGPACKS ] || [ $MOZ_DISABLE_LANGPACKS -eq 0 ]; then
if [ -x $MOZ_DIST_BIN/$MOZ_WATERFOX_FILE ]; then
# Is waterfox running?
- /usr/bin/pidof waterfox > /dev/null 2>&1
+ /__PREFIX__/bin/pidof waterfox > /dev/null 2>&1
MOZILLA_DOWN=$?
fi
fi
@@ -181,8 +181,8 @@ if [ $MOZILLA_DOWN -ne 0 ]; then
CURRENT_LOCALE=${CURRENT_LOCALE:-$LANG}
# Try with a local variant first, then without a local variant
- SHORTMOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*||g"`
- MOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*|-\1|g"`
+ SHORTMOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*||g" | sed "s|\..*||g"`
+ MOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*|-\1|g" | sed "s|\..*||g"`
function create_langpack_link() {
local language=$*
diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec
index 81fd4c9..f552510 100644
--- a/waterfox/waterfox.spec
+++ b/waterfox/waterfox.spec
@@ -1,6 +1,6 @@
-%global commit 3d735123dd028d1b306cfb0031a4099e3ed4f87f
+%global commit 63b480e7462482482f6609c305cd793d938f58c0
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global date 20190606
+%global date 20190625
%global with_snapshot 1
%global freebsd_rev 480450
@@ -66,24 +66,21 @@ ExcludeArch: armv7hl
%global build_tests 1
%endif
-%bcond_with debug_build
-%if %{with debug_build}
-%global debug_build 1
-%else
%global debug_build 0
-%endif
%global disable_elfhack 0
%if !0%{?build_with_clang} || 0%{?fedora} > 28
%global disable_elfhack 1
%endif
+%global build_stylo 1
+%global build_rust_simd 1
# Set to build with pinned rust version
# This enables stylo build when default rust version is not supported
# and a downgraded rust package exists
%global build_with_pinned_rust 0
-%global rust_build_min_ver 1.32
-%global rust_build_min_nover 1.33
+%global rust_build_min_ver 1.35
+%global rust_build_min_nover 1.36
%global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
%global waterfox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
@@ -149,6 +146,8 @@ ExcludeArch: armv7hl
%global system_vorbis 0
%global system_sqlite 0
%global system_libvpx 0
+%global build_stylo 0
+%global build_rust_simd 0
%if "%{?scl_env}" != ""
BuildRequires: %{scl_buildreq}
%endif
@@ -156,7 +155,7 @@ BuildRequires: %{scl_buildreq}
Summary: Waterfox Web browser
Name: waterfox
-Version: 56.2.10.1
+Version: 56.2.11
Release: 11%{?gver}%{?dist}
URL: https://www.waterfoxproject.org
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -181,7 +180,6 @@ Source23: waterfox.1
Source26: distribution.ini
# Build patches
-Patch0: firefox-install-dir.patch
Patch3: mozilla-build-arm.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3
Patch18: xulrunner-24.0-jemalloc-ppc.patch
@@ -389,12 +387,6 @@ This package contains results of tests executed during build.
rm -f browser/extensions/langpack-*.xpi
%endif
-# Build patches, can't change backup suffix from default because during build
-# there is a compare of config and js/config directories and .orig suffix is
-# ignored during this compare.
-%patch0 -p1
-
-
%patch18 -p1 -b .jemalloc-ppc
%patch20 -p1 -b .prbool
%ifarch s390
@@ -467,7 +459,7 @@ done
# 2: no apply
# 3: uncertain
for i in \
- 702179 991253 1021761 1144632 1288587 1393283 1395486 1452576 1453127 1466606 \
+ 702179 991253 1021761 1144632 1288587 1393283 1395486 1433747 1452576 1453127 1466606 \
1388744 1413143 \
1447519
do
@@ -627,11 +619,15 @@ echo "ac_add_options --without-system-icu" >> .mozconfig
echo "ac_add_options --disable-ion" >> .mozconfig
%endif
-%if 0%{?build_with_pinned_rust}
+%if 0%{?build_stylo}
echo "ac_add_options --enable-stylo=build" >> .mozconfig
-echo "ac_add_options --enable-rust-simd" >> .mozconfig
%else
echo "ac_add_options --disable-stylo" >> .mozconfig
+%endif
+
+%if 0%{?build_rust_simd}
+echo "ac_add_options --enable-rust-simd" >> .mozconfig
+%else
echo "ac_add_options --disable-rust-simd" >> .mozconfig
%endif
@@ -663,7 +659,7 @@ echo "Generate big endian version of config/external/icu/data/icud58l.dat"
# Update the various config.guess to upstream release for aarch64 support
find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';'
-RPM_SMP_MFLAGS_NCPUS=$(echo %{_smp_mflags} | sed 's|-j||')
+RPM_SMP_MFLAGS_NCPUS=%(echo %{_smp_mflags} | sed 's|-j||')
RPM_NCPUS=1
# On x86 architectures, Mozilla can build up to 4 jobs at once in parallel,
@@ -700,6 +696,9 @@ MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security
# Workaround for mozbz#1531309
MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | sed -e 's/-Werror=format-security//')
%endif
+%if 0%{?fedora} > 30
+MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fpermissive"
+%endif
%if 0%{?build_with_clang}
# Fedora's default compiler flags conflict with what clang supports
MOZ_OPT_FLAGS="$(echo "$MOZ_OPT_FLAGS" | sed -e 's/-fstack-clash-protection//')"
@@ -773,7 +772,7 @@ export LIBDIR='%{_libdir}'
export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
export MOZ_SERVICES_SYNC="1"
export MOZ_NOSPAM=1
-export STRIP=/bin/true
+export STRIP=%{_prefix}/bin/true
%if 0%{?build_with_lto}
export TMPDIR="$(pwd)/tmpdir"
mkdir -p "$TMPDIR"
@@ -786,9 +785,9 @@ mkdir -p "$TMPDIR"
%endif
%if 0%{?build_with_pgo}
-SHELL=/usr/bin/bash GDK_BACKEND=x11 xvfb-run ./mach build %{?verbose_mach}
+SHELL=%{_prefix}/bin/bash GDK_BACKEND=x11 xvfb-run ./mach build %{?verbose_mach}
%else
-SHELL=/usr/bin/bash ./mach build %{?verbose_mach}
+SHELL=%{_prefix}/bin/bash ./mach build %{?verbose_mach}
%endif
%if "%{?scl_env}" != ""
@@ -798,8 +797,8 @@ EOFSCL
%if %{?run_tests}
%if 0%{?system_nss}
-ln -s /usr/bin/certutil objdir/dist/bin/certutil
-ln -s /usr/bin/pk12util objdir/dist/bin/pk12util
+ln -s %{_prefix}/bin/certutil objdir/dist/bin/certutil
+ln -s %{_prefix}/bin/pk12util objdir/dist/bin/pk12util
%endif
mkdir test_results
@@ -851,7 +850,8 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE20}
# set up the waterfox start script
rm -rf %{buildroot}%{_bindir}/waterfox
-cat %{SOURCE21} > %{buildroot}%{_bindir}/waterfox
+sed -e 's,/__PREFIX__,%{_prefix},g' %{SOURCE21} \
+ > %{buildroot}%{_bindir}/waterfox
chmod 755 %{buildroot}%{_bindir}/waterfox
install -p -D -m 644 %{SOURCE23} %{buildroot}%{_mandir}/man1/waterfox.1
@@ -859,7 +859,7 @@ install -p -D -m 644 %{SOURCE23} %{buildroot}%{_mandir}/man1/waterfox.1
rm -f %{buildroot}/%{mozappdir}/waterfox-config
rm -f %{buildroot}/%{mozappdir}/update-settings.ini
-for s in 16 22 24 32 48 256; do
+for s in 16 22 24 32 48 64 128 256; do
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps
cp -p browser/branding/unofficial/default${s}.png \
%{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/waterfox.png
@@ -889,7 +889,7 @@ cat > %{buildroot}%{_metainfodir}/%{name}.appdata.xml <<EOF
</p>
<!-- FIXME: Needs another couple of paragraphs -->
</description>
- <url type="homepage">http://www.mozilla.org/</url>
+ <url type="homepage">https://www.waterfox.net/</url>
<!-- FIXME: change this to an upstream email address for spec updates
<updatecontact>someone_who_cares@upstream_project.org</updatecontact>
-->
@@ -1039,17 +1039,11 @@ fi
%dir %{langpackdir}
%endif
%{mozappdir}/browser/omni.ja
-%{mozappdir}/browser/icons
%{mozappdir}/chrome.manifest
%{mozappdir}/run-mozilla.sh
%{mozappdir}/application.ini
%exclude %{mozappdir}/removed-files
-%{_datadir}/icons/hicolor/16x16/apps/waterfox.png
-%{_datadir}/icons/hicolor/22x22/apps/waterfox.png
-%{_datadir}/icons/hicolor/24x24/apps/waterfox.png
-%{_datadir}/icons/hicolor/256x256/apps/waterfox.png
-%{_datadir}/icons/hicolor/32x32/apps/waterfox.png
-%{_datadir}/icons/hicolor/48x48/apps/waterfox.png
+%{_datadir}/icons/hicolor/*/apps/waterfox.png
%{mozappdir}/*.so
%{mozappdir}/gtk2/*.so
%{mozappdir}/defaults/pref/channel-prefs.js
@@ -1073,10 +1067,17 @@ fi
#---------------------------------------------------------------------
%changelog
-* Thu Jun 13 2019 B Stack <bgstack15@gmail.com> - 56.2.10.1-11.20190606git3d73512
+* Thu Jun 27 2019 B Stack <bgstack15@gmail.com> - 56.2.11-11.20190625git63b480e
- add el7 support, which uses provided libs for the most part, and disables lto
- repackage for stackrpms
-- remove ogg_version 1.3.2 requirement for fc28 which is ol
+
+* Tue Jun 25 2019 Phantom X <megaphantomx at bol dot com dot br> - 56.2.11-2.20190625git63b480e
+- New snapshot
+- stylo and rust-simd switches
+
+* Fri Jun 21 2019 Phantom X <megaphantomx at bol dot com dot br> - 56.2.11-1.20190621gitaa2e404
+- New release/snapshot
+- Set ui.use_unity_menubar to false in defaults file
* Fri Jun 07 2019 Phantom X <megaphantomx at bol dot com dot br> - 56.2.10.1-1.20190606git3d73512
- New snapshot
bgstack15