[jhbuild] 3.16: Move js24 to -sysdeps



commit a6d24198bdb7c1772dd216b5cd6eb29f43f502a2
Author: Javier Jardón <jjardon gnome org>
Date:   Wed Mar 4 11:34:33 2015 +0000

    3.16: Move js24 to -sysdeps

 modulesets/gnome-suites-core-deps-3.16.modules |   16 ----------------
 modulesets/gnome-sysdeps-3.16.modules          |    6 ++++++
 2 files changed, 6 insertions(+), 16 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.16.modules b/modulesets/gnome-suites-core-deps-3.16.modules
index cb3671b..ce6e119 100644
--- a/modulesets/gnome-suites-core-deps-3.16.modules
+++ b/modulesets/gnome-suites-core-deps-3.16.modules
@@ -909,22 +909,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="js24" check-target="false"
-      autogenargs="--enable-threadsafe --with-system-nspr --enable-debug --disable-tests --disable-strip 
--enable-ctypes --enable-system-ffi --disable-intl-api">
-    <pkg-config>mozjs-24.pc</pkg-config>
-    <branch repo="ftp.mozilla.org"
-            module="pub/mozilla.org/js/mozjs-24.2.0.tar.bz2"
-            version="24.2.0"
-            hash="sha256:e62f3f331ddd90df1e238c09d61a505c516fe9fd8c5c95336611d191d18437d8"
-            checkoutdir="js24-24.2.0">
-      <patch file="js24-buildapi.patch" strip="1"/>
-      <patch file="js24-prettyprinters.patch" strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="nspr"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="json-glib" autogenargs="--enable-installed-tests">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-sysdeps-3.16.modules b/modulesets/gnome-sysdeps-3.16.modules
index ac0cc12..50f3c99 100644
--- a/modulesets/gnome-sysdeps-3.16.modules
+++ b/modulesets/gnome-sysdeps-3.16.modules
@@ -336,6 +336,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>


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