From 4a1377787326322cf02a9368d515dacc8f3dd539 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Wed, 18 Jan 2017 06:07:08 -0300
Subject: icecat: add bracket for sed 4.3 compliance ->
 https://bugzilla.mozilla.org/show_bug.cgi?id=1329272

---
 libre/icecat/PKGBUILD                              | 11 +++++---
 .../add-bracket-for-sed-4.3-compliance.patch       | 29 ++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 libre/icecat/add-bracket-for-sed-4.3-compliance.patch

(limited to 'libre/icecat')

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 74befd8af..566d77695 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -48,7 +48,8 @@ source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{
         $pkgname-gtk3-20.patch
         disable-crypto-hardening-settings.patch
         disable-spoofSource-referer.patch
-        no-neon.patch )
+        no-neon.patch
+        add-bracket-for-sed-4.3-compliance.patch)
 sha256sums=('8163e5bc53f69d9f9b0fc5e9f95fae33da8139ae0f902756751cadbaa27e6ee9'
             'SKIP'
             '89f375161a085ec37e88d5ceb9562dc33ed8ef03e225fefa819dfe3c6eb7290f'
@@ -65,7 +66,8 @@ sha256sums=('8163e5bc53f69d9f9b0fc5e9f95fae33da8139ae0f902756751cadbaa27e6ee9'
             '2e355a477f1df792cd7f9d1e3a56030543e0cf2d09051dd293ba495a7edb54fd'
             '0166aa368420f0bf0aab064b2188e3d852b241efeeb27dee66df2bc15e84b83a'
             'c50043266e69f5844e6dce9ea7193af79587dcaa66806932d7867281a176f03e'
-            '6d0c1c9ca28b20d206ce24ca84f4d4e3f5d062a2e9cb7445fcb6c2cfea959b4a')
+            '6d0c1c9ca28b20d206ce24ca84f4d4e3f5d062a2e9cb7445fcb6c2cfea959b4a'
+            '0b543c953b7357b9b681121006ab1617263dacf611bb2798c8008fc98aebb2e6')
 validpgpkeys=(
               'A57369A8BABC2542B5A0368C3C76EED7D7E04784' # Ruben Rodriguez
 )
@@ -133,7 +135,10 @@ prepare() {
   # https://labs.parabola.nu/issues/1073
   patch -Np1 -i "$srcdir/disable-spoofSource-referer.patch"
 
-    # ARM-specific changes:
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1329272
+  patch -Np1 -i ../add-bracket-for-sed-4.3-compliance.patch
+
+  # ARM-specific changes:
   if [[ "$CARCH" == arm* ]]; then
       sed -i '/ac_add_options --enable-rust/d' .mozconfig
       echo "ac_add_options --disable-ion" >> .mozconfig
diff --git a/libre/icecat/add-bracket-for-sed-4.3-compliance.patch b/libre/icecat/add-bracket-for-sed-4.3-compliance.patch
new file mode 100644
index 000000000..ab0b26b67
--- /dev/null
+++ b/libre/icecat/add-bracket-for-sed-4.3-compliance.patch
@@ -0,0 +1,29 @@
+From 66fc64a75617ffc68f16780f60e39c1f368dfd41 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Mon, 9 Jan 2017 14:37:33 +0100
+Subject: [PATCH] bug 1329272: add bracket for sed 4.3 compliance, r=glandium
+
+---
+ build/autoconf/icu.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4
+index 4f46345f435a..794ddcdf4e52 100644
+--- a/build/autoconf/icu.m4
++++ b/build/autoconf/icu.m4
+@@ -67,11 +67,11 @@ if test -n "$USE_ICU"; then
+         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"
+ 
+-- 
+2.11.0
+
-- 
cgit v1.2.3