[jhbuild] [3.0, 3.2] If build from git require gobject-intro'n (GNOME bug 647445)

From: Craig Keogh <cskeogh src gnome org>
To: commits-list gnome org
Cc:
Subject: [jhbuild] [3.0, 3.2] If build from git require gobject-intro'n (GNOME bug 647445)
Date: Sun, 17 Apr 2011 10:12:44 +0000 (UTC)
commit 47f9a18f0720b1948d451eac3e5243c31e277d02
Author: Craig Keogh <cskeogh adam com au>
Date:   Sun Apr 17 19:32:27 2011 +0930

    [3.0,3.2] If build from git require gobject-intro'n (GNOME bug 647445)
    
    Even though gobject-introspection is listed as an optional dependency
    (GOBJECT_INTROSPECTION_CHECK in configure.ac), gobject-introspection is
    hard dependency if building from git. If building from tarball, optional
    dependency is correct.

 modulesets/gnome-apps-3.0.modules             |    2 +-
 modulesets/gnome-apps-3.2.modules             |    2 +-
 modulesets/gnome-suites-core-3.0.modules      |   10 +++-------
 modulesets/gnome-suites-core-3.2.modules      |   10 +++-------
 modulesets/gnome-suites-core-deps-3.0.modules |   22 +++++++---------------
 modulesets/gnome-suites-core-deps-3.2.modules |   22 +++++++---------------
 modulesets/gnome-world-3.0.modules            |    2 +-
 modulesets/gnome-world-3.2.modules            |    2 +-
 8 files changed, 24 insertions(+), 48 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.0.modules b/modulesets/gnome-apps-3.0.modules
index 9d8574e..63c2b54 100644
--- a/modulesets/gnome-apps-3.0.modules
+++ b/modulesets/gnome-apps-3.0.modules
@@ -966,6 +966,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="libxml2"/>
+      <dep package="gobject-introspection"/>
       <dep package="gtk+"/>
       <dep package="gtk-vnc"/>
       <dep package="libpeas"/>
@@ -974,7 +975,6 @@
     <suggests>
       <dep package="avahi"/>
       <dep package="gnome-panel"/>
-      <dep package="gobject-introspection"/>
       <dep package="telepathy-glib"/>
       <dep package="vte"/>
     </suggests>
diff --git a/modulesets/gnome-apps-3.2.modules b/modulesets/gnome-apps-3.2.modules
index 07600f8..a6d71e7 100644
--- a/modulesets/gnome-apps-3.2.modules
+++ b/modulesets/gnome-apps-3.2.modules
@@ -962,6 +962,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="libxml2"/>
+      <dep package="gobject-introspection"/>
       <dep package="gtk+"/>
       <dep package="gtk-vnc"/>
       <dep package="libpeas"/>
@@ -970,7 +971,6 @@
     <suggests>
       <dep package="avahi"/>
       <dep package="gnome-panel"/>
-      <dep package="gobject-introspection"/>
       <dep package="telepathy-glib"/>
       <dep package="vte"/>
     </suggests>
diff --git a/modulesets/gnome-suites-core-3.0.modules b/modulesets/gnome-suites-core-3.0.modules
index b0dbf8d..839980b 100644
--- a/modulesets/gnome-suites-core-3.0.modules
+++ b/modulesets/gnome-suites-core-3.0.modules
@@ -171,11 +171,9 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="gnome-common"/>
+      <dep package="gobject-introspection"/>
       <dep package="glib"/>
     </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-    </suggests>
   </autotools>
 
   <autotools id="gnome-packagekit" autogenargs="--disable-strict">
@@ -846,12 +844,10 @@
     <branch repo="git.freedesktop.org" checkoutdir="polkit" module="PolicyKit"/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="gobject-introspection"/>
       <dep package="expat"/>
       <dep package="intltool"/>
     </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-    </suggests>
   </autotools>
 
   <autotools id="upower">
@@ -859,9 +855,9 @@
     <dependencies>
       <dep package="polkit"/>
       <dep package="dbus-glib"/>
