[arch-commits] CVS update of extra/lib/qt (5 files)
Pierre Schmitz
pierre at archlinux.org
Sat Nov 10 14:55:00 UTC 2007
Date: Saturday, November 10, 2007 @ 09:55:00
Author: pierre
Path: /home/cvs-extra/extra/lib/qt
Added: qt4-assistant.desktop (1.1) qt4-designer.desktop (1.1)
qt4-linguist.desktop (1.1)
Modified: PKGBUILD (1.31 -> 1.32) qt-copy-kde-patches.tar.bz2 (1.12 -> 1.13)
upgpkg: qt 4.3.2-2
update to version 4; replace package from community
-----------------------------+
PKGBUILD | 179 +++++++++++++++++++-----------------------
qt-copy-kde-patches.tar.bz2 | <<Binary file>>
qt4-assistant.desktop | 10 ++
qt4-designer.desktop | 11 ++
qt4-linguist.desktop | 11 ++
5 files changed, 117 insertions(+), 95 deletions(-)
Index: extra/lib/qt/PKGBUILD
diff -u extra/lib/qt/PKGBUILD:1.31 extra/lib/qt/PKGBUILD:1.32
--- extra/lib/qt/PKGBUILD:1.31 Mon Aug 13 15:46:47 2007
+++ extra/lib/qt/PKGBUILD Sat Nov 10 09:54:59 2007
@@ -1,106 +1,95 @@
-# $Id: PKGBUILD,v 1.31 2007/08/13 19:46:47 pierre Exp $
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: John Proctor <jproctor at prium.net>
+# $Id: PKGBUILD,v 1.32 2007/11/10 14:54:59 pierre Exp $
+# Maintainer: Vinay S Shastry (vinayshastry at gmail.com)
+
pkgname=qt
-pkgver=3.3.8
-pkgrel=5
+pkgver=4.3.2
+pkgrel=2
pkgdesc="The QT gui toolkit."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
+url="http://www.trolltech.com/products/qt"
license=('GPL')
-url="http://www.trolltech.com/products/qt/index.html"
-pkgfqn=${pkgname}-x11-free-${pkgver}
-install=qt.install
-depends=('libpng' 'libjpeg' 'libxmu' 'libxcursor' 'libxinerama' 'mesa' \
- 'libxft' 'libxrandr')
-makedepends=('mysql' 'postgresql>=8.2.3' 'sqlite3' 'unixodbc' 'libmng')
-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)
-md5sums=('cf3c43a7dfde5bfb76f8001102fe6e85'
- '71fee534492524002eb06ddceecc98d9'
- '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
+options=('!libtool' 'docs')
+depends=('libpng' 'libjpeg' 'libxi' 'libxcursor' 'libxinerama' 'mesa' \
+ 'fontconfig' 'libxrandr' 'dbus' 'glib2')
+makedepends=('mysql' 'postgresql' 'unixodbc' 'libmng')
+provides=('qt4')
+replaces=('qt4')
+conflicts=('qt4')
+_pkgfqn=qt-x11-opensource-src-$pkgver
+source=(ftp://ftp.trolltech.com/qt/source/$_pkgfqn.tar.gz \
+ qt-copy-kde-patches.tar.bz2 \
+ qt4-assistant.desktop qt4-designer.desktop qt4-linguist.desktop )
+md5sums=('a60490b36099bdd10c4d2f55430075b3' '4313d6df34598448645b191aa25928a4'\
+ 'd4a1bea216aa184b1ffc1178808e17b1' '67adab60dd87270e733d25552a826950'\
+ '40a36635b14c32bd2923e408c2e877bf' 'cd6e1c951e079e2eace67bce5e63966c')
build() {
- export QTDIR=$startdir/src/$pkgfqn
- export PATH=${QTDIR}/bin:${PATH}
- export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
- cd $startdir/src/$pkgfqn
- # apply qt patches from kde.org
- for i in ../qt-copy-kde-patches/*; do
+ unset QMAKESPEC
+ export QT4DIR=$startdir/src/$_pkgfqn
+ export PATH=${QT4DIR}/bin:${PATH}
+ export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
+ cd $startdir/src/$_pkgfqn
+
+ # patches from qt-copy (kde.org)
+ for i in ../qt-copy-kde-patches/* ; do
patch -Np0 -i $i || return 1
done
- # apply other qt patches and one security fix from debian/gentoo
- for i in ../qt-patches/*; do
- patch -Np1 -i $i || return 1
- done
- # fix utf8 bug
- patch -Np0 -i ../utf8-bug-qt3.diff || return 1
- # fix asia fonts
- patch -Np0 -i ../qt-font-default-subst.diff || return 1
- # fix segfaults on exit when using mysql DB driver
- patch -Np0 -i ../mysql.patch || return 1
+
+ # remove docs
+ rm -rf doc
+
+ # remove unwanted mkspecs
+ rm -rf mkspecs/{*aix*,*bsd*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,sco*,solaris*,tru64*,unixware*,win32*}
+ rm -rf mkspecs/qws/{*bsd*,linux-{arm,cellon,ipaq,mips,sharp,zylonite}*,mac*,solaris*}
+
# start compiling qt
sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
- rm -rf doc/html examples tutorial
- sed -i "s|sub-tutorial sub-examples||" Makefile
- sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf
- sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix
- sed -i "s|read acceptance|acceptance=yes|" configure
-
- if [ "$CARCH" = "x86_64" ]; then
- export ARCH="-64"
- else unset ARCH
- fi
-
- ./configure -prefix /opt/qt -platform linux-g++$ARCH \
- -system-zlib -qt-gif -release -shared -sm -nis -thread -stl \
- -{system-lib,plugin-imgfmt-}{png,jpeg,mng} \
- -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
-
- cd $startdir/src/$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 $startdir/src/$pkgfqn
- # fix the broken makefiles
- #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile
+ sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
+ #sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix
+
+ # sed -i "s|read acceptance|acceptance=yes|" configure
+ # an undocumented new way of accepting license:
+ # -confirm-license option to configure
+
+ ./configure -confirm-license \
+ -prefix /usr \
+ -docdir /usr/share/doc/$pkgname \
+ -plugindir /usr/lib/$pkgname/plugins \
+ -datadir /usr/share/$pkgname \
+ -translationdir /usr/share/$pkgname/translations \
+ -sysconfdir /etc/$pkgname \
+ -examplesdir /usr/share/doc/$pkgname/examples \
+ -demosdir /usr/share/doc/$pkgname/demos \
+ -release \
+ -platform linux-g++ \
+ -system-zlib \
+ -system-libpng \
+ -system-libjpeg \
+ -qt-gif \
+ -shared -sm -nis -stl \
+ -plugin-sql-{mysql,psql,sqlite,odbc} \
+ -no-separate-debug-info \
+ -glib -qdbus \
+ -optimized-qmake \
+ -fast || return 1
+
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
- install -D -m755 $startdir/qt.profile $startdir/pkg/etc/profile.d/qt.sh
- [ "$CARCH" = "x86_64" ] && sed -i "s|linux-g++|linux-g++-64|g" $startdir/pkg/etc/profile.d/qt.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
-}
+ make INSTALL_ROOT=$startdir/pkg install || return 1
+ # install images and .desktop files
+ mkdir $startdir/pkg/usr/share/{pixmaps,applications}
+ cp tools/assistant/images/{linguist,designer,assistant}.png $startdir/pkg/usr/share/pixmaps
+ cp $startdir/src/qt4-{linguist,designer,assistant}.desktop $startdir/pkg/usr/share/applications
+
+ # profile
+ # since we disabled the qt3 profile by default this is not needed any more
+ #install -D -m755 $startdir/src/qt4.profile $startdir/pkg/etc/profile.d/qt4.sh
+ #[ "$CARCH" = "x86_64" ] && sed -i "s|linux-g++|linux-g++-64|g" $startdir/pkg/etc/profile.d/qt4.sh
+
+ # lots of cleanup and path fixes - thanks to crazy (frugalware)
+ find $startdir/pkg/usr/lib -type f -name '*prl' -print -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \;
+ sed -i -e "s|-L$startdir/src/${_pkgfqn}/lib||g" $startdir/pkg/usr/lib/pkgconfig/*.pc
+ sed -i -e "s|-L$startdir/src/${_pkgfqn}/lib||g" $startdir/pkg/usr/lib/*.prl $startdir/pkg/usr/share/doc/qt/demos/shared/libdemo_shared.prl
+ sed -i -e "s|$startdir/src/${_pkgfqn}/bin/moc|/usr/bin/moc|g" $startdir/pkg/usr/lib/pkgconfig/*.pc
+ sed -i -e "s|$startdir/src/${_pkgfqn}/bin/uic|/usr/bin/uic|g" $startdir/pkg/usr/lib/pkgconfig/*.pc
+}
\ No newline at end of file
Index: extra/lib/qt/qt-copy-kde-patches.tar.bz2
<<Binary file>>
Index: extra/lib/qt/qt4-assistant.desktop
diff -u /dev/null extra/lib/qt/qt4-assistant.desktop:1.1
--- /dev/null Sat Nov 10 09:55:00 2007
+++ extra/lib/qt/qt4-assistant.desktop Sat Nov 10 09:54:59 2007
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=/usr/bin/assistant
+Name=Qt 4 Assistant
+GenericName=Qt4 Document Browser
+X-KDE-StartupNotify=true
+Icon=assistant
+Terminal=false
+Type=Application
+Categories=Qt;Development;Documentation
Index: extra/lib/qt/qt4-designer.desktop
diff -u /dev/null extra/lib/qt/qt4-designer.desktop:1.1
--- /dev/null Sat Nov 10 09:55:00 2007
+++ extra/lib/qt/qt4-designer.desktop Sat Nov 10 09:54:59 2007
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=/usr/bin/designer
+Name=Qt 4 Designer
+GenericName=Interface Designer
+X-KDE-StartupNotify=true
+MimeType=application/x-designer
+Icon=designer
+Terminal=false
+Type=Application
+Categories=Qt;Development;GUIDesigner
Index: extra/lib/qt/qt4-linguist.desktop
diff -u /dev/null extra/lib/qt/qt4-linguist.desktop:1.1
--- /dev/null Sat Nov 10 09:55:00 2007
+++ extra/lib/qt/qt4-linguist.desktop Sat Nov 10 09:54:59 2007
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=/usr/bin/linguist
+Name=Qt 4 Linguist
+GenericName=Translation Tool
+X-KDE-StartupNotify=true
+MimeType=application/x-linguist
+Terminal=false
+Type=Application
+Icon=linguist
+Categories=Qt;Development;Translation
More information about the arch-commits
mailing list