diff options
author | Eric Sandall | 2011-03-10 19:24:30 -0800 |
---|---|---|
committer | George Sherwood | 2011-03-12 09:45:07 -0600 |
commit | 7a58d6bd2ac90653cba41d1d90e24cb9ec339098 (patch) | |
tree | 833600e6a6ce639222998cd88077764c5c5e4a51 | |
parent | 3e852e96d19884b84d34146f5ef39e8a8be5511a (diff) |
json-glib: Optionally depends on gobject-introspection (was autodetected)
Allow forcing gobject-introspection depends
Bug #15954
(cherry picked from commit 70653da6b18f05b1045ecad4c30413ac445f844e)
-rwxr-xr-x | gnome2-libs/json-glib/DEPENDS | 7 | ||||
-rw-r--r-- | gnome2-libs/json-glib/HISTORY | 5 | ||||
-rwxr-xr-x | gnome2-libs/json-glib/PRE_SUB_DEPENDS | 5 | ||||
-rwxr-xr-x | gnome2-libs/json-glib/REPAIR^none^PRE_SUB_DEPENDS | 5 | ||||
-rwxr-xr-x | gnome2-libs/json-glib/SUB_DEPENDS | 5 |
5 files changed, 26 insertions, 1 deletions
diff --git a/gnome2-libs/json-glib/DEPENDS b/gnome2-libs/json-glib/DEPENDS index 150d45af3a..1e9e170504 100755 --- a/gnome2-libs/json-glib/DEPENDS +++ b/gnome2-libs/json-glib/DEPENDS @@ -1 +1,6 @@ -depends glib2 +depends glib2 && + +optional_depends gobject-introspection \ + '--enable-introspection=yes' \ + '--enable-introspection=no' \ + 'for object introspection' diff --git a/gnome2-libs/json-glib/HISTORY b/gnome2-libs/json-glib/HISTORY index d1373f32d7..872afd1342 100644 --- a/gnome2-libs/json-glib/HISTORY +++ b/gnome2-libs/json-glib/HISTORY @@ -1,3 +1,8 @@ +2011-03-10 Eric Sandall <sandalle@sourcemage.org> + * DEPENDS: Optionally depends on gobject-introspection (was autodetected) + * PRE_SUB_DEPENDS, SUB_DEPENDS: Allow forcing gobject-introspection depends + Bug #15954 + 2010-10-23 Ladislav Hagara <hgr@vabo.cz> * DETAILS, DEPENDS: spell created,version 0.12.0 diff --git a/gnome2-libs/json-glib/PRE_SUB_DEPENDS b/gnome2-libs/json-glib/PRE_SUB_DEPENDS new file mode 100755 index 0000000000..5f037aa6da --- /dev/null +++ b/gnome2-libs/json-glib/PRE_SUB_DEPENDS @@ -0,0 +1,5 @@ +case $THIS_SUB_DEPENDS in + GINTRO) is_depends_enabled $SPELL gobject-introspection ;; + *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ; + return 1;; +esac diff --git a/gnome2-libs/json-glib/REPAIR^none^PRE_SUB_DEPENDS b/gnome2-libs/json-glib/REPAIR^none^PRE_SUB_DEPENDS new file mode 100755 index 0000000000..5f037aa6da --- /dev/null +++ b/gnome2-libs/json-glib/REPAIR^none^PRE_SUB_DEPENDS @@ -0,0 +1,5 @@ +case $THIS_SUB_DEPENDS in + GINTRO) is_depends_enabled $SPELL gobject-introspection ;; + *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ; + return 1;; +esac diff --git a/gnome2-libs/json-glib/SUB_DEPENDS b/gnome2-libs/json-glib/SUB_DEPENDS new file mode 100755 index 0000000000..b062060af7 --- /dev/null +++ b/gnome2-libs/json-glib/SUB_DEPENDS @@ -0,0 +1,5 @@ +case "$THIS_SUB_DEPENDS" in + GINTRO) depends gobject-introspection "--enable-introspection=yes" ;; + *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ; + return 1;; +esac |