From 4fccf80e20a8b0f1c47831713fe8e8b10a3eb640 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 11 Aug 2020 14:02:01 -0400 Subject: waterfox 2020.07.2 rc1 Also attempting to fix the python2 issue in Debian Sid in OBS --- waterfox/debian/changelog | 6 ++++++ waterfox/debian/control | 2 +- waterfox/debian/waterfox_devuan.dsc | 2 +- waterfox/mozilla-256180.patch | 11 ----------- waterfox/waterfox.spec | 9 +++++---- 5 files changed, 13 insertions(+), 17 deletions(-) delete mode 100644 waterfox/mozilla-256180.patch (limited to 'waterfox') diff --git a/waterfox/debian/changelog b/waterfox/debian/changelog index 72a2da9..cf17a67 100644 --- a/waterfox/debian/changelog +++ b/waterfox/debian/changelog @@ -1,3 +1,9 @@ +waterfox (2020.07-1+devuan) obs; urgency=medium + + - Latest version. No release notes yet on waterfox.net + + -- Ben Stack Tue, 11 Aug 2020 14:01:31 -0400 + waterfox (2020.06-1+devuan) obs; urgency=medium - Latest security advisories patched (best effort). diff --git a/waterfox/debian/control b/waterfox/debian/control index d272dd3..8f9ed42 100644 --- a/waterfox/debian/control +++ b/waterfox/debian/control @@ -34,7 +34,7 @@ Build-Depends: debhelper (>= 12), llvm-dev (>= 4.0) | llvm-4.0-dev | llvm-6.0-dev | llvm-7-dev, locales, lsb-release, - python2.7, + python2 (>= 2.7.18-2~) | python (>= 2.7), python-minimal (>= 2.6.6-13~), python-ply, rustc (>= 1.34), diff --git a/waterfox/debian/waterfox_devuan.dsc b/waterfox/debian/waterfox_devuan.dsc index 34fd808..85c0cad 100644 --- a/waterfox/debian/waterfox_devuan.dsc +++ b/waterfox/debian/waterfox_devuan.dsc @@ -2,7 +2,7 @@ Format: 3.0 (quilt) Source: waterfox Binary: waterfox Architecture: any -Version: 2020.07-1+devuan +Version: 2020.07.2-1+devuan Maintainer: B Stack Homepage: https://www.waterfox.net/ Standards-Version: 4.1.4 diff --git a/waterfox/mozilla-256180.patch b/waterfox/mozilla-256180.patch deleted file mode 100644 index 13a1c97..0000000 --- a/waterfox/mozilla-256180.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/layout/generic/nsIFrame.h.old 2016-07-11 13:41:39.688276559 +0200 -+++ b/layout/generic/nsIFrame.h 2016-07-11 13:42:12.791406976 +0200 -@@ -13,7 +13,7 @@ - #error This header/class should only be used within Mozilla code. It should not be used by extensions. - #endif - --#define MAX_REFLOW_DEPTH 200 -+#define MAX_REFLOW_DEPTH 1000 - - /* nsIFrame is in the process of being deCOMtaminated, i.e., this file is eventually - going to be eliminated, and all callers will use nsFrame instead. At the moment diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index 33a6cb9..e3444f4 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -156,7 +156,7 @@ BuildRequires: %{scl_buildreq} Summary: Waterfox Web browser Name: waterfox -Version: 2020.07 +Version: 2020.07.2 Release: 11%{?branch:.%{branch}}%{?gver}%{?dist} URL: https://www.waterfox.net License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -211,7 +211,6 @@ Patch226: rhbz-1354671.patch # Firefox upstream patches Patch402: mozilla-1196777.patch -Patch406: mozilla-256180.patch Patch413: mozilla-1353817.patch Patch415: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch Patch417: mozilla-1436242.patch @@ -417,7 +416,6 @@ This package contains results of tests executed during build. %endif %patch402 -p1 -b .1196777 -%patch406 -p1 -b .256180 %patch413 -p1 -b .1353817 %ifarch %{arm} %patch415 -p1 -b .mozilla-1238661 @@ -1084,11 +1082,14 @@ fi #--------------------------------------------------------------------- %changelog -* Sat Jul 04 2020 B Stack - 2020.07-11.classic +* Tue Aug 11 2020 B Stack - 2020.07.2-11.classic - add el7 and el8 support - repackage for stackrpms - disable simd globally +* Wed Aug 05 2020 Phantom X - 2020.07.2-1.classic +- 2020.07.2 + * Wed Jul 01 2020 Phantom X - 2020.07-1.classic - 2020.07 -- cgit From 773aa0a6f01a33bf84e88cce10160f547ae1077b Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 11 Aug 2020 14:40:39 -0400 Subject: remove python-minimal hardcoded build-dep --- waterfox/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'waterfox') diff --git a/waterfox/debian/control b/waterfox/debian/control index 8f9ed42..a55d956 100644 --- a/waterfox/debian/control +++ b/waterfox/debian/control @@ -35,7 +35,6 @@ Build-Depends: debhelper (>= 12), locales, lsb-release, python2 (>= 2.7.18-2~) | python (>= 2.7), - python-minimal (>= 2.6.6-13~), python-ply, rustc (>= 1.34), unzip, @@ -45,6 +44,7 @@ Build-Depends: debhelper (>= 12), yasm (>= 1.1), zip, zlib1g-dev +# disabled for testing python-minimal (>= 2.6.6-13~), Standards-Version: 3.9.7 Homepage: https://www.waterfox.net/ # libfontconfig-dev only added for Debian OBS which is choking as of 2020-04 on libfontconfig-dev | libfontconfig1-dev for deps: libgtk-3-dev, libpango1.0-dev, libcairo2-dev, libxft-dev -- cgit From d168935fee308d122fcf6fd8a512326d5e0d36db Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 11 Aug 2020 14:50:29 -0400 Subject: fix python-minimal in dsc too --- waterfox/debian/waterfox_devuan.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'waterfox') diff --git a/waterfox/debian/waterfox_devuan.dsc b/waterfox/debian/waterfox_devuan.dsc index 85c0cad..84f1627 100644 --- a/waterfox/debian/waterfox_devuan.dsc +++ b/waterfox/debian/waterfox_devuan.dsc @@ -6,7 +6,7 @@ Version: 2020.07.2-1+devuan Maintainer: B Stack Homepage: https://www.waterfox.net/ Standards-Version: 4.1.4 -Build-Depends: debhelper (>= 12), autoconf2.13, autotools-dev, binutils-avr, cargo (>= 0.35), ccache, clang (>= 4.0) | clang-4.0 | clang-6.0 | clang-7, dpkg-dev (>= 1.16.1.1~), libasound2-dev, libbz2-dev, libclang-dev (>= 4.0) | libclang-4.0-dev | libclang-6.0-dev | libclang-7-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-dev (>= 4.0) | llvm-4.0-dev | llvm-6.0-dev | llvm-7-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, libfontconfig-dev +Build-Depends: debhelper (>= 12), autoconf2.13, autotools-dev, binutils-avr, cargo (>= 0.35), ccache, clang (>= 4.0) | clang-4.0 | clang-6.0 | clang-7, dpkg-dev (>= 1.16.1.1~), libasound2-dev, libbz2-dev, libclang-dev (>= 4.0) | libclang-4.0-dev | libclang-6.0-dev | libclang-7-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-dev (>= 4.0) | llvm-4.0-dev | llvm-6.0-dev | llvm-7-dev, locales, lsb-release, python2 (>= 2.7.18-2~) | python (>= 2.7), python-ply, rustc (>= 1.34), unzip, xauth, xfonts-base, xvfb, yasm (>= 1.1), zip, zlib1g-dev, libfontconfig-dev Package-List: waterfox deb web optional arch=any Files: -- cgit