From c56baf53a6529a19dce466b3dae8ee03a98e9e5f Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Thu, 30 Sep 2021 08:13:05 -0400 Subject: wf 2021.09 rc1 --- ...estAudioEventTimeline.cpp-gtest-fix-build.patch | 34 ++++++++++++++++++++++ waterfox/debian/changelog | 6 ++++ waterfox/debian/waterfox+devuan.dsc | 2 +- waterfox/waterfox-disable-diagnostics-color.patch | 2 +- waterfox/waterfox.spec | 16 ++++++++-- 5 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 waterfox/0001-TestAudioEventTimeline.cpp-gtest-fix-build.patch (limited to 'waterfox') diff --git a/waterfox/0001-TestAudioEventTimeline.cpp-gtest-fix-build.patch b/waterfox/0001-TestAudioEventTimeline.cpp-gtest-fix-build.patch new file mode 100644 index 0000000..abb11b0 --- /dev/null +++ b/waterfox/0001-TestAudioEventTimeline.cpp-gtest-fix-build.patch @@ -0,0 +1,34 @@ +From 81d8dbb800b7aa396b6b0a57add39c7e86d7f306 Mon Sep 17 00:00:00 2001 +From: Phantom X +Date: Sun, 19 Sep 2021 16:55:00 -0300 +Subject: [PATCH] TestAudioEventTimeline.h gtest: fix build + +--- + dom/media/webaudio/gtest/TestAudioEventTimeline.cpp | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/dom/media/webaudio/gtest/TestAudioEventTimeline.cpp b/dom/media/webaudio/gtest/TestAudioEventTimeline.cpp +index da7c4c4..b79afa5 100644 +--- a/dom/media/webaudio/gtest/TestAudioEventTimeline.cpp ++++ b/dom/media/webaudio/gtest/TestAudioEventTimeline.cpp +@@ -9,17 +9,6 @@ + #include + #include "gtest/gtest.h" + +-// Mock the MediaStream class +-namespace mozilla { +-class MediaStream +-{ +- NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MediaStream) +-private: +- ~MediaStream() { +- }; +-}; +-} +- + using namespace mozilla; + using namespace mozilla::dom; + using std::numeric_limits; +-- +2.31.1 + diff --git a/waterfox/debian/changelog b/waterfox/debian/changelog index e3effa3..1a5de06 100644 --- a/waterfox/debian/changelog +++ b/waterfox/debian/changelog @@ -1,3 +1,9 @@ +waterfox (2021.09-1+devuan) obs; urgency=medium + + - latest version + + -- B. Stack Thu, 30 Sep 2021 07:59:47 -0400 + waterfox (2021.08-2+devuan) obs; urgency=medium - Attempt with dh --without autoreconf to solve the OBS problem diff --git a/waterfox/debian/waterfox+devuan.dsc b/waterfox/debian/waterfox+devuan.dsc index 7623fe6..327a38b 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.08-2+devuan +Version: 2021.09-1+devuan Maintainer: B. Stack Homepage: https://www.waterfox.net/ Standards-Version: 4.1.4 diff --git a/waterfox/waterfox-disable-diagnostics-color.patch b/waterfox/waterfox-disable-diagnostics-color.patch index 84e8c92..fcace18 100644 --- a/waterfox/waterfox-disable-diagnostics-color.patch +++ b/waterfox/waterfox-disable-diagnostics-color.patch @@ -16,7 +16,7 @@ index a31acb7..10868e0 100755 # value changes to e.g. "=always", exact string match may fail and # multiple color flags could be added. So examine downstream consumers # before adding flags to return values. -- if info.type == 'gcc' and info.version >= '4.9.0': +- if info.type == 'gcc': - return '-fdiagnostics-color' - elif info.type == 'clang': - return '-fcolor-diagnostics' diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index a987fb3..0ce3971 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -42,7 +42,12 @@ ExcludeArch: armv7hl %global disable_elfhack 0 -%global build_with_clang 0 + %if "%{toolchain}" == "clang" +%global build_with_clang 1 +%else +%global build_with_clang 0 +%endif + %ifnarch %{ix86} ppc64 s390x %global build_with_pgo 0 %endif @@ -166,7 +171,7 @@ BuildRequires: %{scl_buildreq} Summary: Waterfox Web browser Name: waterfox -Version: 2021.08 +Version: 2021.09 Release: 11%{?branch:.%{branch}}%{?gver}%{?dist} URL: https://www.waterfox.net License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -253,6 +258,7 @@ Patch705: 0001-Update-patch-bug1403998.patch Patch706: 0001-Update-patch-bug847568.patch Patch707: 0001-Update-patch-bug1456512.patch Patch708: 0001-mbft-tests-fix-build.patch +Patch709: 0001-TestAudioEventTimeline.cpp-gtest-fix-build.patch # Gentoo Patch800: seamonkey-2.53.3-system_libvpx-1.8.patch @@ -511,6 +517,7 @@ done %patch703 -p1 -b .fix-testing-file %patch704 -p1 -b .no-diagnostics-color %patch708 -p1 -b .mbft-build-fix +%patch709 -p1 -b .TestAudioEventTimeline.cpp-build-fix # stackrpms,2 %if 0%{?system_libvpx} @@ -1121,11 +1128,14 @@ fi #--------------------------------------------------------------------- %changelog -* Mon Aug 23 2021 B. Stack - 2021.08-11.classic +* Thu Sep 30 2021 B. Stack - 2021.09-11.classic - add el7 and el8 support - repackage for stackrpms - disable simd globally +* Sun Sep 19 2021 Phantom X - 2021.09-1.classic +- 2021.09 + * Fri Aug 20 2021 Phantom X - 2021.08-1.classic - 2021.08 -- cgit