summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--waterfox/debian/changelog15
-rw-r--r--waterfox/debian/patches/45130a237874aaa96bdf23ee107b0be0e0a2afab.patch25
-rw-r--r--waterfox/debian/patches/series1
-rw-r--r--waterfox/debian/waterfox.dsc14
-rw-r--r--waterfox/debian/waterfox_devuan.dsc14
-rw-r--r--waterfox/waterfox.spec37
6 files changed, 56 insertions, 50 deletions
diff --git a/waterfox/debian/changelog b/waterfox/debian/changelog
index 0807cae..3c6f510 100644
--- a/waterfox/debian/changelog
+++ b/waterfox/debian/changelog
@@ -1,3 +1,18 @@
+waterfox (2020.02-1+devuan) obs; urgency=medium
+
+ - From blog release notes
+ - Classic branch
+ * Fixed library requirements on Linux
+ * Various media library updates
+ * Added DNS resolution to webextensions api
+ * Updated timezone data for internationalization functions
+ * Enabled unprefixed Fullscreen API
+ * Various website rending issues fixed (Kinguin, Intel, Epic Games and others)
+ * Fixed problems related with uBO html filters
+ * Updated en-US dictionary
+
+ -- B Stack <bgstack15@gmail.com> Tue, 18 Feb 2020 15:33:11 -0500
+
waterfox (2020.01-1+devuan) obs; urgency=medium
- From blog release notes
diff --git a/waterfox/debian/patches/45130a237874aaa96bdf23ee107b0be0e0a2afab.patch b/waterfox/debian/patches/45130a237874aaa96bdf23ee107b0be0e0a2afab.patch
deleted file mode 100644
index 47bf71b..0000000
--- a/waterfox/debian/patches/45130a237874aaa96bdf23ee107b0be0e0a2afab.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Source: https://github.com/MrAlex94/Waterfox/commit/45130a237874aaa96bdf23ee107b0be0e0a2afab?diff=unified#diff-9517c6ca41ff7c9627f13ff83c2f7dce
-Date: 2020-01-30 09:22:35 -0500
-diff -x '*.swp' -x '*.orig' -x '*.diff' -x '*debhelper*' -Naur 1/js/xpconnect/src/XPCVariant.cpp 2/js/xpconnect/src/XPCVariant.cpp
---- 1/js/xpconnect/src/XPCVariant.cpp 2020-01-09 15:53:52.000000000 -0500
-+++ 2/js/xpconnect/src/XPCVariant.cpp 2020-01-30 09:14:14.645389196 -0500
-@@ -180,7 +180,7 @@
- type = tDbl;
- } else if (val.isBoolean()) {
- type = tBool;
-- } else if (val.isUndefined() || val.isSymbol() || val.isBigInt()) {
-+ } else if (val.isUndefined() || val.isSymbol()) {
- state = tVar;
- break;
- } else if (val.isNull()) {
-@@ -275,8 +275,8 @@
- mData.SetFromBool(val.toBoolean());
- return true;
- }
-- // We can't represent symbol or BigInt on C++ side, so pretend it is void.
-- if (val.isUndefined() || val.isSymbol() || val.isBigInt()) {
-+ // We can't represent symbol on C++ side, so pretend it is void.
-+ if (val.isUndefined() || val.isSymbol()) {
- mData.SetToVoid();
- return true;
- }
diff --git a/waterfox/debian/patches/series b/waterfox/debian/patches/series
index 9c29521..cb8ded3 100644
--- a/waterfox/debian/patches/series
+++ b/waterfox/debian/patches/series
@@ -2,4 +2,3 @@
#waterfox-install-dir.patch -p1
dont-statically-link-libstdc++.patch -p1
bgstack15.patch -p1
-45130a237874aaa96bdf23ee107b0be0e0a2afab.patch -p1
diff --git a/waterfox/debian/waterfox.dsc b/waterfox/debian/waterfox.dsc
deleted file mode 100644
index b30ce9d..0000000
--- a/waterfox/debian/waterfox.dsc
+++ /dev/null
@@ -1,14 +0,0 @@
-Format: 3.0 (quilt)
-Source: waterfox
-Binary: waterfox
-Architecture: any
-Version: 56.2.4-0
-Maintainer: hawkeye116477 <hawkeye116477@gmail.com>
-Homepage: https://www.waterfox.net/
-Standards-Version: 3.9.7
-Build-Depends: debhelper (>= 9), autoconf2.13, libgtk-3-dev (>= 3.4), libgconf2-dev, libdbus-glib-1-dev, libpulse-dev, libasound2-dev, yasm (>= 1.1), build-essential, libgtk2.0-dev (>= 2.10), libxt-dev, python2.7, python-minimal (>= 2.6.6-13~), python-ply, zip, unzip, ccache, cargo (>= 0.25), libgl1-mesa-dev, libnotify-dev, binutils-avr, libfreetype6-dev, libfontconfig1-dev, pkg-config, libtinfo-dev, clang-6.0 | clang-4.0, llvm-6.0-dev | llvm-4.0-dev, rustc (>= 1.24), libxext-dev, libglib2.0-dev (>= 2.16.0), libpango1.0-dev, libstartup-notification0-dev, libcurl4-openssl-dev, libiw-dev, mesa-common-dev, libxrender-dev, dbus-x11, xvfb, libx11-dev, libx11-xcb-dev, libfile-fcntllock-perl, apt-utils, locales, autotools-dev, libjpeg-dev, zlib1g-dev, libreadline-dev, dpkg-dev (>= 1.16.1.1~), libevent-dev (>= 1.4.1), libjsoncpp-dev, xfonts-base, xauth, lsb-release
-Package-List:
- waterfox deb web optional arch=any
-Files:
- 0000000000000000000000000000000 1 waterfox.orig.tar.gz
- 0000000000000000000000000000000 1 waterfox.debian.tar.gz
diff --git a/waterfox/debian/waterfox_devuan.dsc b/waterfox/debian/waterfox_devuan.dsc
new file mode 100644
index 0000000..a488270
--- /dev/null
+++ b/waterfox/debian/waterfox_devuan.dsc
@@ -0,0 +1,14 @@
+Format: 3.0 (quilt)
+Source: waterfox
+Binary: waterfox
+Architecture: any
+Version: 2020.02-1+devuan
+Maintainer: B Stack <bgstack15@gmail.com>
+Homepage: https://www.waterfox.net/
+Standards-Version: 3.9.7
+Build-Depends: debhelper (>= 12), autoconf2.13, autotools-dev, binutils-avr, cargo (>= 0.35), ccache, clang-6.0, dpkg-dev (>= 1.16.1.1~), libasound2-dev, libbz2-dev, libclang-6.0-dev, libdbus-glib-1-dev, libevent-dev (>= 1.4.1), libgconf2-dev, libglib2.0-dev (>= 2.16.0), libgtk2.0-dev (>= 2.10), libgtk-3-dev, libiw-dev, libjpeg-dev, libjsoncpp-dev, libnotify-dev, libreadline-dev, libstartup-notification0-dev, libtinfo-dev, libx11-dev, libx11-xcb-dev, libxt-dev, llvm-6.0-dev, locales, lsb-release, python2.7, python-minimal (>= 2.6.6-13~), python-ply, rustc (>= 1.34), unzip, xauth, xfonts-base, xvfb, yasm (>= 1.1), zip, zlib1g-dev
+Package-List:
+ waterfox deb web optional arch=any
+Files:
+ 0000000000000000000000000000000 1 waterfox.orig.tar.gz
+ 0000000000000000000000000000000 1 waterfox.debian.tar.gz
diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec
index 8ef6b02..6c07fa6 100644
--- a/waterfox/waterfox.spec
+++ b/waterfox/waterfox.spec
@@ -1,6 +1,6 @@
-%global commit 45130a237874aaa96bdf23ee107b0be0e0a2afab
+%global commit df884bb1dbafb2c23595ec74b0fd74bc92e5c3c7
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global date 20200110
+%global date 20200213
%global with_snapshot 1
%global branch classic
@@ -37,6 +37,8 @@ ExcludeArch: armv7hl
%global system_libicu 0
%global system_jpeg 1
+%global eme 0
+
%global run_tests 0
%global hardened_build 1
@@ -45,7 +47,7 @@ ExcludeArch: armv7hl
%global build_with_clang 0
%ifnarch %{ix86} ppc64 s390x
-%global build_with_pgo 1
+%global build_with_pgo 0
%endif
%ifarch x86_64
@@ -157,8 +159,8 @@ BuildRequires: %{scl_buildreq}
Summary: Waterfox Web browser
Name: waterfox
-Version: 2020.01
-Release: 11.%{branch}%{?gver}%{?dist}
+Version: 2020.02
+Release: 12.%{branch}%{?gver}%{?dist}
URL: https://www.waterfox.net
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -223,7 +225,6 @@ Patch420: https://hg.mozilla.org/mozilla-central/raw-rev/97dae871389b#/mo
# Upstream updates/PRs/Reverts
#Patch???: %%{vc_url}/commit/commit.patch#/%%{name}-gh-commit.patch
-Patch450: %{vc_url}/pull/1349.patch#/%{name}-gh-pr1349.patch
# Debian patches
Patch500: mozilla-440908.patch
@@ -431,8 +432,6 @@ This package contains results of tests executed during build.
%patch419 -p1 -b .mozilla-1320560
%patch420 -p1 -b .mozilla-1389436
-%patch450 -p1 -b .pr1349
-
# Debian extension patch
%patch500 -p1 -b .440908
@@ -463,7 +462,7 @@ done
# 2: no apply
# 3: uncertain
for i in \
- 702179 991253 1021761 1144632 1288587 1379148 1393235 1393283 1395486 1430508 1433747 1452576 1453127 1466606 \
+ 702179 991253 1021761 1144632 1288587 1379148 1393235 1393283 1395486 1430508 1433747 1452576 1453127 1466606 1469257 \
1384121 1388744 1413143 \
1447519
do
@@ -489,6 +488,8 @@ done
%patch36 -p2 -b .xlocale
%endif
+ln -s media/test dom/test
+
cp %{SOURCE26} .
sed -e 's|_BRANCH_|%{channel}|g' -i distribution.ini
@@ -633,6 +634,12 @@ echo "ac_add_options --enable-rust-simd" >> .mozconfig
echo "ac_add_options --disable-rust-simd" >> .mozconfig
%endif
+%if 0%{?eme}
+echo "ac_add_options --enable-eme=widevine" >> .mozconfig
+%else
+echo "ac_add_options --disable-eme" >> .mozconfig
+%endif
+
# Remove executable bit to make brp-mangle-shebangs happy.
chmod -x third_party/rust/itertools/src/lib.rs
@@ -1077,11 +1084,21 @@ fi
#---------------------------------------------------------------------
%changelog
-* Thu Jan 16 2020 B Stack <bgstack15@gmail.com> - 2020.01-1.classic.20200110git45130a2
+* Tue Feb 18 2020 B Stack <bgstack15@gmail.com> - 2020.01-12.classic.20200213gitdf884bb
- add el7 and el8 support
- repackage for stackrpms
- disable simd globally
+* Sun Feb 16 2020 Phantom X <megaphantomx at bol dot com dot br> - 2020.02-2.classic.20200213gitdf884bb
+- Disable PGO again
+
+* Fri Feb 14 2020 Phantom X <megaphantomx at bol dot com dot br> - 2020.02-1.classic.20200213gitdf884bb
+- 2020.02
+- eme optional support switch, disabled by default
+
+* Thu Jan 16 2020 Phantom X <megaphantomx at bol dot com dot br> - 2020.01-2.classic.20200110git45130a2
+- PGO crash fix try #1
+
* Wed Jan 15 2020 Phantom X <megaphantomx at bol dot com dot br> - 2020.01-1.classic.20200110git45130a2
- New release/snapshot
bgstack15