[Lunar-commits] r19574 - moonbase/trunk/zbeta/qt4

[Moritz Heiber]

Author: moe
Date: 2006-04-04 11:44:42 +0000 (Tue, 04 Apr 2006)
New Revision: 19574

Removed:
   moonbase/trunk/zbeta/qt4/CONFIGURE
   moonbase/trunk/zbeta/qt4/PRE_BUILD
Modified:
   moonbase/trunk/zbeta/qt4/BUILD
   moonbase/trunk/zbeta/qt4/DETAILS
Log:
Okay, I'm sorry florin .. but you merged the qt3 proposal into qt4
again so I'm going to do it myself ;-)

(With you last commit this module is broken since certain configure
options from the old qt3 let this qt4 script fail miserably. It shouldn't
do that .. I know. But it does)

* Adjustments to BUILD to make qt4 actually compile
* Remove CONFIGURE and PRE_BUILD. The samples can't be taken out of
  main tree anymore .. and the PRE_BUILD message is deprecated.



Modified: moonbase/trunk/zbeta/qt4/BUILD
===================================================================
--- moonbase/trunk/zbeta/qt4/BUILD	2006-04-04 04:35:51 UTC (rev 19573)
+++ moonbase/trunk/zbeta/qt4/BUILD	2006-04-04 11:44:42 UTC (rev 19574)
@@ -7,50 +7,31 @@
 
   sedit "s/-O2/$CXXFLAGS/" mkspecs/linux-g++/qmake.conf  &&
 
-  echo "yes" | ./configure              \
+  echo "yes" | ./configure          \
 	       -prefix ${MODULE_PREFIX} \
 	       -release             \
 	       -fast		    \
                -shared              \
-               -thread              \
                -qt-gif              \
-               -plugin-imgfmt-png   \
-               -plugin-imgfmt-jpeg  \
-               -plugin-imgfmt-mng   \
                -system-libpng       \
                -system-libjpeg      \
                -system-libmng       \
                -system-zlib         \
                -no-exceptions       \
-               -thread              \
-               -dlopen-opengl       \
-	       -xft		    \
-	       -xkb		    \
-               -sm		    \
-               -tablet              \
-               $OPTS               &&
+               $OPTS                &&
 
-  if [ "$SAMPIN" == "y" ] ; then
-    make
-  else
-    make sub-tools
-  fi &&
+  make &&
 
-  rm -f bin/qmake           &&     
-  cp qmake/qmake bin/qmake  &&
-  make install              &&
+  rm -f bin/qmake              &&     
+  cp qmake/qmake bin/qmake     &&
+  make install                 &&
 
-  if [ "$SAMPIN" == "y" ] ; then
-    cp -a examples  ${MODULE_PREFIX}/
-    cp -a tutorial  ${MODULE_PREFIX}/
-  fi &&
-
   if ! grep -q "${MODULE_PREFIX}/lib" /etc/ld.so.conf; then
     echo "${MODULE_PREFIX}/lib" >> /etc/ld.so.conf
   fi &&
 
-  echo "export QTDIR=\"${MODULE_PREFIX}\"" >> $SOURCE_DIRECTORY/qt4.rc       &&
-  echo export PATH=\"'${QTDIR}'/bin:'${PATH}'\" >> $SOURCE_DIRECTORY/qt4.rc  &&
+  echo "export QTDIR=\"${MODULE_PREFIX}\"" >> $SOURCE_DIRECTORY/qt4.rc    &&
+  echo export PATH=\"'${QTDIR}'/bin:'${PATH}'\" >> $SOURCE_DIRECTORY/qt4.rc &&
   echo export PKG_CONFIG_PATH=\"'${QTDIR}'/lib/pkgconfig:'${PKG_CONFIG_PATH}'\" \
 	>> $SOURCE_DIRECTORY/qt4.rc &&
 

Deleted: moonbase/trunk/zbeta/qt4/CONFIGURE

Modified: moonbase/trunk/zbeta/qt4/DETAILS
===================================================================
--- moonbase/trunk/zbeta/qt4/DETAILS	2006-04-04 04:35:51 UTC (rev 19573)
+++ moonbase/trunk/zbeta/qt4/DETAILS	2006-04-04 11:44:42 UTC (rev 19574)
@@ -1,17 +1,18 @@
           MODULE=qt4
-         VERSION=x11-opensource-src-4.1.2
-          SOURCE=qt-$VERSION.tar.gz
+         VERSION=4.1.2
+          SOURCE=qt-x11-opensource-src-${VERSION}.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/qt-x11-opensource-src-${VERSION}
    SOURCE_URL[0]=ftp://ftp.trolltech.com/qt/source/
    SOURCE_URL[1]=http://gd.tuwien.ac.at/hci/qt/source/
       SOURCE_VFY=sha1:a30ff8594b816528ab08ebcf349a31e244c4278d
-   MODULE_PREFIX=${QT_PREFIX:-/opt/lunar/qt4}
+   MODULE_PREFIX=${QT_PREFIX:-/opt/lunar/qt/4}
         WEB_SITE=http://www.trolltech.com/qt
-         ENTERED=20050629
+         ENTERED=20020420
          UPDATED=20060404
-	 GARBAGE=off
+         GARBAGE=off
      FTP_PASSIVE=on
       MAINTAINER=florin at lunar-linux.org
-           SHORT="Qt is a C++ toolkit for application development."
+           SHORT="a C++ toolkit for application development"
 
 cat << EOF
 Qt is a C++ toolkit for application development. It lets application 
@@ -24,9 +25,4 @@
 providing the application programmer with a single, common API for all 
 operating systems. The native C APIs are encapsulated in a set of 
 well-designed, fully object-oriented C++ classes. 
-
-Certain environment variables must be defined before compiling and using 
-applications that depend on qt.
-QTDIR=/opt/lunar/qt4/
-PATH=/opt/lunar/qt4/bin:$PATH
 EOF

Deleted: moonbase/trunk/zbeta/qt4/PRE_BUILD