[Lunar-commits] r19230 - in moonbase/branches/crater/kde3: . qt3
Moritz Heiber
moe at lunar-linux.org
Mon Mar 13 22:13:25 UTC 2006
Author: moe
Date: 2006-03-13 22:13:24 +0000 (Mon, 13 Mar 2006)
New Revision: 19230
Added:
moonbase/branches/crater/kde3/qt3/
Modified:
moonbase/branches/crater/kde3/qt3/BUILD
moonbase/branches/crater/kde3/qt3/CONFIGURE
moonbase/branches/crater/kde3/qt3/DEPENDS
moonbase/branches/crater/kde3/qt3/DETAILS
moonbase/branches/crater/kde3/qt3/PRE_BUILD
Log:
Adding a proposal for a new and all better qt3 module
Copied: moonbase/branches/crater/kde3/qt3 (from rev 18970, moonbase/trunk/kde3/qt3)
Modified: moonbase/branches/crater/kde3/qt3/BUILD
===================================================================
--- moonbase/trunk/kde3/qt3/BUILD 2006-03-01 17:49:09 UTC (rev 18970)
+++ moonbase/branches/crater/kde3/qt3/BUILD 2006-03-13 22:13:24 UTC (rev 19230)
@@ -1,6 +1,4 @@
(
- export YACC=byacc
- export QT_PREFIX=${QT_PREFIX:-/opt/lunar/qt/3}
export QTDIR=$SOURCE_DIRECTORY
export PATH=$QTDIR/bin:$PATH
export LD_LIBRARY_PATH=$QTDIR/lib
@@ -9,51 +7,54 @@
sedit "s/-O2/$CXXFLAGS/" mkspecs/linux-g++/qmake.conf &&
- patch_it $SOURCE_CACHE/$SOURCE2 1 &&
- patch_it $SOURCE_CACHE/$SOURCE3 1 &&
+ echo "yes" | ./configure \
+ -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 \
+ -prefix ${QT_PREFIX} \
+ -tablet \
+ $OPTS &&
- 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 &&
+ if [ "$SAMPIN" == "y" ] ; then
+ make
+ else
+ make sub-tools
+ fi &&
- case $SAMPCOMP in
- y|Y|j|J)
- make
- ;;
- *)
- make symlinks sub-src sub-tools
- ;;
- esac &&
+ rm -f bin/qmake &&
+ cp qmake/qmake bin/qmake &&
+ make install &&
- rm bin/qmake &&
- cp qmake/qmake bin/qmake &&
- make install &&
+ if [ "$SAMPIN" == "y" ] ; then
+ mv examples ${MODULE_PREFIX}/
+ mv tutorial ${MODULE_PREFIX}/
+ fi &&
- case $SAMPIN in
- y|Y|j|J)
- mv examples ${QT_PREFIX:-$QTDIR} &&
- mv tutorial ${QT_PREFIX:-$QTDIR}
- ;;
- esac &&
+ if ! grep -q "${MODULE_PREFIX}/lib" /etc/ld.so.conf; then
+ echo "${MODULE_PREFIX}/lib" >> /etc/ld.so.conf
+ fi &&
- if ! grep -q "${QT_PREFIX:-$QTDIR}/lib" /etc/ld.so.conf; then
- echo "${QT_PREFIX:-$QTDIR}/lib" >> /etc/ld.so.conf
- fi
+cat << EOF > $SOURCE_DIRECTORY/qt3.rc &&
+export QTDIR="${MODULE_PREFIX}"
+export PATH="${QTDIR}/bin:${PATH}"
+export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}"
+EOF
- echo "export QTDIR=$QT_PREFIX" > /etc/profile.d/qt3.rc
- echo "export PATH=\$QTDIR/bin:\$PATH" >> /etc/profile.d/qt3.rc
- echo "export PKG_CONFIG_PATH=$QT_PREFIX/lib/pkgconfig:\$PKG_CONFIG_PATH" \
- >> /etc/profile.d/qt3.rc
+ install -m644 $SOURCE_DIRECTORY/qt3.rc /etc/profile.d/
) > $C_FIFO 2>&1
Modified: moonbase/branches/crater/kde3/qt3/CONFIGURE
===================================================================
--- moonbase/trunk/kde3/qt3/CONFIGURE 2006-03-01 17:49:09 UTC (rev 18970)
+++ moonbase/branches/crater/kde3/qt3/CONFIGURE 2006-03-13 22:13:24 UTC (rev 19230)
@@ -1,2 +1 @@
-mquery SAMPIN "Install QT3 examples and tutorials?" y
-mquery SAMPCOMP "Pre-compile QT3 examples and tutorials?" n
+mquery SAMPIN "Install QT3 examples and tutorials?" n
Modified: moonbase/branches/crater/kde3/qt3/DEPENDS
===================================================================
--- moonbase/trunk/kde3/qt3/DEPENDS 2006-03-01 17:49:09 UTC (rev 18970)
+++ moonbase/branches/crater/kde3/qt3/DEPENDS 2006-03-13 22:13:24 UTC (rev 19230)
@@ -1,4 +1,3 @@
-depends byacc &&
depends libungif &&
depends libmng &&
depends %X &&
Modified: moonbase/branches/crater/kde3/qt3/DETAILS
===================================================================
--- moonbase/trunk/kde3/qt3/DETAILS 2006-03-01 17:49:09 UTC (rev 18970)
+++ moonbase/branches/crater/kde3/qt3/DETAILS 2006-03-13 22:13:24 UTC (rev 19230)
@@ -1,14 +1,11 @@
MODULE=qt3
- VERSION=3.3.4
+ VERSION=3.3.5
SOURCE=qt-x11-free-$VERSION.tar.bz2
- SOURCE2=qt-x11-free-3.3.2-which.patch.bz2
- SOURCE3=qt-3.3.4-flickerfree.patch.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/qt-x11-free-$VERSION
SOURCE_URL[0]=ftp://ftp.trolltech.com/qt/source/
SOURCE_URL[1]=http://gd.tuwien.ac.at/hci/qt/source/
- SOURCE2_URL[0]=$PATCH_URL/
- SOURCE3_URL[0]=$PATCH_URL/
- SOURCE_VFY=sha1:cb5f452bcdc9d2ed0201481f4b8f152edfda9523
+ SOURCE_VFY=sha1:8d7c7ba0b39848ef60b3cd93fc1d33e9527694ec
+ MODULE_PREFIX=${QT_PREFIX:-/opt/lunar/qt/3}
WEB_SITE=http://www.trolltech.com/qt
ENTERED=20020420
UPDATED=20050917
Modified: moonbase/branches/crater/kde3/qt3/PRE_BUILD
===================================================================
--- moonbase/trunk/kde3/qt3/PRE_BUILD 2006-03-01 17:49:09 UTC (rev 18970)
+++ moonbase/branches/crater/kde3/qt3/PRE_BUILD 2006-03-13 22:13:24 UTC (rev 19230)
@@ -2,8 +2,8 @@
Certain environment variables must be defined before compiling and using qt3
and applications that depend on qt3, QT_PREFIX and/or QTDIR.
The default values are:
- QT_PREFIX=
- QTDIR=/opt/lunar/qt/3.
+ 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
qt3 module to be installed. QTDIR value is used as a default value unless a
More information about the Lunar-commits
mailing list