Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (0312488f73a9543679cafdffc715fa68569139e1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (0312488f73a9543679cafdffc715fa68569139e1)
  • Date: Fri, 21 Sep 2007 15:09:42 -0500

GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:

audio-soft/qjackctl/BUILD | 4 ++--
audio-soft/qjackctl/DEPENDS | 5 +++++
audio-soft/qjackctl/HISTORY | 7 +++++++
audio-soft/qjackctl/PRE_BUILD | 9 +++++----
audio-soft/qjackctl/qt4_bin_path_fix.diff | 12 ++++++++++++
5 files changed, 31 insertions(+), 6 deletions(-)

New commits:
commit 0312488f73a9543679cafdffc715fa68569139e1
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

qjackctl: replace sed hack for configuring correct Qt4 bin path with
patch from cvs

diff --git a/audio-soft/qjackctl/BUILD b/audio-soft/qjackctl/BUILD
index 4ab9c14..f48c53e 100755
--- a/audio-soft/qjackctl/BUILD
+++ b/audio-soft/qjackctl/BUILD
@@ -1,3 +1,3 @@
-PATH="$INSTALL_ROOT/usr/bin/qt4:$PATH" \
-OPTS="$QJCTL_TRAY $QJCTL_JACK_MIDI $OPTS" \
+OPTS="$QJCTL_TRAY $QJCTL_JACK_MIDI $OPTS \
+ --with-qt=${INSTALL_ROOT}/usr/bin/qt4" \
default_build
diff --git a/audio-soft/qjackctl/DEPENDS b/audio-soft/qjackctl/DEPENDS
index b558a95..83d9aff 100755
--- a/audio-soft/qjackctl/DEPENDS
+++ b/audio-soft/qjackctl/DEPENDS
@@ -1,3 +1,8 @@
+#
+# only needed for qt4_bin_path_fix.diff
+#
+depends autoconf &&
+
depends g++ &&
depends qt4 &&

diff --git a/audio-soft/qjackctl/HISTORY b/audio-soft/qjackctl/HISTORY
index b7e7333..f91ce36 100644
--- a/audio-soft/qjackctl/HISTORY
+++ b/audio-soft/qjackctl/HISTORY
@@ -1,3 +1,10 @@
+2007-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PRE_BUILD: Replaced sed hack with patch from upstream.
+ * qt4_bin_path_fix.diff: Added.
+ * DEPENDS: Added depends autoconf for patching.
+ * BUILD: Removed unnecessary PATH modification, added --with-qt
+ flag to make use of the patch.
+
2007-09-15 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 0.3.1a.
* DEPENDS: Changed depends qt-x11 to qt4.
diff --git a/audio-soft/qjackctl/PRE_BUILD b/audio-soft/qjackctl/PRE_BUILD
index 8bc1b5c..38c9fcb 100755
--- a/audio-soft/qjackctl/PRE_BUILD
+++ b/audio-soft/qjackctl/PRE_BUILD
@@ -1,7 +1,8 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-local qt4_bin="$INSTALL_ROOT/usr/bin/qt4" &&
-
-sed -i "s|as_dir in \$ac_path|as_dir in \"$qt4_bin\" \$ac_path|" \
- configure
+#
+# fix ./configure not finding Qt4 build utils
+#
+patch -p0 < "$SCRIPT_DIRECTORY/qt4_bin_path_fix.diff" &&
+autoconf
diff --git a/audio-soft/qjackctl/qt4_bin_path_fix.diff
b/audio-soft/qjackctl/qt4_bin_path_fix.diff
new file mode 100644
index 0000000..7593cca
--- /dev/null
+++ b/audio-soft/qjackctl/qt4_bin_path_fix.diff
@@ -0,0 +1,12 @@
+--- configure.ac~ 2007-07-19 11:12:18.000000000 +0300
++++ configure.ac 2007-09-21 22:52:50.000000000 +0300
+@@ -89,6 +89,9 @@
+ if test -d $X/bin; then
+ ac_path="$X/bin:$ac_path"
+ fi
++ if test -x $X/qmake; then
++ ac_path="$X:$ac_path"
++ fi
+ if test -d $X/include; then
+ for Y in qt qt4; do
+ if test -d $X/include/$Y; then



  • [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (0312488f73a9543679cafdffc715fa68569139e1), Juuso Alasuutari, 09/21/2007

Archive powered by MHonArc 2.6.24.

Top of Page