[Lunar-commits] <moonbase> qt4: The start of its move from /opt to /usr.

[Dennis `stumbles` Veatch]

commit 61a32598d8c32a3491d8a4e8b210a9f48d9d717b
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Fri Sep 3 10:46:18 2010 -0400

    qt4: The start of its move from /opt to /usr.
    
    The build of phonon provided by Qt4 has been intentionally disabled. It will
    conflict. In addition to that it is not in version sync with the phonon
    module provided by moonbase and it is *preferred* to use the KDE version.
---
 qt4-apps/qt4/BUILD        |   31 +++++++++++++++++++------------
 qt4-apps/qt4/DEPENDS      |    3 ++-
 qt4-apps/qt4/DETAILS      |    6 ++----
 qt4-apps/qt4/POST_INSTALL |    3 ---
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/qt4-apps/qt4/BUILD b/qt4-apps/qt4/BUILD
index c616cfd..f2b392d 100644
--- a/qt4-apps/qt4/BUILD
+++ b/qt4-apps/qt4/BUILD
@@ -1,18 +1,12 @@
 (
 
-  export QTDIR=$SOURCE_DIRECTORY
+  export QTDIR=${MODULE_PREFIX}
   export PATH=$QTDIR/bin:$PATH
   export LD_LIBRARY_PATH=$QTDIR/lib
 
   sedit "s:COMMERCIAL_USER=ask:COMMERCIAL_USER=no:" configure &&
   sedit "s/-O2/$CFLAGS/" mkspecs/common/g++.conf &&
 
-  if module_installed phonon ; then
-    OPTS+=" -phonon -phonon-backend"
-   else
-    OPTS+=" -no-phonon -phonon-backend"
-  fi &&
-
   if [ "$MAKE_DOCS" == "y" ]; then
     OPTS+=" -make tools -make docs -make translations"
   fi &&
@@ -21,17 +15,30 @@
     OPTS+=" -make examples -make demos -make tools -make docs -make translations"
   fi &&
 
-  OPTS+=" -release -fast -no-separate-debug-info -script -scripttools -accessibility -pch -glib" &&
+  OPTS="-largefile -multimedia -audio-backend -no-separate-debug-info -script -release -scripttools -accessibility -glib -optimized-qmake -no-phonon -xmlpatterns -fast -shared" &&
 
-  echo "yes" | ./configure               \
-               -prefix ${MODULE_PREFIX}  \
-               $OPTS                    &&
+  echo "yes" | ./configure                             \
+               -prefix ${QTDIR}                        \
+               -docdir ${QTDIR}/share/$MODULE          \
+               -plugindir /opt/lunar/plugins/qt4       \
+               -importdir ${QTDIR}/share/$MODULE       \
+               -datadir ${QTDIR}/share/$MODULE         \
+               -translationdir ${QTDIR}/share/$MODULE  \
+               -sysconfdir /etc/$MODULE/               \
+               -examplesdir ${QTDIR}/share/$MODULE     \
+               -demosdir ${QTDIR}/share/$MODULE        \
+               $OPTS                                  &&
 
   default_make  &&
 
+# 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 jsut sedit these rascals.
+  for i in `ls /usr/lib/pkgconfig/Q*.pc` ; do sed -i "s:\${prefix}/src/qt-everywhere-opensource-src-$VERSION/:\${prefix}/:" $i ; done &&
+
   if [ "$MAKE_QDOC3" == "y" ]; then
      cd tools/qdoc3 &&
-     qmake -unix -o Makefile qdoc3.pro &&
+     qmake -o Makefile qdoc3.pro &&
+
      make    &&
      install -m 755 ../../bin/qdoc3 $MODULE_PREFIX/bin/ &&
      cd $SOURCE_DIRECTORY
diff --git a/qt4-apps/qt4/DEPENDS b/qt4-apps/qt4/DEPENDS
index 0898b4c..3ec9ed2 100644
--- a/qt4-apps/qt4/DEPENDS
+++ b/qt4-apps/qt4/DEPENDS
@@ -8,10 +8,11 @@ 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  "gst-plugins-base"  ""  ""  "for gstreamer support"
 
-
+optional_depends  "%JAVA_SDK"  "-javascript-jit"   "-no-javascript-jit" "for JIT support"
 
 optional_depends  "mysql"                                                    \
                   "-plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql"  \
diff --git a/qt4-apps/qt4/DETAILS b/qt4-apps/qt4/DETAILS
index c0263f6..6a97b6e 100644
--- a/qt4-apps/qt4/DETAILS
+++ b/qt4-apps/qt4/DETAILS
@@ -5,12 +5,10 @@
    SOURCE_URL[1]=http://gd.tuwien.ac.at/hci/qt/source
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/qt-everywhere-opensource-src-${VERSION}
       SOURCE_VFY=sha1:1c18a564df9296c7cb0e0dedde40b9843e1b30e8
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://www.trolltech.com/qt
          ENTERED=20020420
-         UPDATED=20100608
-#         GARBAGE=off
-     FTP_PASSIVE=on
+         UPDATED=20100903
       MAINTAINER=florin at lunar-linux.org
            SHORT="A C++ toolkit for application development"
 
diff --git a/qt4-apps/qt4/POST_INSTALL b/qt4-apps/qt4/POST_INSTALL
index a51bce1..d6f0ec9 100644
--- a/qt4-apps/qt4/POST_INSTALL
+++ b/qt4-apps/qt4/POST_INSTALL
@@ -1,4 +1 @@
 ld_add $MODULE_PREFIX/lib
-
-# if module_installed sip;   then lin sip;   fi
-# if module_installed PyQt4; then lin PyQt4; fi