From 65aa5a0fee282e2dde372437f60c0557226103e6 Mon Sep 17 00:00:00 2001 From: B Stack Date: Fri, 19 Feb 2021 08:40:15 -0500 Subject: waterfox 2021.02 rc1 --- waterfox/debian/changelog | 6 ++++++ waterfox/debian/waterfox+devuan.dsc | 2 +- waterfox/waterfox-nolangpacks.patch | 28 ++++++++-------------------- waterfox/waterfox.spec | 15 +++++++-------- 4 files changed, 22 insertions(+), 29 deletions(-) diff --git a/waterfox/debian/changelog b/waterfox/debian/changelog index 1906aa3..3317075 100644 --- a/waterfox/debian/changelog +++ b/waterfox/debian/changelog @@ -1,3 +1,9 @@ +waterfox (2021.02-1+devuan) obs; urgency=medium + + - latest version + + -- B. Stack Mon, 19 Feb 2021 08:37:02 -0500 + waterfox (2021.01-1+devuan) obs; urgency=medium - latest version diff --git a/waterfox/debian/waterfox+devuan.dsc b/waterfox/debian/waterfox+devuan.dsc index 993e311..b682af9 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: 2021.01-1+devuan +Version: 2021.02-1+devuan Maintainer: B Stack Homepage: https://www.waterfox.net/ Standards-Version: 4.1.4 diff --git a/waterfox/waterfox-nolangpacks.patch b/waterfox/waterfox-nolangpacks.patch index e6608cf..77f82cb 100644 --- a/waterfox/waterfox-nolangpacks.patch +++ b/waterfox/waterfox-nolangpacks.patch @@ -1,12 +1,10 @@ -diff -up Waterfox-7b7aa8b4b5d17ce21072054285618fd6434e5482/browser/extensions/moz.build.nolangpacks Waterfox-7b7aa8b4b5d17ce21072054285618fd6434e5482/browser/extensions/moz.build ---- Waterfox-7b7aa8b4b5d17ce21072054285618fd6434e5482/browser/extensions/moz.build.nolangpacks 2017-12-13 19:42:11.000000000 -0200 -+++ Waterfox-7b7aa8b4b5d17ce21072054285618fd6434e5482/browser/extensions/moz.build 2017-12-14 00:42:15.104238251 -0200 -@@ -7,97 +7,3 @@ - DIRS += [ - 'pdfjs', +diff -up ./browser/extensions/moz.build.nolangpacks ./browser/extensions/moz.build +--- ./browser/extensions/moz.build.nolangpacks 2021-02-16 18:38:52.814767279 -0300 ++++ ./browser/extensions/moz.build 2021-02-16 18:45:15.150908703 -0300 +@@ -9,96 +9,5 @@ DIRS += [ ] -- --FINAL_TARGET_FILES.features += [ + + FINAL_TARGET_FILES.features += [ - 'langpack-ach@waterfox.xpi', - 'langpack-af@waterfox.xpi', - 'langpack-an@waterfox.xpi', @@ -98,15 +96,5 @@ diff -up Waterfox-7b7aa8b4b5d17ce21072054285618fd6434e5482/browser/extensions/mo - 'langpack-xh@waterfox.xpi', - 'langpack-zh-CN@waterfox.xpi', - 'langpack-zh-TW@waterfox.xpi', --] -diff -up Waterfox-7b7aa8b4b5d17ce21072054285618fd6434e5482/browser/installer/package-manifest.in.nolangpacks Waterfox-7b7aa8b4b5d17ce21072054285618fd6434e5482/browser/installer/package-manifest.in ---- 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/default128.png - @RESPATH@/browser/chrome/icons/default/default256.png - #endif --@RESPATH@/browser/features/* - - ; [Webide Files] - @RESPATH@/browser/chrome/webide@JAREXT@ + 'zakius@polly.xpi', + ] diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index 99c5d3f..a682fa7 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -160,7 +160,7 @@ BuildRequires: %{scl_buildreq} Summary: Waterfox Web browser Name: waterfox -Version: 2021.01 +Version: 2021.02 Release: 11%{?branch:.%{branch}}%{?gver}%{?dist} URL: https://www.waterfox.net License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -226,8 +226,6 @@ 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}/commit/64adc14679cd2b7e8452b2b8abbdbaddca829e08.patch#/%{name}-gh-64adc14.patch -Patch452: %{vc_url}/commit/709bbfedcb2750665fbda4993b253737615ee8f8.patch#/%{name}-gh-709bbfe.patch # Debian patches Patch500: mozilla-440908.patch @@ -435,8 +433,6 @@ This package contains results of tests executed during build. %patch420 -p1 -b .mozilla-1389436 %patch450 -p1 -b .gh26459c4 -R -%patch451 -p1 -b .gh64adc14 -%patch452 -p1 -b .gh709bbfe # Debian extension patch %patch500 -p1 -b .440908 @@ -488,7 +484,7 @@ for i in _patches/patch-{bug{??????,???????},revert-bug*,z-*} ;do ${patchcommand} ${i} done -# Install langpacks other way +# Install langpacks another way %patch700 -p1 -b .nolangpacks %patch701 -p1 -b .waterfoxdir-1 %patch702 -p1 -b .waterfoxdir-2 @@ -1060,7 +1056,7 @@ fi %{mozappdir}/browser/chrome %{mozappdir}/browser/chrome.manifest %{mozappdir}/browser/defaults/preferences/*.js -%{mozappdir}/browser/features +%{mozappdir}/browser/features/*.xpi %{mozappdir}/distribution/distribution.ini # That's Windows only %ghost %{mozappdir}/browser/features/aushelper@mozilla.org.xpi @@ -1100,11 +1096,14 @@ fi #--------------------------------------------------------------------- %changelog -* Mon Feb 01 2021 B. Stack - 2021.01-11.classic +* Fri Feb 19 2021 B. Stack - 2021.02-11.classic - add el7 and el8 support - repackage for stackrpms - disable simd globally +* Tue Feb 16 2021 Phantom X - 2021.02-1.classic +- 2021.02 + * Wed Jan 27 2021 Phantom X - 2021.01-1.classic - 2021.01 -- cgit