[Lunar-commits] <moonbase> qt4: Simplifying the BUILD $OPTS a bit by moving some to DEPENDS as

[Dennis `stumbles` Veatch]

commit 5f04eddc492bbe213e543b7b4f6aac3e5b834fa6
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Thu Dec 3 04:42:11 2009 -0500

    qt4: Simplifying the BUILD $OPTS a bit by moving some to DEPENDS as
    
    optional and making the webkit plugin a CONFIGURE question. Also needed
    an adjustment for the qdoc3 parts (needed by qt-creator).
---
 kde4/base/qt4/BUILD     |    8 +++-----
 kde4/base/qt4/CONFIGURE |    1 +
 kde4/base/qt4/DEPENDS   |   14 +++++++++-----
 kde4/base/qt4/DETAILS   |    2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/kde4/base/qt4/BUILD b/kde4/base/qt4/BUILD
index 0120a93..60475e9 100644
--- a/kde4/base/qt4/BUILD
+++ b/kde4/base/qt4/BUILD
@@ -4,7 +4,7 @@
   export PATH=$QTDIR/bin:$PATH
   export LD_LIBRARY_PATH=$QTDIR/lib
 
-  sedit "s:COMMERCIAL_USER=ask:COMMERCIAL_USER=no:" configure
+  sedit "s:COMMERCIAL_USER=ask:COMMERCIAL_USER=no:" configure &&
 
   if module_installed phonon ; then
     OPTS+=" -phonon -phonon-backend"
@@ -20,9 +20,7 @@
     OPTS+=" -make examples -make demos -make tools -make docs -make translations"
   fi &&
 
-  OPTS+=" -release -fast -no-separate-debug-info -shared -qt-gif -system-libpng -system-libjpeg   \
-          -system-libmng -system-zlib -accessibility -pch -stl -webkit -fontconfig \
-          -largefile -glib -qt3support"
+  OPTS+=" -release -fast -no-separate-debug-info -script -scripttools -accessibility -pch -glib" &&
 
   echo "yes" | ./configure               \
                -prefix ${MODULE_PREFIX}  \
@@ -34,7 +32,7 @@
      cd tools/qdoc3 &&
      qmake -unix -o Makefile qdoc3.pro &&
      make    &&
-     install -D -m0755 qdoc3 $MODULE_PREFIX/tools/qdoc3/qdoc3 &&
+     install -m 755 ../../bin/qdoc3 $MODULE_PREFIX/bin/ &&
      cd $SOURCE_DIRECTORY
   fi &&
 
diff --git a/kde4/base/qt4/CONFIGURE b/kde4/base/qt4/CONFIGURE
index b39218a..ceb87e8 100644
--- a/kde4/base/qt4/CONFIGURE
+++ b/kde4/base/qt4/CONFIGURE
@@ -2,3 +2,4 @@ mquery MAKE_DOCS "Build the QT4 documentation?" n "" " -nomake docs"
 mquery MAKE_EXAMPLE_DEMOS "Build exmaples and demos?" n "" "-nomake examples -nomake demos"
 mquery XML_PATTERNS "Build xml patterns? Needed by qtscriptgenerator" y "-exceptions" "-no-exceptions"
 mquery MAKE_QDOC3 "BUILD QDOC3 docs? This is needed by qt-creator." n
+mquery MAKE_WEBKIT "Build the webkit plugin?" y "-webkit" "-no-webkit"
diff --git a/kde4/base/qt4/DEPENDS b/kde4/base/qt4/DEPENDS
index cd59245..0898b4c 100644
--- a/kde4/base/qt4/DEPENDS
+++ b/kde4/base/qt4/DEPENDS
@@ -1,13 +1,17 @@
-depends  libungif
-depends  libpng
-depends  libmng
 depends  %X
 
+optional_depends  "openssl"    "-openssl"          "-no-openssl"    "for Secure Sockets support"
+optional_depends  "libmng"     "-system-libmng"    "-qt-libmng"     "Use system or Qt version of MNG"
+optional_depends  "libpng"     "-system-libpng"    "-qt-libpng"     "Use system or Qt verion of PNG"
+optional_depends  "zlib"       "-system-zlib"      "-qt-zlib"       "Choose system or Qt version of zlib"
+optional_depends  "libungif"   "-qt-gif"           "-no-gif"        "for GIF reading support"
+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  "gst-plugins-base"  ""  ""  "for gstreamer 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  "mysql"                                                    \
                   "-plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql"  \
diff --git a/kde4/base/qt4/DETAILS b/kde4/base/qt4/DETAILS
index 383d076..fc34aa1 100644
--- a/kde4/base/qt4/DETAILS
+++ b/kde4/base/qt4/DETAILS
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/qt-everywhere-opensource-src-${VERSION}
         WEB_SITE=http://www.trolltech.com/qt
          ENTERED=20020420
          UPDATED=20091202
-         GARBAGE=off
+#         GARBAGE=off
      FTP_PASSIVE=on
       MAINTAINER=florin at lunar-linux.org
            SHORT="A C++ toolkit for application development"