[SM-Commit] GIT changes to master grimoire by Jaka Kranjc (9e333cde90f006be91b7196cb11627eabd837078)

Jaka Kranjc scm at mail.sourcemage.org
Thu Jun 29 14:15:40 EDT 2006


GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:

 utils/dbus/DEPENDS |    5 +++--
 utils/dbus/HISTORY |    4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 9e333cde90f006be91b7196cb11627eabd837078
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    dbus: disable qt4 support (it got in via qt3), so dbus builds if one
    has qt4 installed and wants the qt client

diff --git a/utils/dbus/DEPENDS b/utils/dbus/DEPENDS
index 3774650..3b4aa30 100755
--- a/utils/dbus/DEPENDS
+++ b/utils/dbus/DEPENDS
@@ -42,9 +42,10 @@ optional_depends  xmlto                 
                   '--disable-xml-docs'       \
                   'Build XML Documentation'  &&
 
+# should add a qt4 one aswell, once upstream fixes it
 optional_depends  qt-x11                               \
-                  '--enable-qt3'                        \
-                  '--disable-qt3'                       \
+                  '--disable-qt --enable-qt3'                        \
+                  '--disable-qt --disable-qt3'                       \
                   'Enable Qt-friendly client library'  &&
 
 optional_depends  mono                   \
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 08c13a9..b4517c2 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,7 @@
+2006-06-29 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* DEPENDS: pass more flags for qt3, effectively disabling qt4,
+	           as it doesn't work and is otherwise autodetected
+
 2006-06-26 Treeve Jelbert <treeve01 at pi.be>
 	* DETAILS: version 0.62
 



More information about the SM-Commit mailing list