+      <dep package="gobject-introspection"/>
     </dependencies>
     <suggests>
-      <dep package="gobject-introspection"/>
       <dep package="gudev"/>
     </suggests>
   </autotools>
diff --git a/modulesets/gnome-suites-core-3.2.modules b/modulesets/gnome-suites-core-3.2.modules
index bdccca9..26e8a27 100644
--- a/modulesets/gnome-suites-core-3.2.modules
+++ b/modulesets/gnome-suites-core-3.2.modules
@@ -172,10 +172,8 @@
       <dep package="intltool"/>
       <dep package="gnome-common"/>
       <dep package="glib"/>
-    </dependencies>
-    <suggests>
       <dep package="gobject-introspection"/>
-    </suggests>
+    </dependencies>
   </autotools>
 
   <autotools id="gnome-packagekit" autogenargs="--disable-strict">
@@ -846,12 +844,10 @@
     <branch repo="git.freedesktop.org" checkoutdir="polkit" module="PolicyKit"/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="gobject-introspection"/>
       <dep package="expat"/>
       <dep package="intltool"/>
     </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-    </suggests>
   </autotools>
 
   <autotools id="upower">
@@ -859,9 +855,9 @@
     <dependencies>
       <dep package="polkit"/>
       <dep package="dbus-glib"/>
+      <dep package="gobject-introspection"/>
     </dependencies>
     <suggests>
-      <dep package="gobject-introspection"/>
       <dep package="gudev"/>
     </suggests>
   </autotools>
diff --git a/modulesets/gnome-suites-core-deps-3.0.modules b/modulesets/gnome-suites-core-deps-3.0.modules
index 563dd67..b3f886f 100644
--- a/modulesets/gnome-suites-core-deps-3.0.modules
+++ b/modulesets/gnome-suites-core-deps-3.0.modules
@@ -121,11 +121,9 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="gobject-introspection"/>
       <dep package="gtk-doc"/>
     </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-    </suggests>
   </autotools>
 
   <autotools id="cairo" autogenargs="--enable-xlib">
@@ -154,9 +152,9 @@
       <dep package="pango"/>
       <dep package="gtk-doc"/>
       <dep package="json-glib"/>
+      <dep package="gobject-introspection"/>
     </dependencies>
     <suggests>
-      <dep package="gobject-introspection"/>
       <dep package="gdk-pixbuf"/>
       <dep package="gudev"/>
     </suggests>
@@ -205,9 +203,9 @@
       <dep package="pango"/>
       <dep package="gdk-pixbuf"/>
       <dep package="gtk-doc"/>
+      <dep package="gobject-introspection"/>
     </dependencies>
     <suggests>
-      <dep package="gobject-introspection"/>
       <dep package="shared-mime-info"/>
     </suggests>
   </autotools>
@@ -218,10 +216,8 @@
       <dep package="glib"/>
       <dep package="cairo"/>
       <dep package="gtk-doc"/>
-    </dependencies>
-    <suggests>
       <dep package="gobject-introspection"/>
-    </suggests>
+    </dependencies>
     <after>
       <dep package="libXft"/>
     </after>
@@ -420,10 +416,8 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="libxml2"/>
-    </dependencies>
-    <suggests>
       <dep package="gobject-introspection"/>
-    </suggests>
+    </dependencies>
   </autotools>
 
   <autotools id="gst-plugins-base" autogenargs="--with-gtk=3.0 --disable-tests --disable-gnome_vfs" supports-non-srcdir-builds="no">
@@ -790,10 +784,8 @@
       <dep package="sqlite3"/>
       <dep package="libgnome-keyring"/>
       <dep package="glib-networking"/>
-    </dependencies>
-    <suggests>
       <dep package="gobject-introspection"/>
-    </suggests>
+    </dependencies>
   </autotools>
 
   <tarball id="libtasn1" version="2.2" supports-non-srcdir-builds="no">
@@ -1207,9 +1199,9 @@
       <dep package="pango"/>
       <dep package="atk"/>
       <dep package="gdk-pixbuf"/>
