[jhbuild] core-deps-3.24: Merged GJS mozjs38 branch to master



commit 4cc5b1e6b64fce36e541312d30d8656305127578
Author: Philip Chimento <philip chimento gmail com>
Date:   Tue Feb 14 20:27:34 2017 -0800

    core-deps-3.24: Merged GJS mozjs38 branch to master
    
    We can remove mozjs31 now, nothing else is using it.

 modulesets/gnome-suites-core-deps-3.24.modules |   22 +--
 patches/mozjs31-1021171.patch                  |  245 ------------------------
 patches/mozjs31-1037470.patch                  |   31 ---
 patches/mozjs31-1046176.patch                  |   31 ---
 patches/mozjs31-1119228.patch                  |   65 -------
 patches/mozjs31-install-name.patch             |   11 -
 6 files changed, 1 insertions(+), 404 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.24.modules b/modulesets/gnome-suites-core-deps-3.24.modules
index df911dc..0831f3d 100644
--- a/modulesets/gnome-suites-core-deps-3.24.modules
+++ b/modulesets/gnome-suites-core-deps-3.24.modules
@@ -562,7 +562,7 @@
       <dep package="m4-common"/>
       <dep package="dbus-glib"/>
       <dep package="gobject-introspection"/>
-      <dep package="mozjs31"/>
+      <dep package="mozjs38"/>
       <if condition-set="coverage">
         <dep package="lcov"/>
       </if>
@@ -1537,26 +1537,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="mozjs31" autogen-sh="configure"
-             autogenargs="--with-system-nspr --with-system-zlib --enable-system-ffi --with-system-icu 
--with-intl-api">
-    <pkg-config>mozjs-31.pc</pkg-config>
-    <branch repo="people.mozilla.org" module="mozjs-31.5.0.tar.bz2"
-            version="31.5.0" source-subdir="js/src">
-      <patch file="mozjs31-1021171.patch" strip="1"/>
-      <patch file="mozjs31-1037470.patch" strip="1"/>
-      <patch file="mozjs31-1046176.patch" strip="1"/>
-      <patch file="mozjs31-1119228.patch" strip="1"/>
-      <patch file="mozjs31-install-name.patch" strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="libffi"/>
-      <dep package="libicu"/>
-      <dep package="nspr"/>
-      <dep package="python2"/>
-      <dep package="zlib"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="mozjs38" autogen-sh="configure"
              autogenargs="--enable-posix-nspr-emulation --with-system-zlib --enable-system-ffi 
--with-system-icu --with-intl-api">
     <pkg-config>mozjs-38.pc</pkg-config>


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