summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--waterfox/bgstack15-waterfox-prefs.js8
-rw-r--r--waterfox/build-cacheFlush-missing.patch13
-rw-r--r--waterfox/mozilla-1335250.patch30
-rw-r--r--waterfox/mozilla-1435695.patch28
-rwxr-xr-xwaterfox/stackrpms-diff.sh4
-rw-r--r--waterfox/waterfox-fix-testing-file.patch42
-rw-r--r--waterfox/waterfox.spec39
7 files changed, 76 insertions, 88 deletions
diff --git a/waterfox/bgstack15-waterfox-prefs.js b/waterfox/bgstack15-waterfox-prefs.js
index e2d1447..aeeb03b 100644
--- a/waterfox/bgstack15-waterfox-prefs.js
+++ b/waterfox/bgstack15-waterfox-prefs.js
@@ -1,7 +1,7 @@
-// File: /usr/lib/waterfox/browser/defaults/preferences/bgstack15-prefs.js
+// file: /usr/lib/waterfox/browser/defaults/preferences/bgstack15-waterfox-prefs.js
// deployed with waterfox package (rpm or dpkg) built by bgstack15
-// last modified 2019-03-09
-// Reference:
+// last modified 2019-03-28
+// reference:
// https://support.mozilla.org/en-US/kb/customizing-firefox-using-autoconfig
// bgstack15-palemoon-prefs.js
pref("app.update.auto", false);
@@ -20,7 +20,7 @@ pref("browser.search.hiddenOneOffs", "DuckDuckGo");
pref("browser.search.suggest.enabled", false);
pref("browser.search.update", false);
pref("browser.search.widget.inNavBar", false);
-pref("browser.sessionstore.restore_on_demand", "false");
+pref("browser.sessionstore.restore_on_demand", false);
pref("browser.shell.checkDefaultBrowser", false);
pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=https://start.duckduckgo.com/");
pref("browser.startup.page", 3);
diff --git a/waterfox/build-cacheFlush-missing.patch b/waterfox/build-cacheFlush-missing.patch
deleted file mode 100644
index 51c368c..0000000
--- a/waterfox/build-cacheFlush-missing.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up firefox-55.0.3/js/src/jit/ExecutableAllocator.h.wasm firefox-55.0.3/js/src/jit/ExecutableAllocator.h
---- firefox-55.0.3/js/src/jit/ExecutableAllocator.h.wasm 2017-09-05 11:32:12.235909468 +0200
-+++ firefox-55.0.3/js/src/jit/ExecutableAllocator.h 2017-09-05 11:32:46.157916575 +0200
-@@ -219,7 +219,7 @@ class ExecutableAllocator
-
- static void poisonCode(JSRuntime* rt, JitPoisonRangeVector& ranges);
-
--#if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64) || defined(JS_SIMULATOR_ARM64)
-+#if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64) || defined(JS_SIMULATOR_ARM64) || defined(JS_CODEGEN_NONE)
- static void cacheFlush(void*, size_t)
- {
- }
-diff -up firefox-55.0.3/js/src/jit-test/tests/wasm/bench/wasm_box2d.wasm firefox-55.0.3/js/src/jit-test/tests/wasm/bench/wasm_box2d
diff --git a/waterfox/mozilla-1335250.patch b/waterfox/mozilla-1335250.patch
deleted file mode 100644
index 8f7436c..0000000
--- a/waterfox/mozilla-1335250.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up firefox-53.0/dom/media/webrtc/MediaEngine.h.1335250 firefox-53.0/dom/media/webrtc/MediaEngine.h
---- firefox-53.0/dom/media/webrtc/MediaEngine.h.1335250 2017-04-11 06:15:22.000000000 +0200
-+++ firefox-53.0/dom/media/webrtc/MediaEngine.h 2017-04-19 20:35:55.264741939 +0200
-@@ -226,7 +226,7 @@ public:
- ~AllocationHandle() {}
- public:
- AllocationHandle(const dom::MediaTrackConstraints& aConstraints,
-- const ipc::PrincipalInfo& aPrincipalInfo,
-+ const mozilla::ipc::PrincipalInfo& aPrincipalInfo,
- const MediaEnginePrefs& aPrefs,
- const nsString& aDeviceId)
-
-@@ -236,7 +236,7 @@ public:
- mDeviceId(aDeviceId) {}
- public:
- NormalizedConstraints mConstraints;
-- ipc::PrincipalInfo mPrincipalInfo;
-+ mozilla::ipc::PrincipalInfo mPrincipalInfo;
- MediaEnginePrefs mPrefs;
- nsString mDeviceId;
- };
-@@ -327,7 +327,7 @@ public:
- virtual nsresult Allocate(const dom::MediaTrackConstraints &aConstraints,
- const MediaEnginePrefs &aPrefs,
- const nsString& aDeviceId,
-- const ipc::PrincipalInfo& aPrincipalInfo,
-+ const mozilla::ipc::PrincipalInfo& aPrincipalInfo,
- AllocationHandle** aOutHandle,
- const char** aOutBadConstraint)
- {
diff --git a/waterfox/mozilla-1435695.patch b/waterfox/mozilla-1435695.patch
deleted file mode 100644
index 332f3a0..0000000
--- a/waterfox/mozilla-1435695.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -up gecko-dev-0517a94d022c055b2cd0b519233fa8ef8b996d04/media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c.attributes_before_declarator gecko-dev-0517a94d022c055b2cd0b519233fa8ef8b996d04/media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c
---- gecko-dev-0517a94d022c055b2cd0b519233fa8ef8b996d04/media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c.attributes_before_declarator 2018-02-04 11:15:21.000000000 +0100
-+++ gecko-dev-0517a94d022c055b2cd0b519233fa8ef8b996d04/media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c 2018-02-04 22:20:44.290360116 +0100
-@@ -115,8 +115,8 @@ static int32_t WeightedAverage(int16_t*
- // undefined behavior, so not a good idea; this just makes UBSan ignore the
- // violation, so that our old code can continue to do what it's always been
- // doing.)
--static inline int32_t OverflowingMulS16ByS32ToS32(int16_t a, int32_t b)
-- RTC_NO_SANITIZE("signed-integer-overflow") {
-+static inline int32_t RTC_NO_SANITIZE("signed-integer-overflow")
-+ OverflowingMulS16ByS32ToS32(int16_t a, int32_t b) {
- return a * b;
- }
-
-diff -up gecko-dev-0517a94d022c055b2cd0b519233fa8ef8b996d04/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c.attributes_before_declarator gecko-dev-0517a94d022c055b2cd0b519233fa8ef8b996d04/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c
---- gecko-dev-0517a94d022c055b2cd0b519233fa8ef8b996d04/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c.attributes_before_declarator 2018-02-04 11:15:21.000000000 +0100
-+++ gecko-dev-0517a94d022c055b2cd0b519233fa8ef8b996d04/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c 2018-02-04 23:03:46.818099286 +0100
-@@ -209,8 +209,8 @@ void WebRtcIsacfix_NormLatticeFilterMa(s
- // Left shift of an int32_t that's allowed to overflow. (It's still undefined
- // behavior, so not a good idea; this just makes UBSan ignore the violation, so
- // that our old code can continue to do what it's always been doing.)
--static inline int32_t OverflowingLShiftS32(int32_t x, int shift)
-- RTC_NO_SANITIZE("shift") {
-+static inline int32_t RTC_NO_SANITIZE("shift")
-+ OverflowingLShiftS32(int32_t x, int shift) {
- return x << shift;
- }
-
diff --git a/waterfox/stackrpms-diff.sh b/waterfox/stackrpms-diff.sh
index 4d4ed17..851f840 100755
--- a/waterfox/stackrpms-diff.sh
+++ b/waterfox/stackrpms-diff.sh
@@ -1,3 +1,3 @@
# use this file to display the differences between chinfo upstream and my work.
-# usage: stackrpms/waterfox/stackrpms-diff.sh | vi
-diff -x stackrpms*.diff -x stackrpms*.sh -x *z -x .*.swp -Naur chinforpms/waterfox stackrpms/waterfox
+# usage: stackrpms/waterfox/stackrpms-diff.sh | vi -
+diff -x debian -x stackrpms*.diff -x stackrpms*.sh -x *z -x .*.swp -Naur chinforpms/waterfox stackrpms/waterfox
diff --git a/waterfox/waterfox-fix-testing-file.patch b/waterfox/waterfox-fix-testing-file.patch
new file mode 100644
index 0000000..69f9e48
--- /dev/null
+++ b/waterfox/waterfox-fix-testing-file.patch
@@ -0,0 +1,42 @@
+--- ./testing/web-platform/meta/MANIFEST.json.fix-testing-file 2019-03-14 09:55:07.880590923 -0300
++++ ./testing/web-platform/meta/MANIFEST.json 2019-03-14 09:58:05.190243977 -0300
+@@ -332313,15 +332313,15 @@
+ {}
+ ]
+ ],
+-<<<<<<< HEAD
+ "cssom-view/scrollIntoView-empty-args.html": [
+ [
+ "/cssom-view/scrollIntoView-empty-args.html",
+-=======
++ {}
++ ]
++ ],
+ "cssom-view/offsetTopLeftInScrollableParent.html": [
+ [
+ "/cssom-view/offsetTopLeftInScrollableParent.html",
+->>>>>>> cdaa87569629... Bug 1389274 - Correct the behavior of Element.scrollIntoView to match the draft spec and pass web platform tests; r=annevk,bkelly
+ {}
+ ]
+ ],
+@@ -569554,12 +569554,10 @@
+ "b2261ec702116c211ab5ac6fbb53698dfe60a7be",
+ "testharness"
+ ],
+-<<<<<<< HEAD
+ "cssom-view/scrollIntoView-empty-args.html": [
+ "c1bd398158cc935c8c69cb0291c2ef0e0faa6bad",
+ "testharness"
+ ],
+-=======
+ "cssom-view/offsetTopLeftInScrollableParent.html": [
+ "79b4a278f0e35646cfdffeebf8f0523e2772bc9b",
+ "testharness"
+@@ -569580,7 +569578,6 @@
+ "987051cdbad355cbb1bbb8ea1030a3b17e533f09",
+ "manual"
+ ],
+->>>>>>> cdaa87569629... Bug 1389274 - Correct the behavior of Element.scrollIntoView to match the draft spec and pass web platform tests; r=annevk,bkelly
+ "cssom-view/scrollIntoView-shadow.html": [
+ "3c4a18992105fd7bf19cbf29f0b6d80cb12ca98c",
+ "testharness"
diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec
index b5f3ae0..2e827e8 100644
--- a/waterfox/waterfox.spec
+++ b/waterfox/waterfox.spec
@@ -1,6 +1,6 @@
-%global commit f367fd24ba208519742e7370fb1478c3ed0d14c7
+%global commit fa114d424de1ccfc6a8ee5b13cef8b506d0d87eb
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global date 20190201
+%global date 20190313
%global with_snapshot 1
%global freebsd_rev 480450
@@ -119,7 +119,7 @@ ExcludeArch: armv7hl
Summary: Waterfox Web browser
Name: waterfox
-Version: 56.2.7.1
+Version: 56.2.8
Release: 3%{?gver}%{?dist}
URL: https://www.waterfoxproject.org
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -151,7 +151,6 @@ Patch18: xulrunner-24.0-jemalloc-ppc.patch
Patch20: firefox-build-prbool.patch
Patch25: rhbz-1219542-s390-build.patch
Patch26: build-icu-big-endian.patch
-Patch27: mozilla-1335250.patch
Patch30: fedora-build.patch
Patch31: build-ppc64-s390x-curl.patch
Patch32: build-rust-ppc64le.patch
@@ -160,8 +159,6 @@ Patch36: build-missing-xlocale-h.patch
# Always feel lucky for unsupported platforms:
# https://bugzilla.mozilla.org/show_bug.cgi?id=1347128
Patch37: build-jit-atomic-always-lucky.patch
-# Fixing missing cacheFlush when JS_CODEGEN_NONE is used (s390x)
-Patch38: build-cacheFlush-missing.patch
Patch39: mozilla-1494037.patch
# Fedora specific patches
@@ -178,7 +175,6 @@ Patch230: rhbz-1497932.patch
Patch402: mozilla-1196777.patch
Patch406: mozilla-256180.patch
Patch413: mozilla-1353817.patch
-Patch414: mozilla-1435695.patch
Patch415: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
Patch416: bug1375074-save-restore-x28.patch
Patch417: mozilla-1436242.patch
@@ -186,9 +182,10 @@ Patch418: https://hg.mozilla.org/integration/autoland/raw-rev/342812d23eb
Patch419: https://hg.mozilla.org/mozilla-central/raw-rev/4723934741c5#/mozilla-1320560.patch
Patch420: https://hg.mozilla.org/mozilla-central/raw-rev/97dae871389b#/mozilla-1389436.patch
-# Upstream updates
+# Upstream updates/PRs
-#Patch???: %%{vc_url}/commit/commit.patch#/wf-commit.patch
+#Patch???: %%{vc_url}/commit/commit.patch#/%%{name}-gh-commit.patch
+Patch450: %{vc_url}/pull/888.patch#/%{name}-gh-pull888.patch
# Debian patches
Patch500: mozilla-440908.patch
@@ -206,6 +203,7 @@ Patch700: %{name}-nolangpacks.patch
Patch701: %{name}-waterfoxdir-1.patch
Patch702: %{name}-waterfoxdir-2.patch
Patch703: %{name}-webrtc-gtest-libv4l2.patch
+Patch704: %{name}-fix-testing-file.patch
%if 0%{?system_nss}
@@ -309,6 +307,9 @@ BuildRequires: pkgconfig(libffi)
%if 0%{?use_xvfb}
BuildRequires: xorg-x11-server-Xvfb
%endif
+%if 0%{?build_with_pgo} || !0%{?run_tests}
+BuildRequires: librsvg2
+%endif
BuildRequires: rust
BuildRequires: cargo
BuildRequires: clang-devel
@@ -385,7 +386,6 @@ This package contains results of tests executed during build.
%patch402 -p1 -b .1196777
%patch406 -p1 -b .256180
%patch413 -p1 -b .1353817
-%patch414 -p1 -b .1435695
%ifarch %{arm}
%patch415 -p1 -b .mozilla-1238661
%endif
@@ -395,6 +395,8 @@ This package contains results of tests executed during build.
%patch419 -p1 -b .mozilla-1320560
%patch420 -p1 -b .mozilla-1389436
+%patch450 -p1 -b .pull888
+
# Debian extension patch
%patch500 -p1 -b .440908
@@ -443,6 +445,7 @@ done
%patch701 -p1 -b .waterfoxdir-1
%patch702 -p1 -b .waterfoxdir-2
%patch703 -p1 -b .lv4l2
+%patch704 -p1 -b .fix-testing-file
# Patch for big endian platforms only
%if 0%{?big_endian}
@@ -643,7 +646,12 @@ MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS $(echo "%{optflags}" | sed -e 's/-Wall//')"
# for some sources
# Explicitly force the hardening flags for Waterfox so it passes the checksec test;
# See also https://fedoraproject.org/wiki/Changes/Harden_All_Packages
+%if 0%{?fedora} < 30
MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security"
+%else
+# Workaround for mozbz#1531309
+MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | sed -e 's/-Werror=format-security//')
+%endif
%if 0%{?build_with_clang}
# Fedora's default compiler flags conflict with what clang supports
MOZ_OPT_FLAGS="$(echo "$MOZ_OPT_FLAGS" | sed -e 's/-fstack-clash-protection//')"
@@ -993,9 +1001,18 @@ fi
#---------------------------------------------------------------------
%changelog
-* Wed Mar 6 2019 B Stack <bgstack15@gmail.com> - 56.2.7.1-3.20190201gitf367fd2
+* Fri Mar 29 2019 B Stack <bgstack15@gmail.com> - 56.2.8.1-3.20190313gitfa114d4
- repackage for stackrpms
+* Thu Mar 14 2019 Phantom X <megaphantomx at bol dot com dot br> - 56.2.8-1.20190313gitfa114d4
+- New release/snapshot
+- Temporary fix to rust BR, build is failing with 1.33+
+- format-security flags changes from Fedora Firefox
+
+* Mon Mar 11 2019 Phantom X <megaphantomx at bol dot com dot br> - 56.2.7.1-3.20190303git61bdb81
+- New snapshot
+- Rework MOZ_OPT_FLAGS to enable better parallel LTO build support
+
* Wed Feb 13 2019 Phantom X <megaphantomx at bol dot com dot br> - 56.2.7.1-2.20190201gitf367fd2
- LTO and fixes to build with it
bgstack15