Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire

13 files changed, 39 insertions, 3 deletions

diff --git a/gnome2-libs/devicekit/DEPENDS b/gnome2-libs/devicekit/DEPENDS
index c200701813..f7a0df5441 100755
--- a/gnome2-libs/devicekit/DEPENDS
+++ b/gnome2-libs/devicekit/DEPENDS
@@ -2,7 +2,7 @@ depends dbus       &&
 depends dbus-glib  &&
 depends pkgconfig  &&
 depends udev       &&
-optional_depends docbook-dtd \
+optional_depends docbook-xsl \
                  "--enable-man-pages" \
                  "--disable-man-pages" \
                  "Build and install man pages?" &&
diff --git a/gnome2-libs/devicekit/HISTORY b/gnome2-libs/devicekit/HISTORY
index 573ce9869b..eb9d23ef66 100644
--- a/gnome2-libs/devicekit/HISTORY
+++ b/gnome2-libs/devicekit/HISTORY
@@ -1,3 +1,6 @@
+2009-10-08 Arwed v. Merkatz <v.merkatz@gmx.net>
+	* DEPENDS: requires docbook-xsl, not only docbook-dtd
+
 2009-07-20 Eric Sandall <sandalle@sourcemage.org>
 	* DEPENDS: Requires docbook-dtd not libxslt for man pages
 
diff --git a/gnome2-libs/gnome-vfs2/DETAILS b/gnome2-libs/gnome-vfs2/DETAILS
index 7c4b33fd57..341c320793 100755
--- a/gnome2-libs/gnome-vfs2/DETAILS
+++ b/gnome2-libs/gnome-vfs2/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gnome-vfs2
-         VERSION=2.24.1
+         VERSION=2.24.2
 	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=gnome-vfs-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-vfs-$VERSION
diff --git a/gnome2-libs/gnome-vfs2/HISTORY b/gnome2-libs/gnome-vfs2/HISTORY
index 1624ec46a8..999c4a3d0e 100644
--- a/gnome2-libs/gnome-vfs2/HISTORY
+++ b/gnome2-libs/gnome-vfs2/HISTORY
@@ -1,3 +1,6 @@
+2009-10-08 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 2.24.2
+
 2009-03-22 Robin Cook <rcook@wyrms.net>
 	* DETAILS: updated VERSION to 2.24.1
 
diff --git a/gnome2-libs/gnome-vfs2/gnome-vfs-2.24.1.tar.bz2.sig b/gnome2-libs/gnome-vfs2/gnome-vfs-2.24.1.tar.bz2.sig
deleted file mode 100644
index 221d3aac57..0000000000
--- a/gnome2-libs/gnome-vfs2/gnome-vfs-2.24.1.tar.bz2.sig
+++ /dev/null
diff --git a/gnome2-libs/gnome-vfs2/gnome-vfs-2.24.2.tar.bz2.sig b/gnome2-libs/gnome-vfs2/gnome-vfs-2.24.2.tar.bz2.sig
new file mode 100644
index 0000000000..34cc82c4b3
--- /dev/null
+++ b/gnome2-libs/gnome-vfs2/gnome-vfs-2.24.2.tar.bz2.sig
diff --git a/gnome2-libs/libcanberra/CONFIGURE b/gnome2-libs/libcanberra/CONFIGURE
index dca16b1ef3..02b3d9e9d9 100755
--- a/gnome2-libs/libcanberra/CONFIGURE
+++ b/gnome2-libs/libcanberra/CONFIGURE
@@ -1,6 +1,6 @@
 config_query_option CANBERRA_OSS "Enable OSS support?" n    \
                     "--enable-oss" "--disable-oss"          &&
 
-config_query_option CANBERRA_NULL "Enable NULL backend?" n  \
+config_query_option CANBERRA_NULL "Enable NULL backend?" y  \
                     "--enable-null" "--disable-null"        
 
diff --git a/gnome2-libs/libcanberra/HISTORY b/gnome2-libs/libcanberra/HISTORY
index 9f634abb91..c877a303ff 100644
--- a/gnome2-libs/libcanberra/HISTORY
+++ b/gnome2-libs/libcanberra/HISTORY
@@ -1,3 +1,10 @@
+2009-10-08 Arwed v. Merkatz <v.merkatz@gmx.net>
+	* SUB_DEPENDS, PRE_SUBDEPENDS, REPAIR^none^PRE_SUB_DEPENDS:
+	  added sub dependency GTK
+	* CONFIGURE: default to building the null backend, otherwise
+	  a default build on a clean system will fail due to no backend
+	  being selected
+
 2009-10-02 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 0.18
 
diff --git a/gnome2-libs/libcanberra/PRE_SUB_DEPENDS b/gnome2-libs/libcanberra/PRE_SUB_DEPENDS
new file mode 100755
index 0000000000..91ac72086c
--- /dev/null
+++ b/gnome2-libs/libcanberra/PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+  GTK) is_depends_enabled $SPELL gtk+2   && return 0;;
+  *) echo "Eek, unknown subdependency requested!"; return 1;;
+esac
+return 1
+
diff --git a/gnome2-libs/libcanberra/REPAIR^none^PRE_SUB_DEPENDS b/gnome2-libs/libcanberra/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000000..91ac72086c
--- /dev/null
+++ b/gnome2-libs/libcanberra/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+  GTK) is_depends_enabled $SPELL gtk+2   && return 0;;
+  *) echo "Eek, unknown subdependency requested!"; return 1;;
+esac
+return 1
+
diff --git a/gnome2-libs/libcanberra/SUB_DEPENDS b/gnome2-libs/libcanberra/SUB_DEPENDS
new file mode 100755
index 0000000000..e80d179011
--- /dev/null
+++ b/gnome2-libs/libcanberra/SUB_DEPENDS
@@ -0,0 +1,7 @@
+
+case $THIS_SUB_DEPENDS in
+GTK) echo "GTK support requested, forcing gtk+2 dependency." &&
+     depends gtk+2 '--enable-gtk'
+     ;;
+*) echo unknown sub-depends!!! ; return 1 ;;
+esac
diff --git a/gnome2-libs/metacity/DEPENDS b/gnome2-libs/metacity/DEPENDS
index 000bcea099..d91476edb4 100755
--- a/gnome2-libs/metacity/DEPENDS
+++ b/gnome2-libs/metacity/DEPENDS
@@ -9,6 +9,7 @@ depends  libglade2         &&
 depends  orbit2            &&
 depends  xml-parser-expat  &&
 depends  zenity            &&
+depends -sub GTK libcanberra &&
 
 optional_depends  libxcomposite                                 \
                   "--enable-compositor"                         \
diff --git a/gnome2-libs/metacity/HISTORY b/gnome2-libs/metacity/HISTORY
index 217306817b..aa2cfdf006 100644
--- a/gnome2-libs/metacity/HISTORY
+++ b/gnome2-libs/metacity/HISTORY
@@ -1,3 +1,6 @@
+2009-10-08 Arwed v. Merkatz <v.merkatz@gmx.net>
+	* DEPENDS: added libcanberra with GTK, bug #15451
+
 2009-09-22 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 2.28.0