[jhbuild] gnome-suites-core-deps-3.{6, 8}.modules: make gnome libgdata dependencies non-optional
- From: Owen Taylor <otaylor src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] gnome-suites-core-deps-3.{6, 8}.modules: make gnome libgdata dependencies non-optional
- Date: Tue, 2 Oct 2012 21:18:15 +0000 (UTC)
commit b8737b98130d96bdd8fce3fc335ad9c9dbae1256
Author: Owen W. Taylor <otaylor fishsoup net>
Date: Tue Oct 2 17:14:49 2012 -0400
gnome-suites-core-deps-3.{6,8}.modules: make gnome libgdata dependencies non-optional
In order to build libgdata without gnome-online-accounts and gcr, you need
to pass --disable-gnome on the command line. Since such a libgdata would
be useless for our purposes, move the GNOME dependencies from
<suggests/> to <dependencies/>
https://bugzilla.gnome.org/show_bug.cgi?id=685335
modulesets/gnome-suites-core-deps-3.6.modules | 8 +++-----
modulesets/gnome-suites-core-deps-3.8.modules | 8 +++-----
2 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.6.modules b/modulesets/gnome-suites-core-deps-3.6.modules
index 3c761c4..ea9b949 100644
--- a/modulesets/gnome-suites-core-deps-3.6.modules
+++ b/modulesets/gnome-suites-core-deps-3.6.modules
@@ -130,16 +130,14 @@
<pkg-config>libgdata.pc</pkg-config>
<branch/>
<dependencies>
+ <dep package="gcr"/>
<dep package="glib"/>
+ <dep package="gnome-online-accounts"/>
+ <dep package="gobject-introspection"/>
<dep package="libxml2"/>
<dep package="libsoup"/>
<dep package="liboauth"/>
</dependencies>
- <suggests>
- <dep package="gobject-introspection"/>
- <dep package="gnome-online-accounts"/>
- <dep package="gcr"/>
- </suggests>
</autotools>
<autotools id="libzeitgeist">
diff --git a/modulesets/gnome-suites-core-deps-3.8.modules b/modulesets/gnome-suites-core-deps-3.8.modules
index 8af1166..062a81e 100644
--- a/modulesets/gnome-suites-core-deps-3.8.modules
+++ b/modulesets/gnome-suites-core-deps-3.8.modules
@@ -130,16 +130,14 @@
<pkg-config>libgdata.pc</pkg-config>
<branch/>
<dependencies>
+ <dep package="gcr"/>
<dep package="glib"/>
+ <dep package="gnome-online-accounts"/>
+ <dep package="gobject-introspection"/>
<dep package="libxml2"/>
<dep package="libsoup"/>
<dep package="liboauth"/>
</dependencies>
- <suggests>
- <dep package="gobject-introspection"/>
- <dep package="gnome-online-accounts"/>
- <dep package="gcr"/>
- </suggests>
</autotools>
<autotools id="libzeitgeist">
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]