[jhbuild] 3.8: Use nss from distro packages



commit cf612ad98ff871cac022bca182f7a26350bd9d70
Author: Javier JardÃn <jjardon gnome org>
Date:   Tue Dec 11 03:02:23 2012 +0900

    3.8: Use nss from distro packages

 modulesets/gnome-suites-core-deps-3.8.modules |   17 -----------------
 modulesets/gnome-sysdeps-3.8.modules          |    6 ++++++
 2 files changed, 6 insertions(+), 17 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.8.modules b/modulesets/gnome-suites-core-deps-3.8.modules
index 5a7a33d..332f4e6 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="nss"
-	     autogen-sh="autogen.sh" supports-non-srcdir-builds="no"
-         supports-parallel-builds="no" check-target="false">
-    <pkg-config>nss.pc</pkg-config>
-    <branch repo="ftp.mozilla.org"
-            module="security/nss/releases/NSS_3_12_11_RTM/src/nss-3.12.11.tar.gz"
-	    version="3.12.11"
-	    hash="sha256:d043f8d44212bc9418b6a954ca88e05b8ab2a71f8c59e6829a9a36d8a28e9f16"
-	    size="5944840">
-      <patch file="nss.pkgconfig-and-configure.patch" strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="nspr"/>
-      <dep package="sqlite3"/>
-    </dependencies>
-  </autotools>
-
 <!-- End Mozilla stuff subsection -->
 
   <autotools id="poppler" autogenargs="--enable-xpdf-headers" makeargs="POPPLER_GLIB_DISABLE_DEPRECATED=">
diff --git a/modulesets/gnome-sysdeps-3.8.modules b/modulesets/gnome-sysdeps-3.8.modules
index bfdadde..b95e650 100644
--- a/modulesets/gnome-sysdeps-3.8.modules
+++ b/modulesets/gnome-sysdeps-3.8.modules
@@ -429,6 +429,12 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="nss">
+    <pkg-config>nss.pc</pkg-config>
+    <branch repo="system"
+            version="3.12.11"/>
+  </systemmodule>
+
   <systemmodule id="openldap">
     <branch repo="system"/>
     <systemdependencies>



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