[arch-commits] Commit in qt3/trunk (PKGBUILD qt.install)
Daniel Griffiths
dgriffiths at archlinux.org
Fri Feb 26 21:50:30 UTC 2010
Date: Friday, February 26, 2010 @ 16:50:29
Author: dgriffiths
Revision: 70472
FS#18371
Modified:
qt3/trunk/PKGBUILD
qt3/trunk/qt.install
------------+
PKGBUILD | 50 +++++++++++++++++++++++++-------------------------
qt.install | 2 +-
2 files changed, 26 insertions(+), 26 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-02-26 21:25:20 UTC (rev 70471)
+++ PKGBUILD 2010-02-26 21:50:29 UTC (rev 70472)
@@ -4,7 +4,7 @@
pkgname=qt3
pkgver=3.3.8
-pkgrel=15
+pkgrel=16
pkgdesc="The QT gui toolkit."
arch=(i686 x86_64)
license=('GPL')
@@ -35,11 +35,11 @@
build() {
unset QMAKESPEC
- export QTDIR=$startdir/src/$pkgfqn
+ export QTDIR=${srcdir}/$pkgfqn
export PATH=${QTDIR}/bin:${PATH}
export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
export QMAKESPEC=$QTDIR/mkspecs/linux-g++
- cd $startdir/src/$pkgfqn
+ cd ${srcdir}/$pkgfqn
# apply qt patches from kde.org
for i in ../qt-copy-kde-patches/*; do
patch -Np0 -i $i || return 1
@@ -57,9 +57,9 @@
# fix CJK font/chars select error (FS#11245)
patch -p1 -i ${srcdir}/eastern_asian_languagues.diff || return 1
# fix build problem against new unixODBC
- patch -p1 -i $srcdir/qt-odbc.patch || return 1
+ patch -p1 -i ${srcdir}/qt-odbc.patch || return 1
- patch -p0 -i $srcdir/qt3-png14.patch || return 1
+ patch -p0 -i ${srcdir}/qt3-png14.patch || return 1
# start compiling qt
sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
rm -rf doc/html examples tutorial
@@ -84,34 +84,34 @@
-no-g++-exceptions -plugin-sql-{mysql,psql,sqlite,odbc}
# fix /opt/qt/lib path
- [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" $startdir/src/$pkgfqn/src/Makefile
- [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" $startdir/src/$pkgfqn/tools/designer/designer/Makefile
- [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" $startdir/src/$pkgfqn/tools/designer/editor/Makefile
- [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" $startdir/src/$pkgfqn/tools/assistant/lib/Makefile
- [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" $startdir/src/$pkgfqn/tools/designer/uilib/Makefile
+ [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/src/Makefile
+ [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/designer/designer/Makefile
+ [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/designer/editor/Makefile
+ [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/assistant/lib/Makefile
+ [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/designer/uilib/Makefile
- cd $startdir/src/$pkgfqn
+ cd ${srcdir}/$pkgfqn
make -C qmake || return 1
- cd $startdir/src/$pkgfqn/plugins/src/sqldrivers/mysql
- $startdir/src/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
- cd $startdir/src/$pkgfqn/plugins/src/sqldrivers/psql
- $startdir/src/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
+ cd ${srcdir}/$pkgfqn/plugins/src/sqldrivers/mysql
+ ${srcdir}/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
+ cd ${srcdir}/$pkgfqn/plugins/src/sqldrivers/psql
+ ${srcdir}/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
- cd $startdir/src/$pkgfqn
+ cd ${srcdir}/$pkgfqn
# fix the broken makefiles
#sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile
make || return 1
- make INSTALL_ROOT=$startdir/pkg install
- 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
- install -D -m755 $srcdir/qt.profile $startdir/pkg/etc/profile.d/qt3.sh
- ln -sf /opt/qt/bin/qtconfig $startdir/pkg/opt/qt/bin/qt3config
- rm -f $startdir/pkg/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH
+ make INSTALL_ROOT=${pkgdir} install
+ rm -rf ${pkgdir}/opt/qt/{phrasebooks,templates,translations}
+ sed -i "s|-L${srcdir}/$pkgfqn/lib ||g" ${pkgdir}/opt/qt/lib/*.prl
+ install -D -m755 qmake/qmake ${pkgdir}/opt/qt/bin/qmake
+ install -D -m755 ${srcdir}/qt.profile ${pkgdir}/etc/profile.d/qt3.sh
+ ln -sf /opt/qt/bin/qtconfig ${pkgdir}/opt/qt/bin/qt3config
+ rm -f ${pkgdir}/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/
+ mkdir -p ${pkgdir}/opt/qt/man
+ cp -r ${srcdir}/$pkgfqn/doc/man/{man1,man3} ${pkgdir}/opt/qt/man/
install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
echo '/opt/qt/lib' > ${pkgdir}/etc/ld.so.conf.d/qt3.conf
Modified: qt.install
===================================================================
--- qt.install 2010-02-26 21:25:20 UTC (rev 70471)
+++ qt.install 2010-02-26 21:50:29 UTC (rev 70472)
@@ -8,5 +8,5 @@
post_remove() {
# this can be removed in future versions
- sed -ie '/\/opt\/qt\/lib/d' etc/ld.so.conf
+ sed -e -i '/\/opt\/qt\/lib/d' etc/ld.so.conf
}
More information about the arch-commits
mailing list