+      <dep package="gobject-introspection"/>
     </dependencies>
     <suggests>
-      <dep package="gobject-introspection"/>
       <dep package="shared-mime-info"/>
     </suggests>
   </autotools>
diff --git a/modulesets/gnome-suites-core-deps-3.2.modules b/modulesets/gnome-suites-core-deps-3.2.modules
index 228b0c2..c329f56 100644
--- a/modulesets/gnome-suites-core-deps-3.2.modules
+++ b/modulesets/gnome-suites-core-deps-3.2.modules
@@ -121,11 +121,9 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="gobject-introspection"/>
       <dep package="gtk-doc"/>
     </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-    </suggests>
   </autotools>
 
   <autotools id="cairo" autogenargs="--enable-xlib">
@@ -154,9 +152,9 @@
       <dep package="pango"/>
       <dep package="gtk-doc"/>
       <dep package="json-glib"/>
+      <dep package="gobject-introspection"/>
     </dependencies>
     <suggests>
-      <dep package="gobject-introspection"/>
       <dep package="gdk-pixbuf"/>
       <dep package="gudev"/>
     </suggests>
@@ -205,9 +203,9 @@
       <dep package="pango"/>
       <dep package="gdk-pixbuf"/>
       <dep package="gtk-doc"/>
+      <dep package="gobject-introspection"/>
     </dependencies>
     <suggests>
-      <dep package="gobject-introspection"/>
       <dep package="shared-mime-info"/>
     </suggests>
   </autotools>
@@ -218,10 +216,8 @@
       <dep package="glib"/>
       <dep package="cairo"/>
       <dep package="gtk-doc"/>
-    </dependencies>
-    <suggests>
       <dep package="gobject-introspection"/>
-    </suggests>
+    </dependencies>
     <after>
       <dep package="libXft"/>
     </after>
@@ -420,10 +416,8 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="libxml2"/>
-    </dependencies>
-    <suggests>
       <dep package="gobject-introspection"/>
-    </suggests>
+    </dependencies>
   </autotools>
 
   <autotools id="gst-plugins-base" autogenargs="--with-gtk=3.0 --disable-tests --disable-gnome_vfs" supports-non-srcdir-builds="no">
@@ -790,10 +784,8 @@
       <dep package="sqlite3"/>
       <dep package="libgnome-keyring"/>
       <dep package="glib-networking"/>
-    </dependencies>
-    <suggests>
       <dep package="gobject-introspection"/>
-    </suggests>
+    </dependencies>
   </autotools>
 
   <tarball id="libtasn1" version="2.2" supports-non-srcdir-builds="no">
@@ -1207,9 +1199,9 @@
       <dep package="pango"/>
       <dep package="atk"/>
       <dep package="gdk-pixbuf"/>
+      <dep package="gobject-introspection"/>
     </dependencies>
     <suggests>
-      <dep package="gobject-introspection"/>
       <dep package="shared-mime-info"/>
     </suggests>
   </autotools>
diff --git a/modulesets/gnome-world-3.0.modules b/modulesets/gnome-world-3.0.modules
index 3994de3..8df407f 100644
--- a/modulesets/gnome-world-3.0.modules
+++ b/modulesets/gnome-world-3.0.modules
@@ -1849,9 +1849,9 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="gobject-introspection"/>
     </dependencies>
     <suggests>
-      <dep package="gobject-introspection"/>
       <dep package="gtk+-2"/>
       <dep package="gconf"/>
       <dep package="vala"/>
diff --git a/modulesets/gnome-world-3.2.modules b/modulesets/gnome-world-3.2.modules
index 5813331..62d96ee 100644
--- a/modulesets/gnome-world-3.2.modules
+++ b/modulesets/gnome-world-3.2.modules
@@ -1849,9 +1849,9 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="gobject-introspection"/>
     </dependencies>
     <suggests>
-      <dep package="gobject-introspection"/>
       <dep package="gtk+-2"/>
       <dep package="gconf"/>
       <dep package="vala"/>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]