summaryrefslogtreecommitdiffstats
path: root/arch/calvin
diff options
context:
space:
mode:
authoralbator <albator@arcadia.vtf>2011-10-21 20:16:07 +0200
committeralbator <albator@arcadia.vtf>2011-10-21 20:16:07 +0200
commit7a0adf35896618a7570e425941fc1b74c54def47 (patch)
tree16dab9d8bfbd93575440f357c70907cbb5480980 /arch/calvin
parentcd71be65dc30c8007ec54becdf6c50260ed8e908 (diff)
parenta8707e2a9f22d082cecb8ea6079175076f983c55 (diff)
downloadtde-packaging-7a0adf35896618a7570e425941fc1b74c54def47.tar.gz
tde-packaging-7a0adf35896618a7570e425941fc1b74c54def47.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'arch/calvin')
-rw-r--r--arch/calvin/trinity-qt3/PKGBUILD37
1 files changed, 29 insertions, 8 deletions
diff --git a/arch/calvin/trinity-qt3/PKGBUILD b/arch/calvin/trinity-qt3/PKGBUILD
index cf8a3ef51..2fe272238 100644
--- a/arch/calvin/trinity-qt3/PKGBUILD
+++ b/arch/calvin/trinity-qt3/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Calvin Morrison <MutantTurkey@gmail.com>
pkgname=trinity-qt3
-pkgver=20110918
+pkgver=20110919
pkgrel=1
pkgdesc="The Qt3 gui toolkit - with Trinity upstream"
_prefix="/opt/qt"
@@ -32,14 +32,23 @@ build() {
cd $_gitname && git pull origin
msg "The local files are updated."
else
- git clone $_gitroot
+ git clone $_gitroot
fi
msg "GIT checkout done or server timeout"
msg "Starting make..."
-
+ export QTDIR="${srcdir}/"$_gitname
+ export PATH=${QTDIR}/bin:${PATH}
+ export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
+ export QMAKESPEC=$QTDIR/mkspecs/linux-g++
+
+ if [ "$CARCH" = "x86_64" ]; then
+ export ARCH="-64"
+ else unset ARCH
+fi
+
cd "$srcdir/$_gitname"
@@ -50,16 +59,28 @@ build() {
msg "Starting configure..."
#make -C qmake || return 1
- ./configure -thread -fast
+ ./configure -prefix ${_prefix} \
+ -fast \
+ -sysconfdir /etc/qt \
+ -thread \
+ -shared \
+ -system-zlib \
+ -platform linux-g++$ARCH \
+ -system-lib{png,jpeg,mng}
make
}
package() {
- echo $PWD
- echo $pkgdir
- mkdir "$pkgdir/lib"
cd "$srcdir/$_gitname"
- make INSTALL_ROOT="$pkgdir/lib/" install
+
+ # Build and install qt.profile
+ echo "export QTDIR=${_prefix}" > ${srcdir}/qt.profile
+ echo "export QT_XFT=true" >> ${srcdir}/qt.profile
+ echo 'export PATH=$PATH:$QTDIR/bin' >> ${srcdir}/qt.profile
+ echo 'export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$QTDIR/pkgconfig' >> ${srcdir}/qt.profile
+ install -D -m755 ${srcdir}/qt.profile ${pkgdir}/etc/profile.d/qt3.sh
+
+ make INSTALL_ROOT="$pkgdir/" install
}