[Lunar-commits] r19243 - in moonbase/branches/crater: . qt4

Moritz Heiber moe at lunar-linux.org
Tue Mar 14 22:17:34 UTC 2006


Author: moe
Date: 2006-03-14 22:17:33 +0000 (Tue, 14 Mar 2006)
New Revision: 19243

Added:
   moonbase/branches/crater/qt4/
Removed:
   moonbase/branches/crater/qt4/PRE_BUILD
Modified:
   moonbase/branches/crater/qt4/BUILD
   moonbase/branches/crater/qt4/CONFIGURE
   moonbase/branches/crater/qt4/DEPENDS
   moonbase/branches/crater/qt4/DETAILS
Log:
First attempt to rework the qt module. Its name is
now 'qt4'.



Copied: moonbase/branches/crater/qt4 (from rev 19241, moonbase/trunk/zbeta/qt)

Modified: moonbase/branches/crater/qt4/BUILD
===================================================================
--- moonbase/trunk/zbeta/qt/BUILD	2006-03-14 14:51:39 UTC (rev 19241)
+++ moonbase/branches/crater/qt4/BUILD	2006-03-14 22:17:33 UTC (rev 19243)
@@ -1,6 +1,4 @@
 (
-  export  YACC=byacc
-  export  QT_PREFIX=${QT_PREFIX:-/opt/lunar/qt}
   export  QTDIR=$SOURCE_DIRECTORY
   export  PATH=$QTDIR/bin:$PATH
   export  LD_LIBRARY_PATH=$QTDIR/lib
@@ -9,48 +7,54 @@
 
   sedit "s/-O2/$CXXFLAGS/" mkspecs/linux-g++/qmake.conf  &&
 
-  echo  "yes"  |  ./configure  -release                      \
-                               -shared                       \
-                               -thread                       \
-                               -qt-gif                       \
-                               -plugin-imgfmt-mng            \
-                               -system-libpng                \
-                               -system-libjpeg               \
-                               -system-zlib                  \
-                               -no-g++-exceptions            \
-                               -thread                       \
-                               -dlopen-opengl                \
-                               -prefix ${QT_PREFIX:-$QTDIR}  \
-                               -xft                          \
-                               $OPTS                        &&
+  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              \
+	       -stl		    \
+               $OPTS                &&
 
-  case $SAMPCOMP in
-    y|Y|j|J)
-      make
-      ;;
-    *)
-      make symlinks sub-src sub-tools
-      ;;
-  esac  &&
+  if [ "$SAMPIN" == "y" ] ; then
+    make
+  else
+    make sub-tools
+  fi &&
 
-  rm bin/qmake              &&     
-  cp qmake/qmake bin/qmake  &&
-  make install              &&
+  rm -f bin/qmake              &&     
+  cp qmake/qmake bin/qmake     &&
+  make install                 &&
 
-  case $SAMPIN in
-    y|Y|j|J)
-      mv examples  ${QT_PREFIX:-$QTDIR}  &&
-      mv tutorial  ${QT_PREFIX:-$QTDIR}
-      ;;
-  esac  &&
+  if [ "$SAMPIN" == "y" ] ; then
+    cp -a examples  ${MODULE_PREFIX}/
+    cp -a tutorial  ${MODULE_PREFIX}/
+  fi &&
 
-  if ! grep -q "${QT_PREFIX:-$QTDIR}/lib" /etc/ld.so.conf; then
-    echo "${QT_PREFIX:-$QTDIR}/lib" >> /etc/ld.so.conf
-  fi
+  if ! grep -q "${MODULE_PREFIX}/lib" /etc/ld.so.conf; then
+    echo "${MODULE_PREFIX}/lib" >> /etc/ld.so.conf
+  fi &&
 
-  echo "export QTDIR=$QT_PREFIX" > /etc/profile.d/qt.rc
-  echo "export PATH=\$QTDIR/bin:\$PATH" >> /etc/profile.d/qt.rc
-  echo "export PKG_CONFIG_PATH=$QT_PREFIX/lib/pkgconfig:\$PKG_CONFIG_PATH" \
-                 >> /etc/profile.d/qt.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 &&
 
+  install -m644 $SOURCE_DIRECTORY/qt4.rc /etc/profile.d/
+
 ) > $C_FIFO 2>&1

Modified: moonbase/branches/crater/qt4/CONFIGURE
===================================================================
--- moonbase/trunk/zbeta/qt/CONFIGURE	2006-03-14 14:51:39 UTC (rev 19241)
+++ moonbase/branches/crater/qt4/CONFIGURE	2006-03-14 22:17:33 UTC (rev 19243)
@@ -1,2 +1 @@
-mquery SAMPIN "Install Qt examples and tutorials?" y
-mquery SAMPCOMP "Pre-compile Qt examples and tutorials?" n
+mquery SAMPIN "Install QT3 examples and tutorials?" n

Modified: moonbase/branches/crater/qt4/DEPENDS
===================================================================
--- moonbase/trunk/zbeta/qt/DEPENDS	2006-03-14 14:51:39 UTC (rev 19241)
+++ moonbase/branches/crater/qt4/DEPENDS	2006-03-14 22:17:33 UTC (rev 19243)
@@ -1,4 +1,3 @@
-depends  byacc     &&
 depends  libungif  &&
 depends  libmng    &&
 depends  %X        &&

Modified: moonbase/branches/crater/qt4/DETAILS
===================================================================
--- moonbase/trunk/zbeta/qt/DETAILS	2006-03-14 14:51:39 UTC (rev 19241)
+++ moonbase/branches/crater/qt4/DETAILS	2006-03-14 22:17:33 UTC (rev 19243)
@@ -1,13 +1,15 @@
-          MODULE=qt
-         VERSION=x11-opensource-src-4.1.1
-          SOURCE=$MODULE-$VERSION.tar.gz
+          MODULE=qt4
+         VERSION=4.1.1
+          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:44ca2afc223e327c6d326f5ee07a0049869defa5
+   MODULE_PREFIX=${QT_PREFIX:-/opt/lunar/qt/4}
         WEB_SITE=http://www.trolltech.com/qt
-         ENTERED=20050629
-         UPDATED=20060223
-	 GARBAGE=off
+         ENTERED=20020420
+         UPDATED=20060314
+         GARBAGE=off
      FTP_PASSIVE=on
       MAINTAINER=florin at lunar-linux.org
            SHORT="Qt is a C++ toolkit for application development."
@@ -23,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/qt/
-PATH=/opt/lunar/qt/bin:$PATH
 EOF

Deleted: moonbase/branches/crater/qt4/PRE_BUILD



More information about the Lunar-commits mailing list