summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/iceape/PKGBUILD9
-rw-r--r--libre/iceape/add-bracket-for-sed-4.3-compliance.patch29
2 files changed, 36 insertions, 2 deletions
diff --git a/libre/iceape/PKGBUILD b/libre/iceape/PKGBUILD
index 1713beb42..baefc19fa 100644
--- a/libre/iceape/PKGBUILD
+++ b/libre/iceape/PKGBUILD
@@ -31,7 +31,8 @@ source=("https://archive.mozilla.org/pub/mozilla.org/$_pkgname/releases/$pkgver/
$pkgname-2.0-lang.patch
libre.patch
rhbz-966424.patch
- xulrunner-27.0-build-arm.patch)
+ xulrunner-27.0-build-arm.patch
+ add-bracket-for-sed-4.3-compliance.patch)
sha256sums=('39c84ce6fa1ed7c30152473e0dcd858df07437e84b29e5a18973db437a28a912'
'ed6f0aab804235a8ea32631b8d8d664329e9507f7aa6fb016c87042bace51a44'
'SKIP'
@@ -40,7 +41,8 @@ sha256sums=('39c84ce6fa1ed7c30152473e0dcd858df07437e84b29e5a18973db437a28a912'
'ab19d10fbd6258aec37ab5e5efb12429814b2c24a1193284a48dd654311b4e2e'
'8055e44151f007dd176d2bc545aa3ce282e9b1a59b35ca1f9f93d1c3e21689cd'
'746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a'
- 'bc83b8a51c81a401da2fbe1f7cd0843248c32607d3a51119585df074d797922e')
+ 'bc83b8a51c81a401da2fbe1f7cd0843248c32607d3a51119585df074d797922e'
+ '0b543c953b7357b9b681121006ab1617263dacf611bb2798c8008fc98aebb2e6')
validpgpkeys=(
'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva
'684D54A189305A9CC95446D36B888913DDB59515' # Márcio Silva
@@ -135,6 +137,9 @@ prepare() {
# 2.26 build fix from wgnie (blfs ch 37)
sed -i 's/$(MOZ_ZLIB_CFLAGS)/& $(MOZ_PIXMAN_CFLAGS)/' config/config.mk
+ # 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
cat >> .mozconfig <<- EOF
diff --git a/libre/iceape/add-bracket-for-sed-4.3-compliance.patch b/libre/iceape/add-bracket-for-sed-4.3-compliance.patch
new file mode 100644
index 000000000..ab0b26b67
--- /dev/null
+++ b/libre/iceape/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
+