[jhbuild] 3.8: Use mozjs185 from distro packages



commit ecd5e752045390c9c3708d490e22891dccace9f4
Author: Javier JardÃn <jjardon gnome org>
Date:   Tue Dec 11 02:58:48 2012 +0900

    3.8: Use mozjs185 from distro packages

 modulesets/gnome-suites-core-deps-3.8.modules |   17 -----------------
 modulesets/gnome-sysdeps-3.8.modules          |    5 +++++
 2 files changed, 5 insertions(+), 17 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.8.modules b/modulesets/gnome-suites-core-deps-3.8.modules
index 76af5a0..5a7a33d 100644
--- a/modulesets/gnome-suites-core-deps-3.8.modules
+++ b/modulesets/gnome-suites-core-deps-3.8.modules
@@ -798,23 +798,6 @@
     </branch>
   </autotools>
 
-  <autotools id="js185" check-target="false"
-	     autogenargs="--enable-threadsafe --with-system-nspr">
-    <pkg-config>mozjs185.pc</pkg-config>
-    <branch repo="ftp.mozilla.org"
-	    module="js/js185-1.0.0.tar.gz"
-            version="1.0.0"
-            checkoutdir="js185-1.0.0"
-	    source-subdir="js/src"
-            hash="sha256:5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687"
-	    size="6164605">
-      <patch file="js185.destdir.patch" strip="0"/>
-    </branch>
-    <dependencies>
-      <dep package="nspr"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="nss"
 	     autogen-sh="autogen.sh" supports-non-srcdir-builds="no"
          supports-parallel-builds="no" check-target="false">
diff --git a/modulesets/gnome-sysdeps-3.8.modules b/modulesets/gnome-sysdeps-3.8.modules
index 286a251..bfdadde 100644
--- a/modulesets/gnome-sysdeps-3.8.modules
+++ b/modulesets/gnome-sysdeps-3.8.modules
@@ -190,6 +190,11 @@
             version="0.8.90"/>
   </systemmodule>
 
+  <systemmodule id="js185">
+    <pkg-config>mozjs185.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
   <systemmodule id="json">
     <pkg-config>json.pc</pkg-config>
     <branch repo="system"



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