Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (2af2987bdc0884bc736e0c02af2685cae08cfe4c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (2af2987bdc0884bc736e0c02af2685cae08cfe4c)
  • Date: Thu, 8 Oct 2009 12:08:35 -0500

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

gnome2-libs/libcanberra/CONFIGURE | 2 +-
gnome2-libs/libcanberra/HISTORY | 7 +++++++
gnome2-libs/libcanberra/PRE_SUB_DEPENDS | 6 ++++++
gnome2-libs/libcanberra/REPAIR^none^PRE_SUB_DEPENDS | 6 ++++++
gnome2-libs/libcanberra/SUB_DEPENDS | 7 +++++++
gnome2-libs/metacity/DEPENDS | 1 +
gnome2-libs/metacity/HISTORY | 3 +++
7 files changed, 31 insertions(+), 1 deletion(-)

New commits:
commit 2af2987bdc0884bc736e0c02af2685cae08cfe4c
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

metacity: added dependency on libcanberra with GTK, bug 15451

commit 44524eac5cabfe3215892dcbbd46a23d5de3828f
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

libcanberra: added sub dependency GTK

diff --git a/gnome2-libs/libcanberra/CONFIGURE
b/gnome2-libs/libcanberra/CONFIGURE
index dca16b1..02b3d9e 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 9f634ab..c877a30 100644
--- a/gnome2-libs/libcanberra/HISTORY
+++ b/gnome2-libs/libcanberra/HISTORY
@@ -1,3 +1,10 @@
+2009-10-08 Arwed v. Merkatz <v.merkatz AT 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 AT 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 0000000..91ac720
--- /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 0000000..91ac720
--- /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 0000000..e80d179
--- /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 000bcea..d91476e 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 2173068..aa2cfdf 100644
--- a/gnome2-libs/metacity/HISTORY
+++ b/gnome2-libs/metacity/HISTORY
@@ -1,3 +1,6 @@
+2009-10-08 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added libcanberra with GTK, bug #15451
+
2009-09-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.28.0




  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (2af2987bdc0884bc736e0c02af2685cae08cfe4c), Arwed von Merkatz, 10/08/2009

Archive powered by MHonArc 2.6.24.

Top of Page