[SM-Commit] GIT changes to master grimoire by Robin Cook (2326a04847acb8fe3777938933c1acad3b548159)

Robin Cook scm at sourcemage.org
Sun Jan 13 10:45:03 EST 2008


GIT changes to master grimoire by Robin Cook <rcook at wyrms.net>:

 gnome2-libs/gconf2/HISTORY         |    4 ++++
 gnome2-libs/gconf2/PRE_SUB_DEPENDS |    4 ++++
 gnome2-libs/gconf2/SUB_DEPENDS     |    6 ++++++
 gnome2-libs/gnome-session/DEPENDS  |    2 +-
 gnome2-libs/gnome-session/HISTORY  |    4 ++++
 gnome2-libs/gnome-session/PREPARE  |   12 ------------
 6 files changed, 19 insertions(+), 13 deletions(-)

New commits:
commit 5d95e2d1ca1f40b0426b1e4a50d2d80db658f0dd
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    gconf2: added PRE_SUB_DEPENDS and SUB_DEPENDS for GTK

commit 6a4d95821fc954871f029646477693d38290538a
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    gnome-session: removed PREPARE and used sub-depends on gconf2

diff --git a/gnome2-libs/gconf2/HISTORY b/gnome2-libs/gconf2/HISTORY
index e39a33e..9d2f970 100644
--- a/gnome2-libs/gconf2/HISTORY
+++ b/gnome2-libs/gconf2/HISTORY
@@ -1,3 +1,7 @@
+2008-01-13 Robin Cook <rcook at wyrms.net>
+	* PRE_SUB_DEPENDS: added
+	* SUB_DEPENDS: added 
+
 2007-10-16 Robin Cook <rcook at wyrms.net>
 	* DETAILS: updated VERSION to 2.20.1
 
diff --git a/gnome2-libs/gconf2/PRE_SUB_DEPENDS b/gnome2-libs/gconf2/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..3764159
--- /dev/null
+++ b/gnome2-libs/gconf2/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+  GTK)  if is_depends_enabled $SPELL gtk+2; then return 0; fi;;
+esac  &&
+return 1
diff --git a/gnome2-libs/gconf2/SUB_DEPENDS b/gnome2-libs/gconf2/SUB_DEPENDS
new file mode 100755
index 0000000..fc47d92
--- /dev/null
+++ b/gnome2-libs/gconf2/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+  GTK)  echo gtk+2 support requested forcing.  &&
+        depends gtk+2 "--enable-gtk"           
+        ;;
+    *)  echo "unknown sub-depends!"; return 1;;
+esac
diff --git a/gnome2-libs/gnome-session/DEPENDS b/gnome2-libs/gnome-session/DEPENDS
index 76d5539..e4624bc 100755
--- a/gnome2-libs/gnome-session/DEPENDS
+++ b/gnome2-libs/gnome-session/DEPENDS
@@ -1,5 +1,5 @@
 depends  libgnomeui            &&
-depends  gconf2                &&
+depends  -sub GTK gconf2       &&
 depends  esound                &&
 depends  libwnck               &&
 depends  gnome-control-center
diff --git a/gnome2-libs/gnome-session/HISTORY b/gnome2-libs/gnome-session/HISTORY
index 437eefc..a7364d9 100644
--- a/gnome2-libs/gnome-session/HISTORY
+++ b/gnome2-libs/gnome-session/HISTORY
@@ -1,3 +1,7 @@
+2008-01-13 Robin Cook <rcook at wyrms.net>
+	* PREPARE: removed as now sub-depends
+	* DEPENDS: added subdepends on gtk+2 for gconf2
+
 2007-11-26 Robin Cook <rcook at wyrms.net>
 	* DETAILS: updated VERSION to 2.20.2
 
diff --git a/gnome2-libs/gnome-session/PREPARE b/gnome2-libs/gnome-session/PREPARE
deleted file mode 100755
index 385f37b..0000000
--- a/gnome2-libs/gnome-session/PREPARE
+++ /dev/null
@@ -1,12 +0,0 @@
-if  spell_ok  gconf2;  then
-   if  !  grep  -q  "gconf2:gtk+2:on:optional:"  $DEPENDS_STATUS;  then
-      message  "${PROBLEM_COLOR}gconf2 is not cast with gtk+2 enabled."  \
-               "Please recast gconf2 and enable the gtk+2 optional"      \
-               "depends.${DEFAULT_COLOR}"
-      return 1
-   fi
-else
-   message  "${QUERY_COLOR}Please enable gtk+2 during the gconf2 configure"  \
-            "or casting will fail.${DEFAULT_COLOR}"                          &&
-   sleep 5
-fi



More information about the SM-Commit mailing list