[arch-commits] CVS update of extra/lib/qt3 (PKGBUILD qt.profile)
Tobias Powalowski
tpowa at archlinux.org
Tue Nov 13 10:05:26 UTC 2007
Date: Tuesday, November 13, 2007 @ 05:05:26
Author: tpowa
Path: /home/cvs-extra/extra/lib/qt3
Modified: PKGBUILD (1.1 -> 1.2) qt.profile (1.1 -> 1.2)
'upgpkg: added shastrys changes for better qt4 compliance'
------------+
PKGBUILD | 29 +++++++++++------------------
qt.profile | 1 -
2 files changed, 11 insertions(+), 19 deletions(-)
Index: extra/lib/qt3/PKGBUILD
diff -u extra/lib/qt3/PKGBUILD:1.1 extra/lib/qt3/PKGBUILD:1.2
--- extra/lib/qt3/PKGBUILD:1.1 Sat Nov 10 10:03:17 2007
+++ extra/lib/qt3/PKGBUILD Tue Nov 13 05:05:26 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.1 2007/11/10 15:03:17 pierre Exp $
+# $Id: PKGBUILD,v 1.2 2007/11/13 10:05:26 tpowa Exp $
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
# Contributor: John Proctor <jproctor at prium.net>
pkgname=qt3
pkgver=3.3.8
-pkgrel=5
+pkgrel=6
pkgdesc="The QT gui toolkit."
arch=(i686 x86_64)
license=('GPL')
@@ -16,17 +16,20 @@
source=(ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.bz2 qt.profile \
qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2 utf8-bug-qt3.diff \
qt-font-default-subst.diff mysql.patch)
+options=(!libtool)
md5sums=('cf3c43a7dfde5bfb76f8001102fe6e85'
- '71fee534492524002eb06ddceecc98d9'
+ '5e9c045b1d93f732444f1527826de1b3'
'f2a2dbdbfee9422c90efc3ef3f86197c'
'c8937968e9807b3cdcdf0505728d99ce'
'f6b3b39040f2b8f19ba1cf1445468c28'
'9370d82e85f2c799335ed0dcc1d53189'
'7d40ed1bd40d33d8b9b27a2076a5d22a')
+
# qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/
# other qt-patches come from fedora and gentoo
build() {
+ unset QMAKESPEC
export QTDIR=$startdir/src/$pkgfqn
export PATH=${QTDIR}/bin:${PATH}
export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
@@ -54,6 +57,9 @@
sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix
sed -i "s|read acceptance|acceptance=yes|" configure
+ # remove unwanted mkspecs
+ rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*}
+
if [ "$CARCH" = "x86_64" ]; then
export ARCH="-64"
else unset ARCH
@@ -83,26 +89,13 @@
#sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile
make || return 1
make INSTALL_ROOT=$startdir/pkg install
- rm -rf `find $startdir/pkg/opt/qt/mkspecs/* | grep -v linux-g++$ARCH`
rm -rf $startdir/pkg/opt/qt/{phrasebooks,templates,translations}
sed -i "s|-L$startdir/src/$pkgfqn/lib ||g" $startdir/pkg/opt/qt/lib/*.prl
install -D -m755 qmake/qmake $startdir/pkg/opt/qt/bin/qmake
- # disable the profile by default
- install -D -m644 $startdir/qt.profile $startdir/pkg/etc/profile.d/qt3.sh
- [ "$CARCH" = "x86_64" ] && sed -i "s|linux-g++|linux-g++-64|g" $startdir/pkg/etc/profile.d/qt3.sh
-
+ install -D -m755 $startdir/qt.profile $startdir/pkg/etc/profile.d/qt3.sh
rm -f $startdir/pkg/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH
+
# install man pages
mkdir -p $startdir/pkg/opt/qt/man
cp -r $startdir/src/$pkgfqn/doc/man/{man1,man3} $startdir/pkg/opt/qt/man/
- #libtoolslay
- find $startdir/pkg -name '*.la' -exec rm {} \;
-
- # Arch64 fix
- if [ "$CARCH" = "x86_64" ]; then
- mkdir $startdir/pkg/opt/qt/mkspecs/linux-g++
- cd $startdir/pkg/opt/qt/mkspecs/linux-g++
- ln -s -v ../linux-g++-64/* .
- fi
}
-
Index: extra/lib/qt3/qt.profile
diff -u extra/lib/qt3/qt.profile:1.1 extra/lib/qt3/qt.profile:1.2
--- extra/lib/qt3/qt.profile:1.1 Sat Nov 10 10:03:17 2007
+++ extra/lib/qt3/qt.profile Tue Nov 13 05:05:26 2007
@@ -1,6 +1,5 @@
export QTDIR=/opt/qt
export QT_XFT=true
-export QMAKESPEC=$QTDIR/mkspecs/linux-g++
export PATH=$PATH:$QTDIR/bin
export MANPATH=$MANPATH:$QTDIR/man
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig
More information about the arch-commits
mailing list