[jhbuild] 3.16: Move js17 to -sysdeps



commit c38ef8332cb52f452b8d2466417322673af8e5c5
Author: Javier Jardón <jjardon gnome org>
Date:   Wed Oct 22 22:19:38 2014 +0100

    3.16: Move js17 to -sysdeps
    
    This is the old versions and its not going to be upgraded anymore

 modulesets/gnome-suites-core-deps-3.16.modules |   15 ---------------
 modulesets/gnome-sysdeps-3.16.modules          |    6 ++++++
 2 files changed, 6 insertions(+), 15 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.16.modules b/modulesets/gnome-suites-core-deps-3.16.modules
index ea4d543..9a3bdef 100644
--- a/modulesets/gnome-suites-core-deps-3.16.modules
+++ b/modulesets/gnome-suites-core-deps-3.16.modules
@@ -886,21 +886,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="js17" check-target="false"
-      autogenargs="--enable-threadsafe --with-system-nspr --enable-debug --disable-optimize">
-    <pkg-config>mozjs-17.0.pc</pkg-config>
-    <branch repo="ftp.mozilla.org"
-            module="pub/mozilla.org/js/mozjs17.0.0.tar.gz"
-            version="17.0.0"
-            hash="sha256:321e964fe9386785d3bf80870640f2fa1c683e32fe988eeb201b04471c172fba"
-            checkoutdir="js17-17.0.0">
-      <patch file="js17-build-fixes.patch" strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="nspr"/>
-    </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>
diff --git a/modulesets/gnome-sysdeps-3.16.modules b/modulesets/gnome-sysdeps-3.16.modules
index dc553db..a4c05e9 100644
--- a/modulesets/gnome-sysdeps-3.16.modules
+++ b/modulesets/gnome-sysdeps-3.16.modules
@@ -294,6 +294,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="js17">
+    <pkg-config>mozjs-17.0.pc</pkg-config>
+    <branch repo="system"
+            version="17.0.0"/>
+  </systemmodule>
+
   <systemmodule id="json">
     <pkg-config>json-c.pc</pkg-config>
     <branch repo="system"


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