summaryrefslogtreecommitdiff
path: root/waterfox/stackrpms-2019-03-06.diff
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2019-04-17 14:40:22 +0000
committerB Stack <bgstack15@gmail.com>2019-04-17 14:40:22 +0000
commit0ac673f30cefe3f6acbdcca177505d8c4a89f8dd (patch)
tree0024cc9509ab6f1a93d2ce18a1a118b49dacb926 /waterfox/stackrpms-2019-03-06.diff
parentMerge branch 'freefilesync-bump' into 'master' (diff)
parentwaterfox: WIP do not use pinned rust (diff)
downloadstackrpms-0ac673f30cefe3f6acbdcca177505d8c4a89f8dd.tar.gz
stackrpms-0ac673f30cefe3f6acbdcca177505d8c4a89f8dd.tar.bz2
stackrpms-0ac673f30cefe3f6acbdcca177505d8c4a89f8dd.zip
Merge branch 'waterfox-rpm' into 'master'
Waterfox 56.2.8 See merge request bgstack15/stackrpms!53
Diffstat (limited to 'waterfox/stackrpms-2019-03-06.diff')
-rw-r--r--waterfox/stackrpms-2019-03-06.diff134
1 files changed, 134 insertions, 0 deletions
diff --git a/waterfox/stackrpms-2019-03-06.diff b/waterfox/stackrpms-2019-03-06.diff
new file mode 100644
index 0000000..f05d9fd
--- /dev/null
+++ b/waterfox/stackrpms-2019-03-06.diff
@@ -0,0 +1,134 @@
+diff -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/distribution.ini stackrpms/waterfox/distribution.ini
+--- chinforpms/waterfox/distribution.ini 2018-11-05 14:29:34.793145640 -0500
++++ stackrpms/waterfox/distribution.ini 2019-01-15 11:12:47.458208372 -0500
+@@ -1,9 +1,9 @@
+ [Global]
+-id=chinforpms
++id=stackrpms
+ version=1.0
+ about=Waterfox for Fedora
+
+ [Preferences]
+-app.distributor=chinforpms
+-app.distributor.channel=chinforpms
+-app.partner.fedora=chinforpms
++app.distributor=stackrpms
++app.distributor.channel=stackrpms
++app.partner.fedora=stackrpms
+diff -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/issue2947383002_1.diff stackrpms/waterfox/issue2947383002_1.diff
+--- chinforpms/waterfox/issue2947383002_1.diff 2018-11-05 14:29:34.794145647 -0500
++++ stackrpms/waterfox/issue2947383002_1.diff 1969-12-31 19:00:00.000000000 -0500
+@@ -1,60 +0,0 @@
+-Index: webrtc/common_audio/vad/vad_core.c
+-diff --git a/webrtc/common_audio/vad/vad_core.c b/webrtc/common_audio/vad/vad_core.c
+-index 0340165eb5050ec9fbc386f6d373d0d90a4868f1..1a3889c36787f7bf993692e8fe7781c2ae35e2c2 100644
+---- a/webrtc/common_audio/vad/vad_core.c
+-+++ b/webrtc/common_audio/vad/vad_core.c
+-@@ -115,8 +115,8 @@ static int32_t WeightedAverage(int16_t* data, int16_t offset,
+- // 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;
+- }
+-
+-Index: webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c
+-diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c
+-index 039bbc8af7ec26e286dfc94b4383428e5e6e863b..dc8bcf3f481012caab8718430aa9242cf91ad480 100644
+---- a/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c
+-+++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c
+-@@ -193,16 +193,16 @@ static void CalcCorrelation(int32_t *PSpecQ12, int32_t *CorrQ7)
+- // undefined behavior, so not a good idea; this just makes UBSan ignore the
+- // violations, so that our old code can continue to do what it's always been
+- // doing.)
+--static inline int32_t OverflowingMulS16S32ToS32(int16_t a, int32_t b)
+-- RTC_NO_SANITIZE("signed-integer-overflow") {
+-+static inline int32_t RTC_NO_SANITIZE("signed-integer-overflow")
+-+ OverflowingMulS16S32ToS32(int16_t a, int32_t b) {
+- return a * b;
+- }
+--static inline int32_t OverflowingAddS32S32ToS32(int32_t a, int32_t b)
+-- RTC_NO_SANITIZE("signed-integer-overflow") {
+-+static inline int32_t RTC_NO_SANITIZE("signed-integer-overflow")
+-+ OverflowingAddS32S32ToS32(int32_t a, int32_t b) {
+- return a + b;
+- }
+--static inline int32_t OverflowingSubS32S32ToS32(int32_t a, int32_t b)
+-- RTC_NO_SANITIZE("signed-integer-overflow") {
+-+static inline int32_t RTC_NO_SANITIZE("signed-integer-overflow")
+-+ OverflowingSubS32S32ToS32(int32_t a, int32_t b) {
+- return a - b;
+- }
+-
+-Index: webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c
+-diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c
+-index 2b92acb64a3d7dd268574abb57a24850b60cb3d1..b69a885f34de9eaa762a69f11d84cc8bec637376 100644
+---- a/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c
+-+++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c
+-@@ -209,8 +209,8 @@ void WebRtcIsacfix_NormLatticeFilterMa(size_t orderCoef,
+- // 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 -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/waterfox-cubeb-build.patch stackrpms/waterfox/waterfox-cubeb-build.patch
+--- chinforpms/waterfox/waterfox-cubeb-build.patch 2018-11-05 14:29:34.795145654 -0500
++++ stackrpms/waterfox/waterfox-cubeb-build.patch 1969-12-31 19:00:00.000000000 -0500
+@@ -1,8 +0,0 @@
+---- Waterfox-56.0.2/media/libcubeb/src/moz.build.cubebbuild 2018-01-05 16:39:00.921101411 -0200
+-+++ Waterfox-56.0.2/media/libcubeb/src/moz.build 2018-01-05 16:40:44.948718748 -0200
+-@@ -89,4 +89,4 @@ CFLAGS += CONFIG['MOZ_ALSA_CFLAGS']
+- CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS']
+-
+- # We allow warnings for third-party code that can be updated from upstream.
+--AllowCompilerWarnings()
+-+ALLOW_COMPILER_WARNINGS = True
+diff -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/waterfox-mozconfig stackrpms/waterfox/waterfox-mozconfig
+--- chinforpms/waterfox/waterfox-mozconfig 2019-01-15 11:35:07.704294765 -0500
++++ stackrpms/waterfox/waterfox-mozconfig 2019-01-17 07:54:36.258797151 -0500
+@@ -41,4 +41,4 @@
+ ac_add_options --with-app-name=waterfox
+ ac_add_options --with-app-basename=Waterfox
+ ac_add_options --with-branding=browser/branding/unofficial
+-ac_add_options --with-distribution-id=chinforpms
++ac_add_options --with-distribution-id=stackrpms
+diff -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/waterfox.spec stackrpms/waterfox/waterfox.spec
+--- chinforpms/waterfox/waterfox.spec 2019-03-06 07:48:49.852601972 -0500
++++ stackrpms/waterfox/waterfox.spec 2019-03-06 08:29:09.565750261 -0500
+@@ -91,7 +91,8 @@
+ %global webp_version 1.0.0
+ %endif
+ %if 0%{?system_vorbis}
+-%global ogg_version 1.3.3
++# decrease this to fc28 libogg version and hope it works 2018-09-14
++%global ogg_version 1.3.2
+ %global vorbis_version 1.3.5
+ %endif
+
+@@ -119,7 +120,7 @@
+ Summary: Waterfox Web browser
+ Name: waterfox
+ Version: 56.2.7.1
+-Release: 2%{?gver}%{?dist}
++Release: 3%{?gver}%{?dist}
+ URL: https://www.waterfoxproject.org
+ License: MPLv1.1 or GPLv2+ or LGPLv2+
+
+@@ -992,6 +993,9 @@
+ #---------------------------------------------------------------------
+
+ %changelog
++* Wed Mar 6 2019 B Stack <bgstack15@gmail.com> - 56.2.7.1-3.20190201gitf367fd2
++- repackage for stackrpms
++
+ * 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