[Lunar-commits] <moonbase> qt4: fix build if qt's evil phonon not installed

[Zbigniew Luszpinski]

commit 54ad15558ad95f0e4d122f9dad505fe32877714e
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sat May 7 15:33:19 2011 +0200

    qt4: fix build if qt's evil phonon not installed
---
 qt4-apps/qt4/BUILD     |    4 +++-
 qt4-apps/qt4/CONFIGURE |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/qt4-apps/qt4/BUILD b/qt4-apps/qt4/BUILD
index 7b712e2..a03cec7 100644
--- a/qt4-apps/qt4/BUILD
+++ b/qt4-apps/qt4/BUILD
@@ -54,7 +54,9 @@
 # It wants to point moc_location and uic_location to ${prefix}/src/qt-everywhere-opensource-src-4.7.0-beta2/bin
 # and after much fiddling cannot get it to point them to /usr/bin. So lets just sedit these rascals.
   for i in `ls /usr/lib/$MODULE/pkgconfig/Q*.pc` ; do sed -i "s:\${prefix}/src/qt-everywhere-opensource-src-$VERSION/:\${prefix}/:" $i ; done &&
-  sed -i "s:\${prefix}/src/qt-everywhere-opensource-src-$VERSION/:\${prefix}/:"  /usr/lib/$MODULE/pkgconfig/phonon.pc || true &&
+  if [ -f /usr/lib/$MODULE/pkgconfig/phonon.pc ]; then
+  sed -i "s:\${prefix}/src/qt-everywhere-opensource-src-$VERSION/:\${prefix}/:" /usr/lib/$MODULE/pkgconfig/phonon.pc
+  fi &&
 # Like for moc and uic, the same needs doing for the *.prl files.
   find /usr/lib/qt4 -type f -name '*.prl' \
       -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; &&
diff --git a/qt4-apps/qt4/CONFIGURE b/qt4-apps/qt4/CONFIGURE
index 60d13ce..2389542 100644
--- a/qt4-apps/qt4/CONFIGURE
+++ b/qt4-apps/qt4/CONFIGURE
@@ -4,5 +4,5 @@ mquery XML_PATTERNS "Build xml patterns? ${PROBLEM_COLOR}Needed by qtscriptgener
 mquery MAKE_QDOC3 "BUILD QDOC3 docs? ${PROBLEM_COLOR}Needed by qt-creator${DEFAULT_COLOR}" n
 mquery MAKE_WEBKIT "Build the webkit plugin? ${PROBLEM_COLOR}Needed by kdelibs4 / mythtv ${DEFAULT_COLOR}" y "-webkit" "-no-webkit"
 mquery LICENSE_TYPE "Build Qt using open-source license? (n=commercial)" y
-mquery MAKE_PHONON "Build qt4's (old) phonon? ${PROBLEM_COLOR}say y if without kdebase4-runtime${DEFAULT_COLOR}" n "-phonon" "-no-phonon"
+mquery MAKE_PHONON "Build qt4's (old) phonon? ${PROBLEM_COLOR}say n if you will build and use KDE${DEFAULT_COLOR}" n "-phonon" "-no-phonon"
 mquery MAKE_ASSIST "Build the Qt Assistant? (Needed by tulip)" y