From da9fd2054cb0d506cad18e7661698cec75ad211f Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Sun, 26 May 2019 21:54:39 +0200
Subject: libre/iceweasel: build passes for 67.0

---
 libre/iceweasel/PKGBUILD  | 16 +++++++++-------
 libre/iceweasel/arm.patch | 23 +++++++----------------
 2 files changed, 16 insertions(+), 23 deletions(-)

(limited to 'libre/iceweasel')

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 70f622335..b7765ccad 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -42,8 +42,8 @@ epoch=1
 pkgver=67.0
 pkgrel=1
 pkgrel+=.parabola1
-_brandingver=66.0
-_brandingrel=1
+_brandingver=67.0
+_brandingrel=2
 pkgdesc="Libre standalone web browser based on Mozilla Firefox"
 arch=(x86_64)
 arch+=(i686 armv7h)
@@ -74,11 +74,11 @@ sha256sums=('2cb937db00e35162393aa5b65d1f2280be1e62d5ee33d3e9997cccba542d791b'
             'SKIP'
             'd0673786a6a1f1b9f6f66a3a1356afa33f1f18f59dabd92bd193c88c52a1d04c'
             'e439117380218898cd5c60a8da8947847efbd0fe64cc06b129d6ca20a392cb3d'
-            'ffac6b832ba2f80ac0682aa5ee88006b7033543b8be89fc17deec30b1b2c4d12'
+            '0151b49e9f5d3bdce64ac0854d84fa5157a65df2d7e16eb683366cbeee021805'
             'SKIP'
             '7b53a5528bbc24bb8d981b6298929a44e8ff01724eee0eedfebc2627dd56b565'
             'a315507efe495ba55ab4ae52b1e2b3a0c1e7ac54b7ed976899da1dcd03532f95'
-            '2c9e39b9b62d5a75e31908cb4d42ff8006ff9406aed2f7deff826fe1466cd31a'
+            'bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966'
             '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353'  # Mozilla Software Releases
               'BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin
@@ -136,24 +136,26 @@ END
 
   if [[ $CARCH = arm* ]]; then
     sed -i '/--enable-hardening/d' .mozconfig
+    sed -i '/--enable-optimize/d' .mozconfig
     sed -i '/--enable-rust-simd/d' .mozconfig
     sed -i '/--enable-lto/d' .mozconfig
     sed -i '/export MOZ_PGO/d' .mozconfig
+    sed -i '/--disable-eme/d' .mozconfig
 
     patch -Np1 -i ../arm.patch
     patch -Np1 -i ../build-arm-libopus.patch
 
     cat >> .mozconfig <<END
 ac_add_options --enable-optimize="-O2"
+ac_add_options --disable-webrtc
 ac_add_options --disable-elf-hack
 ac_add_options --disable-av1
-mk_add_options MOZ_MAKE_FLAGS="$MAKEFLAGS"
 END
   fi
 
   if [[ $CARCH = i686 ]]; then
-    sed -i '/--enable-lto/d' .mozconfig
     sed -i '/--enable-rust-simd/d' .mozconfig
+    sed -i '/--enable-lto/d' .mozconfig
     sed -i '/export MOZ_PGO/d' .mozconfig
 
     cat >> .mozconfig <<END
@@ -207,7 +209,7 @@ END
   cp -av -- /usr/lib/mozilla/searchplugins/* browser/components/search/searchplugins/
 
   # Disable various components at the source level
-  sed -i 's/;1/;0/' toolkit/components/telemetry/TelemetryStartup.jsm
+  sed -i 's/;1/;0/' toolkit/components/telemetry/components.conf
   #sed -i 's/;1/;0/' browser/experiments/Experiments.manifest
   #sed -i '/pocket/d'          browser/extensions/moz.build
   #sed -i '/activity-stream/d' browser/extensions/moz.build
diff --git a/libre/iceweasel/arm.patch b/libre/iceweasel/arm.patch
index a5ce2c542..9e2ed1510 100644
--- a/libre/iceweasel/arm.patch
+++ b/libre/iceweasel/arm.patch
@@ -1,24 +1,15 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=1526653
 
 diff --git a/js/src/wasm/WasmSignalHandlers.cpp.orig b/js/src/wasm/WasmSignalHandlers.cpp
-index d46b1c6..cf4c957 100644
+index 636537f..0f3461a 100644
 --- a/js/src/wasm/WasmSignalHandlers.cpp.orig
 +++ b/js/src/wasm/WasmSignalHandlers.cpp
-@@ -228,7 +228,7 @@ using mozilla::DebugOnly;
- #  error "Don't know how to read/write to the thread state via the mcontext_t."
- #endif
+@@ -244,7 +244,7 @@ using mozilla::DebugOnly;
+ // emulation here.
  
--#if defined(__linux__) && defined(__arm__)
-+#if 0 && defined(__linux__) && defined(__arm__)
- #  include <sys/user.h>
+ #if defined(__linux__) && defined(__arm__)
+-#  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
++//#  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
  #endif
  
-@@ -456,7 +456,7 @@ struct AutoHandlingTrap {
-   }
- };
- 
--#if defined(__linux__) && defined(__arm__)
-+#if 0 && defined(__linux__) && defined(__arm__)
- 
- // Code to handle SIGBUS for unaligned floating point accesses on 32-bit ARM.
- 
+ #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
-- 
cgit v1.2.3