Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.54 grimoire by George Sherwood (6b6d7be0f0489dab8ff1c9c0357835d70a89050d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.54 grimoire by George Sherwood (6b6d7be0f0489dab8ff1c9c0357835d70a89050d)
  • Date: Sat, 12 Mar 2011 09:45:01 -0600

GIT changes to stable-rc-0.54 grimoire by George Sherwood
<gsherwood AT sourcemage.org>:

gnome2-libs/clutter/DEPENDS | 5 ++++-
gnome2-libs/clutter/HISTORY | 3 +++
gnome2-libs/gnome-games2/DEPENDS | 4 ++++
gnome2-libs/gnome-games2/HISTORY | 3 +++
gnome2-libs/json-glib/DEPENDS | 7 ++++++-
gnome2-libs/json-glib/HISTORY | 5 +++++
gnome2-libs/json-glib/PRE_SUB_DEPENDS | 5 +++++
gnome2-libs/json-glib/REPAIR^none^PRE_SUB_DEPENDS | 5 +++++
gnome2-libs/json-glib/SUB_DEPENDS | 5 +++++
libs/libical/DEPENDS | 2 +-
libs/libical/HISTORY | 3 +++
11 files changed, 44 insertions(+), 3 deletions(-)

New commits:
commit 6b6d7be0f0489dab8ff1c9c0357835d70a89050d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

json-glib: Optionally depends on gobject-introspection (was autodetected)
Allow forcing gobject-introspection depends
Bug #15954
(cherry picked from commit 70653da6b18f05b1045ecad4c30413ac445f844e)

commit 307b4c469de281eed3bc56122d585f50cce0ef18
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

clutter: Requires json-glib built with GINTRO for gobject-introspection
(cherry picked from commit cd957d650fd8f75d81e6f824ec99185b26a220d9)

commit 589659116d7962bb2dd0f1a061745cc176732484
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

gnome-games2: Requires json-glib built with GINTRO for
gobject-introspection
(cherry picked from commit b116f9781655f69b38c1d30c85b39772de00b7f6)

commit 181a03ee342fe7e1c567629ba5c1798a83d2c497
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

libical: JDK is in z-rejected
(cherry picked from commit ac21d0c021dc5c117f63dc875842f5ada971dc0d)

diff --git a/gnome2-libs/clutter/DEPENDS b/gnome2-libs/clutter/DEPENDS
index 9d34c7d..1700ede 100755
--- a/gnome2-libs/clutter/DEPENDS
+++ b/gnome2-libs/clutter/DEPENDS
@@ -1,5 +1,4 @@
depends glib2 &&
-depends json-glib &&
depends $CLUTTER_GDK &&
depends pango &&
depends OPENGL &&
@@ -10,6 +9,10 @@ optional_depends gobject-introspection \
"--disable-introspection" \
"to enable introspection" &&

+if is_depends_enabled $SPELL gobject-introspection; then
+ depends -sub 'GINTRO' json-glib
+fi &&
+
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
diff --git a/gnome2-libs/clutter/HISTORY b/gnome2-libs/clutter/HISTORY
index 4a8c9de..00a0033 100644
--- a/gnome2-libs/clutter/HISTORY
+++ b/gnome2-libs/clutter/HISTORY
@@ -1,3 +1,6 @@
+2011-03-10 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Requires json-glib built with GINTRO for
gobject-introspection
+
2010-10-23 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: added json-glib

diff --git a/gnome2-libs/gnome-games2/DEPENDS
b/gnome2-libs/gnome-games2/DEPENDS
index be6feb5..190f842 100755
--- a/gnome2-libs/gnome-games2/DEPENDS
+++ b/gnome2-libs/gnome-games2/DEPENDS
@@ -22,6 +22,10 @@ optional_depends gobject-introspection \
"--enable-introspection=no" \
"to enable introspection for this build" &&

+if is_depends_enabled $SPELL gobject-introspection; then
+ depends -sub 'GINTRO' json-glib
+fi &&
+
optional_depends -sub GTK libcanberra \
"--enable-sound" \
"--disable-sound" \
diff --git a/gnome2-libs/gnome-games2/HISTORY
b/gnome2-libs/gnome-games2/HISTORY
index 71c9520..7dec1c5 100644
--- a/gnome2-libs/gnome-games2/HISTORY
+++ b/gnome2-libs/gnome-games2/HISTORY
@@ -1,3 +1,6 @@
+2011-03-10 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Requires json-glib built with GINTRO for
gobject-introspection
+
2010-11-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.32.1

diff --git a/gnome2-libs/json-glib/DEPENDS b/gnome2-libs/json-glib/DEPENDS
index 150d45a..1e9e170 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 d1373f3..872afd1 100644
--- a/gnome2-libs/json-glib/HISTORY
+++ b/gnome2-libs/json-glib/HISTORY
@@ -1,3 +1,8 @@
+2011-03-10 Eric Sandall <sandalle AT 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 AT 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 0000000..5f037aa
--- /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 0000000..5f037aa
--- /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 0000000..b062060
--- /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
diff --git a/libs/libical/DEPENDS b/libs/libical/DEPENDS
index e6d215b..3e93fe0 100755
--- a/libs/libical/DEPENDS
+++ b/libs/libical/DEPENDS
@@ -1,4 +1,4 @@
depends cmake &&
optional_depends g++ '' '' 'for C++ bindings' &&
-optional_depends JDK '' '' 'for Java bindings' &&
+optional_depends JDK '' '' 'for Java bindings' z-rejected &&
optional_depends python '' '' 'for Python bindings'
diff --git a/libs/libical/HISTORY b/libs/libical/HISTORY
index 197036c..0732f96 100644
--- a/libs/libical/HISTORY
+++ b/libs/libical/HISTORY
@@ -1,3 +1,6 @@
+2011-03-11 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: JDK is in z-rejected
+
2010-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.46
* DEPENDS: add cmake



  • [SM-Commit] GIT changes to stable-rc-0.54 grimoire by George Sherwood (6b6d7be0f0489dab8ff1c9c0357835d70a89050d), George Sherwood, 03/12/2011

Archive powered by MHonArc 2.6.24.

Top of Page