[jhbuild] core-deps-3.24: Patch mozjs38 for sed 4.3+ compliance



commit 6d89b7e720e9b5b05fde1c42e9e9adf3fb4046be
Author: Rafael Fontenelle <rafaelff gnome org>
Date:   Wed Feb 22 13:10:10 2017 -0300

    core-deps-3.24: Patch mozjs38 for sed 4.3+ compliance
    
    File js/src/configure was generated with a [:space:], but the
    correct syntax is [[:space:]]. Since sed version 4.3, this is
    considered as a syntax error.

 modulesets/gnome-suites-core-deps-3.24.modules |    1 +
 patches/mozjs38-add-bracket.patch              |   16 ++++++++++++++++
 2 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.24.modules b/modulesets/gnome-suites-core-deps-3.24.modules
index 7c7c1b4..02bfda9 100644
--- a/modulesets/gnome-suites-core-deps-3.24.modules
+++ b/modulesets/gnome-suites-core-deps-3.24.modules
@@ -1551,6 +1551,7 @@
       <patch file="mozjs38-pkg-config-version.patch" strip="1"/>
       <patch file="mozjs38-install-name.patch" strip="1"/>
       <patch file="mozjs38-copy-headers.patch" strip="1"/>
+      <patch file="mozjs38-add-bracket.patch" strip="1"/>
       <patch file="mozjs38-1269317.patch" strip="1"/>
     </branch>
     <dependencies>
diff --git a/patches/mozjs38-add-bracket.patch b/patches/mozjs38-add-bracket.patch
new file mode 100644
index 0000000..873697d
--- /dev/null
+++ b/patches/mozjs38-add-bracket.patch
@@ -0,0 +1,16 @@
+Add bracket for sed 4.3 compliance
+
+Based on upstream fix by Daniel Stenberg in 09 jan 2017
+See: https://hg.mozilla.org/mozilla-central/rev/ebcbf47a83e7
+
+--- a/js/src/configure 2017-02-21 16:56:42.350105741 -0300
++++ b/js/src/configure 2017-02-21 17:33:13.183493978 -0300
+@@ -15231,7 +15231,7 @@
+         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
+        { echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 
1>&2; echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&5; 
exit 1; }
+     fi


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]