summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--waterfox/0001-angle-set-c-14.patch27
-rw-r--r--waterfox/debian/changelog12
-rw-r--r--waterfox/debian/waterfox+devuan.dsc2
-rw-r--r--waterfox/mozilla-1336978.patch99
-rw-r--r--waterfox/waterfox.spec27
5 files changed, 27 insertions, 140 deletions
diff --git a/waterfox/0001-angle-set-c-14.patch b/waterfox/0001-angle-set-c-14.patch
deleted file mode 100644
index 6d82f96..0000000
--- a/waterfox/0001-angle-set-c-14.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a5c776769a911eeeaf10e276f8b17e93b1f07d19 Mon Sep 17 00:00:00 2001
-From: Phantom X <PhantomX@users.noreply.github.com>
-Date: Wed, 7 Apr 2021 23:20:18 -0300
-Subject: [PATCH] angle: set c++14
-
----
- gfx/angle/moz.build.common | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/gfx/angle/moz.build.common b/gfx/angle/moz.build.common
-index 31a1440..1bb83d5 100644
---- a/gfx/angle/moz.build.common
-+++ b/gfx/angle/moz.build.common
-@@ -7,6 +7,10 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
- '-Wno-range-loop-construct',
- ]
-
-+if CONFIG['CC_TYPE'] in ('gcc'):
-+ CXXFLAGS += [
-+ '-std=c++14',
-+ ]
-
- if CONFIG['INTEL_ARCHITECTURE']:
- CXXFLAGS += CONFIG['SSE2_FLAGS']
---
-2.30.2
-
diff --git a/waterfox/debian/changelog b/waterfox/debian/changelog
index ca1b5ce..21ed4d7 100644
--- a/waterfox/debian/changelog
+++ b/waterfox/debian/changelog
@@ -1,3 +1,15 @@
+waterfox (2021.04.2-1+devuan) obs; urgency=medium
+
+ - latest version
+
+ -- B. Stack <bgstack15@gmail.com> Tue, 27 Apr 2021 14:37:07 -0400
+
+waterfox (2021.04-1+devuan) obs; urgency=medium
+
+ - latest version
+
+ -- B. Stack <bgstack15@gmail.com> Fri, 23 Apr 2021 09:27:11 -0400
+
waterfox (2021.03-1+devuan) obs; urgency=medium
- latest version
diff --git a/waterfox/debian/waterfox+devuan.dsc b/waterfox/debian/waterfox+devuan.dsc
index 045c175..355356f 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.03-1+devuan
+Version: 2021.04-2+devuan
Maintainer: B Stack <bgstack15@gmail.com>
Homepage: https://www.waterfox.net/
Standards-Version: 4.1.4
diff --git a/waterfox/mozilla-1336978.patch b/waterfox/mozilla-1336978.patch
deleted file mode 100644
index 136eb83..0000000
--- a/waterfox/mozilla-1336978.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-
-# HG changeset patch
-# User Sylvestre Ledru <sledru@mozilla.com>
-# Date 1501074847 -7200
-# Node ID 342812d23eb995a19b391f7bcd48d03db092709a
-# Parent 2980183d98fb2513d41209c5a9e08bfc519b68fa
-Bug 1336978 - Add support of lld by adding a configure option --enable-linker='bfd', 'gold', 'lld', 'other' r=glandium
-
-MozReview-Commit-ID: 7LI2lMXO2lG
-
-diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
---- a/build/moz.configure/toolchain.configure
-+++ b/build/moz.configure/toolchain.configure
-@@ -1136,23 +1136,23 @@ def build_not_win_mac(target):
- return True
-
-
- option('--enable-gold',
- env='MOZ_FORCE_GOLD',
- help='Enable GNU Gold Linker when it is not already the default',
- when=build_not_win_mac)
-
-+imply_option('--enable-linker',
-+ depends_if('--enable-gold', when=build_not_win_mac)(lambda x: 'gold'),
-+ when=build_not_win_mac)
-
--@depends('--enable-gold', c_compiler, developer_options, check_build_environment, when=build_not_win_mac)
--@checking('for ld', lambda x: x.KIND)
- @imports('os')
- @imports('shutil')
--def enable_gold(enable_gold_option, c_compiler, developer_options, build_env):
-- linker = None
-+def enable_gnu_linker(enable_gold_option, c_compiler, developer_options, build_env, linker_name):
- # Used to check the kind of linker
- version_check = ['-Wl,--version']
- cmd_base = c_compiler.wrapper + [c_compiler.compiler] + c_compiler.flags
-
- def resolve_gold():
- # Try to force the usage of gold
- targetDir = os.path.join(build_env.topobjdir, 'build', 'unix', 'gold')
-
-@@ -1177,17 +1177,17 @@ def enable_gold(enable_gold_option, c_co
- return namespace(
- KIND='gold',
- LINKER_FLAG=linker,
- )
- else:
- # The -B trick didn't work, removing the directory
- shutil.rmtree(targetDir)
-
-- if enable_gold_option or developer_options:
-+ if (enable_gold_option or developer_options) and linker_name != 'bfd':
- result = resolve_gold()
-
- if result:
- return result
- # gold is only required if --enable-gold is used.
- elif enable_gold_option:
- die('Could not find gold')
- # Else fallthrough.
-@@ -1208,10 +1208,35 @@ def enable_gold(enable_gold_option, c_co
- KIND='gold'
- )
-
- # For other platforms without gold or the GNU linker
- return namespace(
- KIND='other'
- )
-
--set_config('LD_IS_BFD', depends(enable_gold.KIND)(lambda x: x == 'bfd' or None))
--set_config('LINKER_LDFLAGS', enable_gold.LINKER_FLAG)
-+js_option('--enable-linker', nargs=1,
-+ choices=('bfd', 'gold', 'lld', 'other'),
-+ help='Select the linker',
-+ when=build_not_win_mac)
-+
-+@depends('--enable-linker', c_compiler, developer_options, check_build_environment, when=build_not_win_mac)
-+@checking('for linker', lambda x: x.KIND)
-+def select_linker(linker, c_compiler, developer_options, build_env):
-+ linker = linker[0] if linker else 'other'
-+ if linker in ('gold', 'bfd', 'other'):
-+ return enable_gnu_linker(linker == 'gold', c_compiler, developer_options, build_env, linker)
-+ if linker == 'lld':
-+ version_check = ['-Wl,--version']
-+ cmd_base = c_compiler.wrapper + [c_compiler.compiler] + c_compiler.flags
-+ lld = "-fuse-ld=" + linker
-+ cmd = cmd_base + [lld] + version_check
-+ if 'LLD' in check_cmd_output(*cmd).decode('utf-8'):
-+ return namespace(
-+ KIND='lld',
-+ LINKER_FLAG=lld,
-+ )
-+ else:
-+ die("Could not use lld as linker")
-+
-+
-+set_config('LD_IS_BFD', depends(select_linker.KIND)(lambda x: x == 'bfd' or None))
-+set_config('LINKER_LDFLAGS', select_linker.LINKER_FLAG)
-
diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec
index f0ff9ad..555837b 100644
--- a/waterfox/waterfox.spec
+++ b/waterfox/waterfox.spec
@@ -1,8 +1,8 @@
%global _legacy_common_support 1
-%global commit d5de4ec99d1d61a309d7fcd96da12488c9afe550
+%global commit 93fc15e9f2d68d8a43b22c57b8b935f272ce06eb
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global date 20200408
+%global date 20200422
%global with_snapshot 0
%global branch classic
@@ -166,7 +166,7 @@ BuildRequires: %{scl_buildreq}
Summary: Waterfox Web browser
Name: waterfox
-Version: 2021.03
+Version: 2021.04.2
Release: 11%{?branch:.%{branch}}%{?gver}%{?dist}
URL: https://www.waterfox.net
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -175,7 +175,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+
%if 0%{?with_snapshot}
Source0: %{vc_url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
%else
-Source0: %{vc_url}/archive/%{version}-%{branch}/%{name}-%{version}-%{branch}.tar.gz
+Source0: %{vc_url}/archive/%{version}/%{name}-%{version}-%{branch}.tar.gz
%endif
# FreeBSD patches
@@ -241,7 +241,6 @@ Patch601: mozilla-1516081.patch
Patch602: mozilla-1516803.patch
Patch603: mozilla-1397365-5.patch
Patch604: 1003_gentoo_specific_pgo.patch
-Patch605: https://hg.mozilla.org/mozilla-central/raw-rev/c999baadc2d5#/mozilla-hg-1433383.patch
# Chinforinfula patches
Patch700: %{name}-nolangpacks.patch
@@ -251,7 +250,6 @@ Patch702: %{name}-waterfoxdir-2.patch
Patch703: %{name}-fix-testing-file.patch
Patch704: %{name}-disable-diagnostics-color.patch
Patch705: 0001-Update-patch-bug1403998.patch
-Patch706: 0001-angle-set-c-14.patch
# Gentoo
Patch800: seamonkey-2.53.3-system_libvpx-1.8.patch
@@ -398,7 +396,7 @@ This package contains results of tests executed during build.
%if 0%{?with_snapshot}
%setup -q -n Waterfox-%{commit} -a 600
%else
-%setup -q -n Waterfox-%{version}-%{branch} -a 600
+%setup -q -n Waterfox-%{version} -a 600
%endif
%if %{build_langpacks}
@@ -457,7 +455,6 @@ This package contains results of tests executed during build.
%patch602 -p1 -b .1516803
%patch603 -p1 -b .1397365
%patch604 -p1 -b .gentoo_pgo
-%patch605 -p1 -b .1433383
# Prepare FreeBSD patches
mkdir _patches
@@ -505,7 +502,6 @@ done
%patch702 -p1 -b .waterfoxdir-2
%patch703 -p1 -b .fix-testing-file
%patch704 -p1 -b .no-diagnostics-color
-%patch706 -p1 -b .angle-c++14
# stackrpms,2
%if 0%{?system_libvpx}
@@ -1073,12 +1069,11 @@ fi
%{mozappdir}/browser/defaults/preferences/*.js
# stackrpms,2
%if 0%{?rhel} != 7
-%ghost %{mozappdir}/browser/features/*.xpi
+%dir %{mozappdir}/browser/features
+#{mozappdir}/browser/features/*.xpi
# stackrpms,2
%endif
%{mozappdir}/distribution/distribution.ini
-# That's Windows only
-%ghost %{mozappdir}/browser/features/aushelper@mozilla.org.xpi
%attr(644, root, root) %{mozappdir}/browser/blocklist.xml
%attr(644, root, root) %{mozappdir}/browser/ua-update.json
%dir %{mozappdir}/browser/extensions
@@ -1115,11 +1110,17 @@ fi
#---------------------------------------------------------------------
%changelog
-* Tue Apr 13 2021 B. Stack <bgstack15@gmail.com> - 2021.03-11.classic
+* Tue Apr 27 2021 B. Stack <bgstack15@gmail.com> - 2021.04.2-11.classic
- add el7 and el8 support
- repackage for stackrpms
- disable simd globally
+* Mon Apr 26 2021 Phantom X <megaphantomx at hotmail dot com> - 2021.04.2-1.classic
+- 2021.04.2
+
+* Thu Apr 22 2021 Phantom X <megaphantomx at hotmail dot com> - 2021.04.1-1.classic.20200422git93fc15e
+- 2021.04.1
+
* Thu Apr 08 2021 Phantom X <megaphantomx at hotmail dot com> - 2021.03-1.classic
- 2021.03
- BR: nasm
bgstack15