diff options
author | Thomas Orgis | 2015-08-20 07:18:32 +0200 |
---|---|---|
committer | Thomas Orgis | 2015-08-20 07:18:32 +0200 |
commit | 21956acc4ca22c59b01f44ef65af085b755dd4d7 (patch) | |
tree | c7d2c1fd36a31d4acc1edfb1ff3c05fb28c6b4a8 /audio-soft | |
parent | f9f1be7202cdefec3b734570d0d4de7d97bde22b (diff) |
cmake: fix new qt4 location for real
Diffstat (limited to 'audio-soft')
-rwxr-xr-x | audio-soft/qjackctl/BUILD | 5 | ||||
-rwxr-xr-x | audio-soft/qjackctl/DEPENDS | 3 | ||||
-rw-r--r-- | audio-soft/qjackctl/HISTORY | 4 |
3 files changed, 11 insertions, 1 deletions
diff --git a/audio-soft/qjackctl/BUILD b/audio-soft/qjackctl/BUILD index 40b5eea606..2cd8cd1a02 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 8b51f51d58..d22b1bd5a1 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 f60f7cc990..e66403d81d 100644 --- a/audio-soft/qjackctl/HISTORY +++ b/audio-soft/qjackctl/HISTORY @@ -1,3 +1,7 @@ +2015-08-19 Thomas Orgis <sobukus@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@hawo.stw.uni-erlangen.de> * DETAILS: version 0.3.13 * BUILD: fix build with qt4 in /opt |