[jhbuild] 3.24: Move libarchive to sysdeps
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] 3.24: Move libarchive to sysdeps
- Date: Thu, 5 Jan 2017 17:24:33 +0000 (UTC)
commit c37ceac42f0ad8d70a22888fb889a3c4da7c9417
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Thu Jan 5 11:23:09 2017 -0600
3.24: Move libarchive to sysdeps
It's new enough in Ubuntu now
modulesets/gnome-suites-core-deps-3.24.modules | 10 ----------
modulesets/gnome-sysdeps-3.24.modules | 6 ++++++
2 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.24.modules b/modulesets/gnome-suites-core-deps-3.24.modules
index 787b948..63daf40 100644
--- a/modulesets/gnome-suites-core-deps-3.24.modules
+++ b/modulesets/gnome-suites-core-deps-3.24.modules
@@ -66,8 +66,6 @@
href="http://devel.freebsoft.org/pub/projects/speechd/"/>
<repository type="tarball" name="spice"
href="http://www.spice-space.org/download/"/>
-<repository type="tarball" name="libarchive"
- href="http://libarchive.org/downloads/"/>
<repository type="tarball" name="people.mozilla.org"
href="https://people.mozilla.org/~sstangl/"/>
@@ -1072,14 +1070,6 @@
</suggests>
</autotools>
- <autotools id="libarchive" autogen-sh="configure">
- <pkg-config>libarchive.pc</pkg-config>
- <branch repo="libarchive"
- version="3.2.1"
- module="libarchive-${version}.tar.gz"
- hash="sha256:72ee1a4e3fd534525f13a0ba1aa7b05b203d186e0c6072a8a4738649d0b3cfd2"/>
- </autotools>
-
<autotools id="libchamplain">
<branch/>
<dependencies>
diff --git a/modulesets/gnome-sysdeps-3.24.modules b/modulesets/gnome-sysdeps-3.24.modules
index 16b448a..5f486d6 100644
--- a/modulesets/gnome-sysdeps-3.24.modules
+++ b/modulesets/gnome-sysdeps-3.24.modules
@@ -422,6 +422,12 @@
</systemdependencies>
</systemmodule>
+ <systemmodule id="libarchive">
+ <pkg-config>libarchive.pc</pkg-config>
+ <branch repo="system"
+ version="3.2.1"/>
+ </systemmodule>
+
<systemmodule id="libatasmart">
<pkg-config>libatasmart.pc</pkg-config>
<branch repo="system"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]