Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (21956acc4ca22c59b01f44ef65af085b755dd4d7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (21956acc4ca22c59b01f44ef65af085b755dd4d7)
  • Date: Thu, 20 Aug 2015 05:18:19 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

audio-soft/qjackctl/BUILD | 5 ++++-
audio-soft/qjackctl/DEPENDS | 3 +++
audio-soft/qjackctl/HISTORY | 4 ++++
3 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 21956acc4ca22c59b01f44ef65af085b755dd4d7
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

cmake: fix new qt4 location for real

diff --git a/audio-soft/qjackctl/BUILD b/audio-soft/qjackctl/BUILD
index 40b5eea..2cd8cd1 100755
--- a/audio-soft/qjackctl/BUILD
+++ b/audio-soft/qjackctl/BUILD
@@ -1,2 +1,5 @@
OPTS="$QJCTL_TRAY $QJCTL_JACK_MIDI $OPTS" &&
-PATH=${INSTALL_ROOT}/opt/qt4/bin:$PATH default_build
+# $INSTALL_ROOT/opt/qt4??? How can you tell?
+# INSTALL_ROOT for non-basesystem spells is rarely working anyway.
+OPTS="$OPTS --with-qt4=/opt/qt4" &&
+default_build
diff --git a/audio-soft/qjackctl/DEPENDS b/audio-soft/qjackctl/DEPENDS
index 8b51f51..d22b1bd 100755
--- a/audio-soft/qjackctl/DEPENDS
+++ b/audio-soft/qjackctl/DEPENDS
@@ -2,6 +2,9 @@ depends autoconf &&
depends libx11 &&
depends libxext &&
depends -sub CXX gcc &&
+# Could use qt5, too. Work needed to test.
+# --with-qt4=$prefix
+# --with-qt5=$prefix
depends qt4 &&

if [[ $QJACKCTL_BRANCH == scm ]]
diff --git a/audio-soft/qjackctl/HISTORY b/audio-soft/qjackctl/HISTORY
index f60f7cc..e66403d 100644
--- a/audio-soft/qjackctl/HISTORY
+++ b/audio-soft/qjackctl/HISTORY
@@ -1,3 +1,7 @@
+2015-08-19 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: fix build with qt4 in /opt, really
+ * DEPENDS: note that qt5 could also be used in future
+
2015-06-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.3.13
* BUILD: fix build with qt4 in /opt



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (21956acc4ca22c59b01f44ef65af085b755dd4d7), Thomas Orgis, 08/20/2015

Archive powered by MHonArc 2.6.24.

Top of Page