[arch-commits] Commit in xulrunner/trunk (PKGBUILD sed43.patch)

[Evangelos Foutras]

    Date: Wednesday, April 26, 2017 @ 05:43:50
  Author: foutrelis
Revision: 225389

Fix detection of ICU version number with sed 4.3

Added:
  xulrunner/trunk/sed43.patch
Modified:
  xulrunner/trunk/PKGBUILD

-------------+
 PKGBUILD    |    5 +++++
 sed43.patch |   21 +++++++++++++++++++++
 2 files changed, 26 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-26 04:06:11 UTC (rev 225388)
+++ PKGBUILD	2017-04-26 05:43:50 UTC (rev 225389)
@@ -19,6 +19,7 @@
         LFS_graphite2_harfbuzz.patch
         mozilla-pkgconfig.patch
         shared-libs.patch
+        sed43.patch
         gcc6.diff)
 options=('!emptydirs' '!makeflags' 'staticlibs')
 replaces=('xulrunner-oss')
@@ -29,6 +30,7 @@
             'afcd7d3f6113b0f9ead0cb1b47b3fccedadce56a16b4406c439411864bd11863'
             '1aa9ebe67542a2b8c28905d070829ada5b29438c6a7961f2b0cdd6b92d8b9f5c'
             '59d9fc421bc10a5515b73e159f44a72365bf7b7e8b3fc8a8c46043ef40bd3a40'
+            'e9b7199b57fa07e440d37db0cc3cf52aa1c1fd7d5e8b31db14e511d77b5ce327'
             '0992d5dce883de760ff0445448466f096d0baa75fe5fd1e60bfd3cc13cb4d098')
 
 prepare() {
@@ -38,6 +40,9 @@
   # GCC6
   patch -Np1 -i ../gcc6.diff
 
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1329272
+  patch -Np1 -i ../sed43.patch
+
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1194520
   patch -Np1 -i ../freetype261.patch
 

Added: sed43.patch
===================================================================
--- sed43.patch	                        (rev 0)
+++ sed43.patch	2017-04-26 05:43:50 UTC (rev 225389)
@@ -0,0 +1,21 @@
+
+# HG changeset patch
+# User Daniel Stenberg <daniel at 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
+@@ -69,7 +69,7 @@ if test -n "$USE_ICU"; then
+         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
+