Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (2deb5b9ae9f6cf9cc7e7e31c740c6fd61da02edf)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (2deb5b9ae9f6cf9cc7e7e31c740c6fd61da02edf)
  • Date: Wed, 16 Jan 2008 09:22:26 -0600

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

utils/qutescoop/DEPENDS | 3 ++-
utils/qutescoop/HISTORY | 5 +++++
utils/qutescoop/PRE_BUILD | 4 ++++
utils/qutescoop/teamspeak.patch | 12 ++++++++++++
4 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit b4e0ab0a2a40c77212e55367166f92a9476ae9e0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/qutescoop: added support for teamspeak

diff --git a/utils/qutescoop/DEPENDS b/utils/qutescoop/DEPENDS
index 2e4e2ef..54592ba 100755
--- a/utils/qutescoop/DEPENDS
+++ b/utils/qutescoop/DEPENDS
@@ -1 +1,2 @@
-depends qt4
+depends qt4 &&
+suggest_depends ts2_client "" "" "support for voice communication"
diff --git a/utils/qutescoop/HISTORY b/utils/qutescoop/HISTORY
index 2c3f7f4..19648c8 100644
--- a/utils/qutescoop/HISTORY
+++ b/utils/qutescoop/HISTORY
@@ -1,3 +1,8 @@
+2008-01-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, DEPENDS, teamspeak.patch: added a suggest_depends
+ on teamspeak, applied a small patch that fixes the name of the
+ teamspeak executable being called.
+
2008-01-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, DEPENDS, desktop, DETAILS, HISTORY, PRE_BUILD, INSTALL:
spell created

diff --git a/utils/qutescoop/PRE_BUILD b/utils/qutescoop/PRE_BUILD
index d3edbbd..2042d68 100755
--- a/utils/qutescoop/PRE_BUILD
+++ b/utils/qutescoop/PRE_BUILD
@@ -1,3 +1,7 @@
+source $GRIMOIRE/is_depends_enabled.function &&
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+if is_depends_enabled $SPELL ts2_client; then
+ patch -p1 < $SCRIPT_DIRECTORY/teamspeak.patch
+fi &&
${INSTALL_ROOT}/usr/bin/qt4/qmake
diff --git a/utils/qutescoop/teamspeak.patch b/utils/qutescoop/teamspeak.patch
new file mode 100644
index 0000000..4ba3baf
--- /dev/null
+++ b/utils/qutescoop/teamspeak.patch
@@ -0,0 +1,12 @@
+diff -Naupr QuteScoop.orig/ControllerDetails.cpp
QuteScoop.linux/ControllerDetails.cpp
+--- QuteScoop.orig/ControllerDetails.cpp 2007-12-30 21:43:01.000000000
+0100
++++ QuteScoop.linux/ControllerDetails.cpp 2008-01-12 23:48:39.740908442
+0100
+@@ -99,6 +99,8 @@ void ControllerDetails::on_btnJoinChanne
+
+ #ifdef Q_WS_WIN
+ QString program = "start";
++#elif defined Q_WS_X11
++ QString program = "teamspeak";
+ #else
+ QString program = "open";
+ #endif



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (2deb5b9ae9f6cf9cc7e7e31c740c6fd61da02edf), Florian Franzmann, 01/16/2008

Archive powered by MHonArc 2.6.24.

Top of Page