libre/icedove: update armv7h support

3 files changed, 130 insertions, 3 deletions

diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD
index 8bf063997..e59367332 100644
--- a/libre/icedove/PKGBUILD
+++ b/libre/icedove/PKGBUILD
@@ -12,7 +12,7 @@ _pkgname=thunderbird
 pkgname=icedove
 epoch=1
 pkgver=$_debver.$_debrel
-pkgrel=2
+pkgrel=3
 
 pkgdesc="A libre version of Debian Icedove, the standalone mail and news reader based on Mozilla Thunderbird."
 arch=(i686 x86_64 armv7h)
@@ -33,7 +33,9 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz"
         changing-the-default-search-engine.patch
         firefox-gcc-6.0.patch mozilla-1228540.patch mozilla-1228540-1.patch
         vendor.js
-        fix-missing-files.patch)
+        fix-missing-files.patch
+        no-neon.patch
+        mozilla-1253216.patch)
 sha256sums=('923e7e7a2b9c2e3bdb4424ab0517b93123ee16a1ad9bd55c3ccaa0f0f7796ad0'
             'e70bb2274c3a93549eca726c65ffd8b6c0a87a986214efd7c66dec3a4c5ac421'
             'aaca37bcca176d1b8ebe7c18d3fb0c61e3d21769fbf8e994a189eb3263257d3d'
@@ -43,7 +45,9 @@ sha256sums=('923e7e7a2b9c2e3bdb4424ab0517b93123ee16a1ad9bd55c3ccaa0f0f7796ad0'
             '3a3e84c702ee31450a3e84698441aceb11cf44e64c9fedcaddb8cb50db759417'
             'd1ccbaf0973615c57f7893355e5cd3a89efb4e91071d0ec376e429b50cf6ed19'
             '058b58074368b57acf8a6df9a9ffac848b7d7b39f5abd84cb2039bcee42b73e2'
-            '294a2cc7b0477ad285af10ac2a04b767cabec07f03b23da23014bda71caea510')
+            '294a2cc7b0477ad285af10ac2a04b767cabec07f03b23da23014bda71caea510'
+            '59f40d8b2480aa67bf76f4f119826b6828a6a59cc040caf1ab5a6e19eef44c6e'
+            '1e7ef08acd46aeacc8cd8b2c89012983fb2c8c18648e0f3e9371b0c76caedbde')
 
 prepare() {
   cd "$srcdir/$_pkgname-$_debver"
@@ -112,6 +116,21 @@ prepare() {
   # Load our searchplugins
   rm -rv mail/locales/en-US/searchplugins
   cp -av /usr/lib/mozilla/searchplugins mail/locales/en-US
+
+  # ARM-specific changes:
+  if [[ "$CARCH" == arm* ]]; then
+    patch -Np0 -i ../no-neon.patch
+    patch -p2 -d mozilla < ../mozilla-1253216.patch
+    sed -i '/ac_add_options --enable-gold/d' .mozconfig
+    cat >> .mozconfig <<- EOF
+	ac_add_options --disable-elf-hack
+	ac_add_options --disable-neon
+	ac_add_options --disable-ion
+	ac_add_options --disable-webrtc
+	ac_add_options --disable-debug
+	ac_add_options --disable-debug-symbols
+	EOF
+  fi
 }
 
 build() {
diff --git a/libre/icedove/mozilla-1253216.patch b/libre/icedove/mozilla-1253216.patch
new file mode 100644
index 000000000..6de072054
--- /dev/null
+++ b/libre/icedove/mozilla-1253216.patch
@@ -0,0 +1,12 @@
+diff -up firefox-45.0/firefox-45.0/js/src/jit/AtomicOperations.h.old firefox-45.0/firefox-45.0/js/src/jit/AtomicOperations.h
+--- firefox-45.0/firefox-45.0/js/src/jit/AtomicOperations.h.old	2016-03-01 09:45:01.000000000 +0100
++++ firefox-45.0/firefox-45.0/js/src/jit/AtomicOperations.h	2016-03-03 13:13:34.915015391 +0100
+@@ -305,7 +305,7 @@ AtomicOperations::isLockfree(int32_t siz
+     || defined(__ppc__) || defined(__PPC__)
+ # include "jit/none/AtomicOperations-ppc.h"
+ #elif defined(JS_CODEGEN_NONE)
+-# include "jit/none/AtomicOperations-none.h"
++# include "jit/none/AtomicOperations-ppc.h"
+ #elif defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
+ # include "jit/x86-shared/AtomicOperations-x86-shared.h"
+ #else
diff --git a/libre/icedove/no-neon.patch b/libre/icedove/no-neon.patch
new file mode 100644
index 000000000..af8bf198d
--- /dev/null
+++ b/libre/icedove/no-neon.patch
@@ -0,0 +1,96 @@
+--- mozilla/configure.orig	2016-04-19 12:42:57.280811615 -0600
++++ mozilla/configure	2016-04-19 12:44:20.697690476 -0600
+@@ -7389,14 +7389,7 @@
+ rm -f conftest*
+   echo "$ac_t"""$result"" 1>&6
+   if test "$result" = "yes"; then
+-      cat >> confdefs.pytmp <<\EOF
+-    (''' HAVE_ARM_SIMD ''', ' 1 ')
+-EOF
+-cat >> confdefs.h <<\EOF
+-#define HAVE_ARM_SIMD 1
+-EOF
+-
+-      HAVE_ARM_SIMD=1
++      HAVE_ARM_SIMD=
+   fi
+ 
+   echo $ac_n "checking ARM version support in compiler""... $ac_c" 1>&6
+@@ -7428,27 +7421,13 @@
+ rm -f conftest*
+   echo "$ac_t"""$result"" 1>&6
+   if test "$result" = "yes"; then
+-      cat >> confdefs.pytmp <<\EOF
+-    (''' HAVE_ARM_NEON ''', ' 1 ')
+-EOF
+-cat >> confdefs.h <<\EOF
+-#define HAVE_ARM_NEON 1
+-EOF
+-
+-      HAVE_ARM_NEON=1
++      HAVE_ARM_NEON=
+ 
+                   if test -n "$ARM_ARCH"; then
+           if test "$ARM_ARCH" -lt 7; then
+               BUILD_ARM_NEON=
+           else
+-              cat >> confdefs.pytmp <<\EOF
+-    (''' BUILD_ARM_NEON ''', ' 1 ')
+-EOF
+-cat >> confdefs.h <<\EOF
+-#define BUILD_ARM_NEON 1
+-EOF
+-
+-              BUILD_ARM_NEON=1
++              BUILD_ARM_NEON=
+           fi
+       fi
+   fi
+--- mozilla/js/src/configure.orig	2016-04-07 15:33:39.000000000 -0600
++++ mozilla/js/src/configure	2016-04-19 12:44:20.697690476 -0600
+@@ -6578,14 +6578,7 @@
+ rm -f conftest*
+   echo "$ac_t"""$result"" 1>&6
+   if test "$result" = "yes"; then
+-      cat >> confdefs.pytmp <<\EOF
+-    (''' HAVE_ARM_SIMD ''', ' 1 ')
+-EOF
+-cat >> confdefs.h <<\EOF
+-#define HAVE_ARM_SIMD 1
+-EOF
+-
+-      HAVE_ARM_SIMD=1
++      HAVE_ARM_SIMD=
+   fi
+ 
+   echo $ac_n "checking ARM version support in compiler""... $ac_c" 1>&6
+@@ -6617,27 +6610,13 @@
+ rm -f conftest*
+   echo "$ac_t"""$result"" 1>&6
+   if test "$result" = "yes"; then
+-      cat >> confdefs.pytmp <<\EOF
+-    (''' HAVE_ARM_NEON ''', ' 1 ')
+-EOF
+-cat >> confdefs.h <<\EOF
+-#define HAVE_ARM_NEON 1
+-EOF
+-
+-      HAVE_ARM_NEON=1
++      HAVE_ARM_NEON=
+ 
+                   if test -n "$ARM_ARCH"; then
+           if test "$ARM_ARCH" -lt 7; then
+               BUILD_ARM_NEON=
+           else
+-              cat >> confdefs.pytmp <<\EOF
+-    (''' BUILD_ARM_NEON ''', ' 1 ')
+-EOF
+-cat >> confdefs.h <<\EOF
+-#define BUILD_ARM_NEON 1
+-EOF
+-
+-              BUILD_ARM_NEON=1
++              BUILD_ARM_NEON=
+           fi
+       fi
+   fi