libre/iceape: updated to 2.49.4

8 files changed, 57 insertions, 124 deletions

diff --git a/libre/iceape/PKGBUILD b/libre/iceape/PKGBUILD
index 9b3fb7cf1..8d8c3f06a 100644
--- a/libre/iceape/PKGBUILD
+++ b/libre/iceape/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id$
 # Maintainer (Arch): Kyle Keen <keenerd@gmail.com>
 # Maintainer: Andreas Grapentin <andreas@grapentin.org>
 # Contributor: André Silva <emulatorman@hyperbola.info>
@@ -7,16 +6,15 @@
 _pkgname=seamonkey
 pkgname=iceape
 epoch=1
-pkgver=2.49.2
+pkgver=2.49.4
 pkgrel=4
-_bver=2.48
-_brel=1
+_brandingver=2.49
+_brandingrel=1
 pkgdesc="Iceape, the libre internet suite based on SeaMonkey."
 arch=('x86_64')
 arch+=('i686' 'armv7h')
 license=('MPL')
-depends=('alsa-lib'  'dbus-glib'  'desktop-file-utils'  'gtk2' 'gtk3' 'hunspell'  'libevent'  'libnotify'  'libvpx'  'libxt' 'mime-types'  'mozilla-common'  'nss'  'sqlite'  'startup-notification' 'libpulse' 'icu' 'gconf')
-depends+=('icu>=63' 'icu<64')
+depends=('alsa-lib'  'dbus-glib'  'desktop-file-utils'  'gtk2' 'gtk3' 'hunspell'  'libevent'  'libnotify'  'libvpx'  'libxt' 'mime-types'  'mozilla-common'  'nss'  'sqlite'  'startup-notification' 'libpulse' 'icu')
 makedepends=('unzip' 'zip' 'pkg-config'  'python2' 'yasm' 'wireless_tools' 'mesa' 'autoconf2.13' 'imake' 'python3' 'gst-plugins-base')
 makedepends+=('mozilla-searchplugins' 'quilt')
 optdepends=('gst-plugins-base: vorbis decoding, ogg demuxing'
@@ -26,36 +24,35 @@ optdepends=('gst-plugins-base: vorbis decoding, ogg demuxing'
 url="https://wiki.parabola.nu/$pkgname"
 replaces=("$_pkgname")
 conflicts=("$_pkgname")
-source=(https://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/$pkgver/source/seamonkey-$pkgver.source.tar.xz
+source=("https://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/$pkgver/source/seamonkey-$pkgver.source.tar.xz"
         mozconfig
-        $pkgname-2.0-lang.patch
-        rhbz-966424.patch
-        mozbug1323209.patch
-        mozbug1329272.patch
+        seamonkey-2.0-lang.patch
+        patch-bug1435212.xz
 	no-crmf.diff)
-source+=(https://repo.parabola.nu/other/$pkgname/${pkgname}_$_bver-$_brel.branding.tar.xz{,.sig}
-         libre.patch $pkgname.desktop)
-sha256sums=('09fc9f8b1817a901b4e0d7635701ab50236885821d73694ac21615c8d911b575'
-            '1e88c4f6a1bd8170a714087325c3ba0b88c0b4352c4cd4db58317a3a0d2271c4'
+source+=(https://repo.parabola.nu/other/$pkgname/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz{,.sig}
+         libre.patch
+         $pkgname.desktop
+         xulrunner-27.0-build-arm.patch)
+sha256sums=('c8a66774d0a3525698b559fa2c41397186f2de99c5733e35b8eafb0ae5ccc4ee'
+            '4e55b0fbbec93e4d7f68118722fa7c61c06b55aa888c6f2923710a0b3953115b'
             'ab19d10fbd6258aec37ab5e5efb12429814b2c24a1193284a48dd654311b4e2e'
-            '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a'
-            '87fb92e45f161d47b9e3ca31bcce60555bc33d633116dab4baa3bfba6ad965c4'
-            '33c7031781357faf5fba7140d7723bf301c1569068922477742ac958ee82e62b'
+            'dce68858694f820a9a1fc2428038a88ea00b4835cea0778734db794fea3bb21a'
             'fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb'
-            '2fd3568b07e4dddb0f81201c273c7a5ebb2ba837f49f71683b98f374d03134b4'
+            'c6d571ce5fcec98742cc588b56cb543489b73e7e53eeaf0a8f46910f58782ad8'
             'SKIP'
-            '8055e44151f007dd176d2bc545aa3ce282e9b1a59b35ca1f9f93d1c3e21689cd'
-            '46ac418fe26937460a36a593d71c8f5cef1288c9e747cac4ec4ca92db56da45d')
+            '5fb5ae632c8c103d8d7be123f32340881372ee1e1b29f19790d058ee8eb16eb0'
+            '46ac418fe26937460a36a593d71c8f5cef1288c9e747cac4ec4ca92db56da45d'
+            'bc83b8a51c81a401da2fbe1f7cd0843248c32607d3a51119585df074d797922e')
 validpgpkeys=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin
 
 prepare() {
   cd "$_pkgname-$pkgver"
   cp ../mozconfig .mozconfig
-  #patch -Np1 -i ../$pkgname-2.0-lang.patch
+  #patch -Np1 -i ../seamonkey-2.0-lang.patch
 
   # perform branding
   install -m755 -d $pkgname
-  mv -v "$srcdir"/$pkgname-$_bver/{branding,extras,patches} $pkgname
+  mv -v "$srcdir"/$pkgname-$_brandingver/{branding,extras,patches} $pkgname
 
   export QUILT_PATCHES=$pkgname/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
@@ -115,14 +112,9 @@ prepare() {
   # FS#48404
   #echo "ac_add_options --enable-gstreamer=1.0" >> .mozconfig
 
-  # https://bugs.archlinux.org/task/41689
-  #patch -Np1 -d mozilla -i ../../rhbz-966424.patch
-
-  # Support NSS 3.28
-  #patch -Np1 -d mozilla -i ../../mozbug1323209.patch
-
-  # Bugfix for icu detection
-  #patch -Np1 -d mozilla -i ../../mozbug1329272.patch
+  # ffmpeg 4.0 patch from freebsd
+  # https://github.com/freebsd/freebsd-ports/blob/master/www/seamonkey/files/patch-bug1435212
+  patch -Np1 -d mozilla -i ../../patch-bug1435212
 
   # Don't exit with error when some libs are missing which we have in
   # system.
@@ -137,6 +129,20 @@ prepare() {
   # work around from FS#54395
   patch -Np1 -d mozilla -i ../../no-crmf.diff
   sed -i "s/'crmf',//" mozilla/security/manager/ssl/moz.build
+  sed -i 's/^.*-lcrmf/#&/' mozilla/config/external/nss/crmf/moz.build
+  sed -i 's/ -lcrmf"/"/' mozilla/old-configure.in.orig
+  sed -i 's/ -lcrmf"/"/' mozilla/old-configure
+  sed -i 's/SDK_LIBS = crmf/SDK_LIBS = /' mozilla/config/external/nss/Makefile.in
+
+  if [[ $CARCH = i686 ]]; then
+    LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
+  fi
+
+  if [[ $CARCH = arm* ]]; then
+    echo "ac_add_options --disable-elf-hack" >> .mozconfig
+    LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
+    patch -p2 -d mozilla -i "${srcdir}"/xulrunner-27.0-build-arm.patch
+  fi
 }
 
 build() {
@@ -155,6 +161,10 @@ build() {
 }
 
 package() {
+  local _icu_ver
+  _icu_ver=$(pacman -S --print-format='%v' icu)
+  depends+=("icu>=${_icu_ver}" "icu<$((${_icu_ver%%.*} + 1))")
+
   cd "$_pkgname-$pkgver"
 
   make -j1 -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install
diff --git a/libre/iceape/libre.patch b/libre/iceape/libre.patch
index bdf54e25f..2a95f913c 100644
--- a/libre/iceape/libre.patch
+++ b/libre/iceape/libre.patch
@@ -12,7 +12,7 @@ diff --git a/mozilla/browser/locales/en-US/chrome/browser-region/region.properti
 index e078ed528..ce2c5ed4d 100644
 --- a/mozilla/browser/locales/en-US/chrome/browser-region/region.properties
 +++ b/mozilla/browser/locales/en-US/chrome/browser-region/region.properties
-@@ -3,17 +3,12 @@
+@@ -3,16 +3,12 @@
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
  # Default search engine
@@ -21,8 +21,7 @@ index e078ed528..ce2c5ed4d 100644
  
  # Search engine order (order displayed in the search bar dropdown)s
 -browser.search.order.1=Google
--browser.search.order.2=Yahoo
--browser.search.order.3=Bing
+-browser.search.order.2=Bing
 -
 -# This is the default set of web based feed handlers shown in the reader
 -# selection UI
@@ -34,7 +33,7 @@ index e078ed528..ce2c5ed4d 100644
  
  # increment this number when anything gets changed in the list below.  This will
  # cause Firefox to re-read these prefs and inject any new handlers into the 
-@@ -22,20 +17,10 @@ browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s
+@@ -21,20 +17,10 @@ browser.contentHandlers.types.0.uri=http
  # don't make any spelling errors here.
  gecko.handlerService.defaultHandlersVersion=4
  
diff --git a/libre/iceape/mozbug1323209.patch b/libre/iceape/mozbug1323209.patch
deleted file mode 100644
index 92c1376ae..000000000
--- a/libre/iceape/mozbug1323209.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-
-# HG changeset patch
-# User Franziskus Kiefer <franziskuskiefer@gmail.com>
-# Date 1469717280 -7200
-# Node ID 361ac226da2a83516db8d4e4c5b41a69b3ba754f
-# Parent  5d5d3ef04f3f77bb95616f56c129256a89f57831
-Bug 1290037 - Update keybits in H2, r=mt
-
-MozReview-Commit-ID: 35oWoDMqe1Y
-
-diff --git a/netwerk/protocol/http/Http2Session.cpp b/netwerk/protocol/http/Http2Session.cpp
---- a/netwerk/protocol/http/Http2Session.cpp
-+++ b/netwerk/protocol/http/Http2Session.cpp
-@@ -3544,18 +3544,18 @@ Http2Session::ConfirmTLSProfile()
-     RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
-   }
- 
-   uint32_t keybits = ssl->GetKEAKeyBits();
-   if (kea == ssl_kea_dh && keybits < 2048) {
-     LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n",
-           this, keybits));
-     RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
--  } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128
--    LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n",
-+  } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1.
-+    LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n",
-           this, keybits));
-     RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
-   }
- 
-   int16_t macAlgorithm = ssl->GetMACAlgorithmUsed();
-   LOG3(("Http2Session::ConfirmTLSProfile %p MAC Algortihm (aead==6) %d\n",
-         this, macAlgorithm));
-   if (macAlgorithm != nsISSLSocketControl::SSL_MAC_AEAD) {
-
diff --git a/libre/iceape/mozbug1329272.patch b/libre/iceape/mozbug1329272.patch
deleted file mode 100644
index 81a4ebb78..000000000
--- a/libre/iceape/mozbug1329272.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-
-# HG changeset patch
-# User Daniel Stenberg <daniel@haxx.se>
-# Date 1484000700 -3600
-# Node ID ebcbf47a83e7d3b89460cf1c991b6be5a79a967b
-# Parent  0759511f24e1b8d42acf5e9612f3ab91715842c2
-Bug 1329272 - add bracket for sed 4.3 compliance, r=glandium
-
-diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4
---- a/build/autoconf/icu.m4
-+++ b/build/autoconf/icu.m4
-@@ -64,17 +64,17 @@ if test -n "$USE_ICU"; then
-     icudir="$_topsrcdir/intl/icu/source"
-     if test ! -d "$icudir"; then
-         icudir="$_topsrcdir/../../intl/icu/source"
-         if test ! -d "$icudir"; then
-             AC_MSG_ERROR([Cannot find the ICU directory])
-         fi
-     fi
- 
--    version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
-+    version=`sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
-     if test x"$version" = x; then
-        AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno])
-     fi
-     MOZ_ICU_VERSION="$version"
- 
-     # TODO: the l is actually endian-dependent
-     # We could make this set as 'l' or 'b' for little or big, respectively,
-     # but we'd need to check in a big-endian version of the file.
-
diff --git a/libre/iceape/mozconfig b/libre/iceape/mozconfig
index 69fd3a09a..6d558048a 100644
--- a/libre/iceape/mozconfig
+++ b/libre/iceape/mozconfig
@@ -22,6 +22,7 @@ ac_add_options --enable-system-ffi
 #ac_add_options --enable-system-cairo
 ac_add_options --with-pthreads
 ac_add_options --enable-system-pixman
+ac_add_options --disable-gconf
 
 # Features
 ac_add_options --enable-startup-notification
diff --git a/libre/iceape/rhbz-966424.patch b/libre/iceape/rhbz-966424.patch
deleted file mode 100644
index c4c332e9e..000000000
--- a/libre/iceape/rhbz-966424.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/toolkit/modules/CertUtils.jsm
-+++ b/toolkit/modules/CertUtils.jsm
-@@ -170,17 +170,19 @@ this.checkCert =
-   issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3);
-   var tokenNames = issuerCert.getAllTokenNames({});
- 
-   if (!tokenNames || !tokenNames.some(isBuiltinToken))
-     throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT);
- }
- 
- function isBuiltinToken(tokenName) {
--  return tokenName == "Builtin Object Token";
-+  return tokenName == "Builtin Object Token" ||
-+         tokenName == "Default Trust" ||
-+         tokenName == "System Trust";
- }
- 
- /**
-  * This class implements nsIBadCertListener.  Its job is to prevent "bad cert"
-  * security dialogs from being shown to the user.  It is better to simply fail
-  * if the certificate is bad. See bug 304286.
-  *
-  * @param  aAllowNonBuiltInCerts (optional)
diff --git a/libre/iceape/iceape-2.0-lang.patch b/libre/iceape/seamonkey-2.0-lang.patch
index b9f4a5cde..b9f4a5cde 100644
--- a/libre/iceape/iceape-2.0-lang.patch
+++ b/libre/iceape/seamonkey-2.0-lang.patch
diff --git a/libre/iceape/xulrunner-27.0-build-arm.patch b/libre/iceape/xulrunner-27.0-build-arm.patch
new file mode 100644
index 000000000..f82dc4f36
--- /dev/null
+++ b/libre/iceape/xulrunner-27.0-build-arm.patch
@@ -0,0 +1,12 @@
+diff -up xulrunner-27.0/mozilla-release/gfx/ycbcr/moz.build.arm xulrunner-27.0/mozilla-release/gfx/ycbcr/moz.build
+--- firefox-27.0/mozilla-release/gfx/ycbcr/moz.build.arm	2014-01-28 05:03:42.000000000 +0100
++++ firefox-27.0/mozilla-release/gfx/ycbcr/moz.build	2014-02-03 11:14:34.062219509 +0100
+@@ -61,7 +61,7 @@ else:
+         'yuv_row_other.cpp',
+     ]
+ 
+-if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
++if CONFIG['HAVE_ARM_NEON']:
+     SOURCES += [
+         'yuv_row_arm.s',
+     ]