diff options
Diffstat (limited to 'waterfox')
| -rw-r--r-- | waterfox/0001-Update-patch-bug1403998.patch | 39 | ||||
| -rw-r--r-- | waterfox/debian/changelog | 6 | ||||
| -rw-r--r-- | waterfox/debian/waterfox+devuan.dsc | 2 | ||||
| -rw-r--r-- | waterfox/waterfox.spec | 17 |
4 files changed, 59 insertions, 5 deletions
diff --git a/waterfox/0001-Update-patch-bug1403998.patch b/waterfox/0001-Update-patch-bug1403998.patch new file mode 100644 index 0000000..5c027d9 --- /dev/null +++ b/waterfox/0001-Update-patch-bug1403998.patch @@ -0,0 +1,39 @@ +From a9cea38d6dc686f6b99893f1d215b3185f76e845 Mon Sep 17 00:00:00 2001 +From: Phantom X <PhantomX@users.noreply.github.com> +Date: Wed, 27 Jan 2021 08:49:38 -0300 +Subject: [PATCH] Update patch-bug1403998 + +--- + _patches/patch-bug1403998 | 29 +++++++++++++++-------------- + 1 file changed, 15 insertions(+), 14 deletions(-) + +diff --git a/_patches/patch-bug1403998 b/_patches/patch-bug1403998 +index 5851984..510249a 100644 +--- a/_patches/patch-bug1403998 ++++ b/_patches/patch-bug1403998 +@@ -100,10 +100,10 @@ index 4c7f335352d3..1f1ee01818fb 100644 + + nullptr); + +} + + +- //////////////////////////////////////////////////////////////////////////////// +- // nsIRequest methods: +- +-@@ -229,24 +304,11 @@ nsViewSourceChannel::GetURI(nsIURI* *aURI) ++ void nsViewSourceChannel::ReleaseListeners() { ++ mListener = nullptr; ++ } ++@@ -233,24 +308,11 @@ nsViewSourceChannel::GetURI(nsIURI* *aURI) + + nsCOMPtr<nsIURI> uri; + nsresult rv = mChannel->GetURI(getter_AddRefs(uri)); +@@ -158,6 +158,7 @@ index 002739b361f7..1970c01588e3 100644 + + + protected: + ~nsViewSourceChannel() {} ++ void ReleaseListeners(); + + + // Clones aURI and prefixes it with "view-source:" schema, + + nsresult BuildViewSourceURI(nsIURI* aURI, nsIURI** aResult); +-- +2.29.2 + diff --git a/waterfox/debian/changelog b/waterfox/debian/changelog index b81ee1f..1906aa3 100644 --- a/waterfox/debian/changelog +++ b/waterfox/debian/changelog @@ -1,3 +1,9 @@ +waterfox (2021.01-1+devuan) obs; urgency=medium + + - latest version + + -- B. Stack <bgstack15@gmail.com> Mon, 01 Feb 2021 10:21:52 -0500 + waterfox (2020.12-1+devuan) obs; urgency=medium - latest version diff --git a/waterfox/debian/waterfox+devuan.dsc b/waterfox/debian/waterfox+devuan.dsc index 0bf6740..993e311 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.12-1+devuan +Version: 2021.01-1+devuan Maintainer: B Stack <bgstack15@gmail.com> Homepage: https://www.waterfox.net/ Standards-Version: 4.1.4 diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index cbeac6c..99c5d3f 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -160,7 +160,7 @@ BuildRequires: %{scl_buildreq} Summary: Waterfox Web browser Name: waterfox -Version: 2020.12 +Version: 2021.01 Release: 11%{?branch:.%{branch}}%{?gver}%{?dist} URL: https://www.waterfox.net License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -226,7 +226,8 @@ Patch420: https://hg.mozilla.org/mozilla-central/raw-rev/97dae871389b#/mo #Patch???: %%{vc_url}/commit/commit.patch#/%%{name}-gh-commit.patch Patch450: %{vc_url}/commit/26459c47f867dc1882fa7b87e32a9e8fc5e125e5.patch#/%{name}-gh-26459c4.patch -Patch451: %{vc_url}/pull/1861.patch#/%{name}-gh-pr1861.patch +Patch451: %{vc_url}/commit/64adc14679cd2b7e8452b2b8abbdbaddca829e08.patch#/%{name}-gh-64adc14.patch +Patch452: %{vc_url}/commit/709bbfedcb2750665fbda4993b253737615ee8f8.patch#/%{name}-gh-709bbfe.patch # Debian patches Patch500: mozilla-440908.patch @@ -245,6 +246,7 @@ Patch701: %{name}-waterfoxdir-1.patch Patch702: %{name}-waterfoxdir-2.patch Patch703: %{name}-fix-testing-file.patch Patch704: %{name}-disable-diagnostics-color.patch +Patch705: 0001-Update-patch-bug1403998.patch %if 0%{?system_nss} BuildRequires: pkgconfig(nspr) >= %{nspr_version} @@ -294,6 +296,7 @@ BuildRequires: pkgconfig(vpx) >= %{libvpx_version} BuildRequires: pkgconfig(libwebp) >= %{webp_version} %endif BuildRequires: autoconf213 +BuildRequires: make BuildRequires: pkgconfig(libpulse) %if 0%{?system_libicu} BuildRequires: pkgconfig(icu-i18n) @@ -432,7 +435,8 @@ This package contains results of tests executed during build. %patch420 -p1 -b .mozilla-1389436 %patch450 -p1 -b .gh26459c4 -R -%patch451 -p1 -b .pr1861 +%patch451 -p1 -b .gh64adc14 +%patch452 -p1 -b .gh709bbfe # Debian extension patch %patch500 -p1 -b .440908 @@ -449,6 +453,8 @@ mkdir _patches cp -p %{freebsd_root}/patch-{bug,z-bug,revert-bug}* _patches/ cp -pf %{S:601} %{S:602} _patches/ +%patch705 -p1 + filterdiff -x dom/svg/crashtests/crashtests.list %{freebsd_root}/patch-bug1343147 \ > _patches/patch-bug1343147 filterdiff -x dom/security/test/csp/mochitest.ini %{freebsd_root}/patch-bug1381761 \ @@ -1094,11 +1100,14 @@ fi #--------------------------------------------------------------------- %changelog -* Wed Dec 09 2020 B Stack <bgstack15@gmail.com> - 2020.12-11.classic +* Mon Feb 01 2021 B. Stack <bgstack15@gmail.com> - 2021.01-11.classic - add el7 and el8 support - repackage for stackrpms - disable simd globally +* Wed Jan 27 2021 Phantom X <megaphantomx at hotmail dot com> - 2021.01-1.classic +- 2021.01 + * Wed Dec 09 2020 Phantom X <megaphantomx at hotmail dot com> - 2020.12-1.classic - 2020.12 |