[Lunar-commits] <moonbase> qt4: After Ratler was so kind to fix a ld_remove issue that I bellyached about

[Dennis `stumbles` Veatch]

commit 32501e911a0832ac6a8c175bc3fb40d4a75869fd
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Mon Sep 27 10:28:22 2010 -0400

    qt4: After Ratler was so kind to fix a ld_remove issue that I bellyached about
    
    I could stop being a knucklehead and actually use it where needed. As mentioned
    by zbiggy in the mail list Qt will try and use an existing install which causes
    things to tank. So lets twiddle with the LDFLAGS path before the BUILD starts.
    
    Also, wekbit is not needed as an optional_depends, the option is to have qt
    build its own webkit plugin. Let there be rejoicing.
---
 qt4-apps/qt4/BUILD   |    8 ++++++++
 qt4-apps/qt4/DEPENDS |    1 -
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/qt4-apps/qt4/BUILD b/qt4-apps/qt4/BUILD
index 2627a11..9882116 100644
--- a/qt4-apps/qt4/BUILD
+++ b/qt4-apps/qt4/BUILD
@@ -1,5 +1,13 @@
 (
 
+  if [ -d /opt/lunar/qt ] ; then 
+    ld_remove /opt/lunar/qt/lib
+  fi &&
+  
+  if [ -d /usr/lib/qt4 ] ; then
+    ld_remove /usr/lib/qt4
+  fi &&
+
   export QTDIR=$SOURCE_DIRECTORY &&
   export PATH=$MODULE_PREFIX::$PATH   &&
   export LD_LIBRARY_PATH=$QTDIR/lib &&
diff --git a/qt4-apps/qt4/DEPENDS b/qt4-apps/qt4/DEPENDS
index b52a99f..efae85c 100644
--- a/qt4-apps/qt4/DEPENDS
+++ b/qt4-apps/qt4/DEPENDS
@@ -8,7 +8,6 @@ optional_depends  "libungif"   "-qt-gif"           "-no-gif"        "for GIF rea
 optional_depends  "fontconfig" "-fontconfig"       "-no-fontconfig" "for anti alias font support"
 optional_depends  "cups"       "-cups"             "-no-cups"       "for printing support, needed by kdelibs4"
 optional_depends  "nas"        "-system-nas-sound" "-no-nas-sound"  "for Network Audio System support"
-optional_depends  "webkit"     "-webkit"           "-no-webkit"     "for webkit support"
 optional_depends  "pulseaudio" ""                  ""               "for pulseaudio support"
 
 optional_depends  "gst-plugins-base"  ""  ""  "for gstreamer support"