diff options
| -rw-r--r-- | libre/iceweasel/PKGBUILD | 9 | ||||
| -rw-r--r-- | libre/iceweasel/add-bracket-for-sed-4.3-compliance.patch | 29 |
2 files changed, 36 insertions, 2 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 1d7bfd44c..27091303d 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -65,7 +65,8 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz" fix-wifi-scanner.diff enable-object-directory-paths.patch mozilla-1253216.patch - mozilla-build-arm.patch) + mozilla-build-arm.patch + add-bracket-for-sed-4.3-compliance.patch) sha256sums=('9400f3d87077b7f9bdd746a52f424f0bd53435ff54412d4a236b2a43acabade3' '8924ea69223157369dd26fccf5118ceb7e55e951e863e338cc3c3832f33d3b53' 'c9a9f1b712598990ae60810d9e002d340bf0c016e284b11bc4169424b833b641' @@ -82,7 +83,8 @@ sha256sums=('9400f3d87077b7f9bdd746a52f424f0bd53435ff54412d4a236b2a43acabade3' '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8' 'e260e555b261aabab1e48786dd514eeea056e4402af7cfd4dfd1d32858441484' 'fbb6011501a74a8ea6d01c041870fcefb7ef2859c134aedc676e5f6452833f65' - '56eecee8162c138c442773d66483886f1242c8dd2b16eed5711ae5e63d9b0e3a') + '56eecee8162c138c442773d66483886f1242c8dd2b16eed5711ae5e63d9b0e3a' + '0b543c953b7357b9b681121006ab1617263dacf611bb2798c8008fc98aebb2e6') validpgpkeys=( 'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva '684D54A189305A9CC95446D36B888913DDB59515' # Márcio Silva @@ -146,6 +148,9 @@ prepare() { sed -i 's|[;]1|;0|' browser/experiments/Experiments.manifest || die "failed to break ExperimentsService" sed -i '/pocket/d' browser/extensions/moz.build || die "failed to wipe pocket" + # 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 diff --git a/libre/iceweasel/add-bracket-for-sed-4.3-compliance.patch b/libre/iceweasel/add-bracket-for-sed-4.3-compliance.patch new file mode 100644 index 000000000..ab0b26b67 --- /dev/null +++ b/libre/iceweasel/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 + |