[Lunar-commits] r19543 - moonbase/trunk/zbeta/qt
Florin Braescu
florin at lunar-linux.org
Sat Apr 1 02:39:07 UTC 2006
Author: florin
Date: 2006-04-01 02:39:06 +0000 (Sat, 01 Apr 2006)
New Revision: 19543
Modified:
moonbase/trunk/zbeta/qt/BUILD
moonbase/trunk/zbeta/qt/CONFIGURE
moonbase/trunk/zbeta/qt/DEPENDS
moonbase/trunk/zbeta/qt/DETAILS
moonbase/trunk/zbeta/qt/PRE_BUILD
Log:
bump the version from 4.1.1 to 4.1.2. bugfixes release.
Modified: moonbase/trunk/zbeta/qt/BUILD
===================================================================
--- moonbase/trunk/zbeta/qt/BUILD 2006-03-31 23:47:26 UTC (rev 19542)
+++ moonbase/trunk/zbeta/qt/BUILD 2006-04-01 02:39:06 UTC (rev 19543)
@@ -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,53 @@
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 \
+ $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/qt.rc &&
+ echo export PATH=\"'${QTDIR}'/bin:'${PATH}'\" >> $SOURCE_DIRECTORY/qt.rc &&
+ echo export PKG_CONFIG_PATH=\"'${QTDIR}'/lib/pkgconfig:'${PKG_CONFIG_PATH}'\" \
+ >> $SOURCE_DIRECTORY/qt.rc &&
+ install -m644 $SOURCE_DIRECTORY/qt.rc /etc/profile.d/
+
) > $C_FIFO 2>&1
Modified: moonbase/trunk/zbeta/qt/CONFIGURE
===================================================================
--- moonbase/trunk/zbeta/qt/CONFIGURE 2006-03-31 23:47:26 UTC (rev 19542)
+++ moonbase/trunk/zbeta/qt/CONFIGURE 2006-04-01 02:39:06 UTC (rev 19543)
@@ -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/trunk/zbeta/qt/DEPENDS
===================================================================
--- moonbase/trunk/zbeta/qt/DEPENDS 2006-03-31 23:47:26 UTC (rev 19542)
+++ moonbase/trunk/zbeta/qt/DEPENDS 2006-04-01 02:39:06 UTC (rev 19543)
@@ -1,4 +1,3 @@
-depends byacc &&
depends libungif &&
depends libmng &&
depends %X &&
Modified: moonbase/trunk/zbeta/qt/DETAILS
===================================================================
--- moonbase/trunk/zbeta/qt/DETAILS 2006-03-31 23:47:26 UTC (rev 19542)
+++ moonbase/trunk/zbeta/qt/DETAILS 2006-04-01 02:39:06 UTC (rev 19543)
@@ -1,12 +1,13 @@
MODULE=qt
- VERSION=x11-opensource-src-4.1.1
+ VERSION=x11-opensource-src-4.1.2
SOURCE=$MODULE-$VERSION.tar.gz
SOURCE_URL[0]=ftp://ftp.trolltech.com/qt/source/
SOURCE_URL[1]=http://gd.tuwien.ac.at/hci/qt/source/
- SOURCE_VFY=sha1:44ca2afc223e327c6d326f5ee07a0049869defa5
+ SOURCE_VFY=sha1:a30ff8594b816528ab08ebcf349a31e244c4278d
+ MODULE_PREFIX=${QT_PREFIX:-/opt/lunar/qt}
WEB_SITE=http://www.trolltech.com/qt
ENTERED=20050629
- UPDATED=20060223
+ UPDATED=20060401
GARBAGE=off
FTP_PASSIVE=on
MAINTAINER=florin at lunar-linux.org
Modified: moonbase/trunk/zbeta/qt/PRE_BUILD
===================================================================
--- moonbase/trunk/zbeta/qt/PRE_BUILD 2006-03-31 23:47:26 UTC (rev 19542)
+++ moonbase/trunk/zbeta/qt/PRE_BUILD 2006-04-01 02:39:06 UTC (rev 19543)
@@ -2,8 +2,8 @@
Certain environment variables must be defined before compiling and using qt
and applications that depend on qt, QT_PREFIX and/or QTDIR.
The default values are:
- QT_PREFIX=
- QTDIR=/opt/lunar/qt.
+ QT_PREFIX="${MODULE_PREFIX}"
+ QTDIR="${MODULE_PREFIX}"
You can put the file actual.rc in the /etc/profile.d directory containing the
new value of QT_PREFIX, and it's value will be used as the location where the
qt module to be installed. QTDIR value is used as a default value unless a
More information about the Lunar-commits
mailing list