[jhbuild] Revert "3.24: gjs depends on mozjs31"



commit ec85036bc59907c8f8c3bfea7c089308e0adf493
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Dec 11 13:21:24 2016 -0600

    Revert "3.24: gjs depends on mozjs31"
    
    This reverts commit a34e4b498483c6bef044a8b57b8e68e0552a7bdc.
    
    There is no mozjs31 in Ubuntu, so it will have to be built from a
    tarball in core deps, it can't be a sysdep unfortunately.

 modulesets/gnome-suites-core-deps-3.24.modules |    2 +-
 modulesets/gnome-sysdeps-3.24.modules          |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.24.modules b/modulesets/gnome-suites-core-deps-3.24.modules
index c77044f..ad03650 100644
--- a/modulesets/gnome-suites-core-deps-3.24.modules
+++ b/modulesets/gnome-suites-core-deps-3.24.modules
@@ -575,7 +575,7 @@
       <dep package="m4-common"/>
       <dep package="dbus-glib"/>
       <dep package="gobject-introspection"/>
-      <dep package="mozjs31"/>
+      <dep package="js24"/>
       <if condition-set="coverage">
         <dep package="lcov"/>
       </if>
diff --git a/modulesets/gnome-sysdeps-3.24.modules b/modulesets/gnome-sysdeps-3.24.modules
index b1b51f6..5b9aa20 100644
--- a/modulesets/gnome-sysdeps-3.24.modules
+++ b/modulesets/gnome-sysdeps-3.24.modules
@@ -391,6 +391,12 @@
             version="0.11"/>
   </systemmodule>
 
+  <systemmodule id="js24">
+    <pkg-config>mozjs-24.pc</pkg-config>
+    <branch repo="system"
+            version="24.2"/>
+  </systemmodule>
+
   <systemmodule id="krb5">
     <branch repo="system"/>
     <systemdependencies>
@@ -836,12 +842,6 @@
             version="9.2"/>
   </systemmodule>
 
-  <systemmodule id="mozjs31">
-    <pkg-config>mozjs-31.pc</pkg-config>
-    <branch repo="system"
-            version="31.5.0"/>
-  </systemmodule>
-
   <systemmodule id="mpc">
     <branch repo="system"/>
     <systemdependencies>


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