qt: update to 4.6.0.

--HG--
extra : convert_revision : c91fbebe7f1534cc1987de8a802fde7d51902cab
This commit is contained in:
Juan RP 2010-01-05 23:13:52 +01:00
parent 354a3b0249
commit ecf0ce2780
4 changed files with 32 additions and 48 deletions

View file

@ -18,7 +18,8 @@ do_install()
mkdir -p ${DESTDIR}/usr/lib/qt/plugins \ mkdir -p ${DESTDIR}/usr/lib/qt/plugins \
${DESTDIR}/usr/bin \ ${DESTDIR}/usr/bin \
${DESTDIR}/usr/share/icons/hicolor/128x128/apps \ ${DESTDIR}/usr/share/icons/hicolor/128x128/apps \
${DESTDIR}/usr/share/applications ${DESTDIR}/usr/share/applications \
${DESTDIR}/usr/share/qt/translations
mv ${SRCPKGDESTDIR}/usr/bin/designer ${DESTDIR}/usr/bin || return 1 mv ${SRCPKGDESTDIR}/usr/bin/designer ${DESTDIR}/usr/bin || return 1
mv ${SRCPKGDESTDIR}/usr/lib/libQtDesigner.so.* \ mv ${SRCPKGDESTDIR}/usr/lib/libQtDesigner.so.* \
@ -32,4 +33,6 @@ do_install()
mkdir -p ${DESTDIR}/${d} || return 1 mkdir -p ${DESTDIR}/${d} || return 1
mv ${SRCPKGDESTDIR}/${d}/designer.* ${DESTDIR}/${d} || return 1 mv ${SRCPKGDESTDIR}/${d}/designer.* ${DESTDIR}/${d} || return 1
done done
mv ${SRCPKGDESTDIR}/usr/share/qt/translations/designer* \
${DESTDIR}/usr/share/qt/translations || return 1
} }

View file

@ -13,9 +13,9 @@ Add_dependency run qt
do_install() do_install()
{ {
mkdir -p ${DESTDIR}/usr/share/qt/translations ${DESTDIR}/usr/bin mkdir -p ${DESTDIR}/usr/bin
for f in assistant* lconvert linguist pixeltool qcollectiongenerator \ for f in assistant* lconvert linguist pixeltool qcollectiongenerator \
qdbusviewer qhelp* xmlpatterns qdbus; do qdbusviewer qhelp* xmlpatterns* qdbus qttrace*; do
mv ${SRCPKGDESTDIR}/usr/bin/${f} ${DESTDIR}/usr/bin || return 1 mv ${SRCPKGDESTDIR}/usr/bin/${f} ${DESTDIR}/usr/bin || return 1
done done
mkdir -p ${DESTDIR}/usr/lib mkdir -p ${DESTDIR}/usr/lib
@ -31,10 +31,10 @@ do_install()
[ ! -f ${SRCPKGDESTDIR}/usr/share/pixmaps/${f}.png ] && continue [ ! -f ${SRCPKGDESTDIR}/usr/share/pixmaps/${f}.png ] && continue
mv ${SRCPKGDESTDIR}/usr/share/pixmaps/${f}.png \ mv ${SRCPKGDESTDIR}/usr/share/pixmaps/${f}.png \
${DESTDIR}/usr/share/pixmaps || return 1 ${DESTDIR}/usr/share/pixmaps || return 1
mv ${SRCPKGDESTDIR}/usr/share/qt/translations/${f}* \
${DESTDIR}/usr/share/qt/translations || return 1
done done
mv ${SRCPKGDESTDIR}/usr/share/qt/translations \
${DESTDIR}/usr/share/qt || return 1
mv ${SRCPKGDESTDIR}/usr/share/qt/phrasebooks \ mv ${SRCPKGDESTDIR}/usr/share/qt/phrasebooks \
${DESTDIR}/usr/share/qt || return 1 ${DESTDIR}/usr/share/qt || return 1
} }

View file

@ -14,10 +14,14 @@ Add_dependency run qt
do_install() do_install()
{ {
mkdir -p ${DESTDIR}/usr/bin ${DESTDIR}/usr/share/applications mkdir -p ${DESTDIR}/usr/bin \
${DESTDIR}/usr/share/applications \
${DESTDIR}/usr/share/qt/translations
mv ${SRCPKGDESTDIR}/usr/bin/qtconfig \ mv ${SRCPKGDESTDIR}/usr/bin/qtconfig \
${DESTDIR}/usr/bin || return 1 ${DESTDIR}/usr/bin || return 1
mv ${SRCPKGDESTDIR}/usr/share/applications/qtconfig.desktop \ mv ${SRCPKGDESTDIR}/usr/share/applications/qtconfig.desktop \
${DESTDIRR}/usr/share/applications || return 1 ${DESTDIR}/usr/share/applications || return 1
mv ${SRCPKGDESTDIR}/usr/share/qt/translations/qtconfig* \
${DESTDIR}/usr/share/qt/translations
} }

View file

@ -1,7 +1,7 @@
# Template file for 'qt' # Template file for 'qt'
pkgname=qt pkgname=qt
version=4.5.3 version=4.6.0
_distname=qt-x11-opensource-src _distname=qt-everywhere-opensource-src
wrksrc=${_distname}-${version} wrksrc=${_distname}-${version}
distfiles="ftp://ftp.qtsoftware.com/qt/source/${_distname}-$version.tar.gz" distfiles="ftp://ftp.qtsoftware.com/qt/source/${_distname}-$version.tar.gz"
build_style=configure build_style=configure
@ -12,14 +12,14 @@ configure_args="-confirm-license -opensource
-demosdir /usr/share/doc/qt/demos -largefile -plugin-sql-sqlite -system-sqlite -demosdir /usr/share/doc/qt/demos -largefile -plugin-sql-sqlite -system-sqlite
-xmlpatterns -phonon -phonon-backend -svg -webkit -scripttools -system-zlib -xmlpatterns -phonon -phonon-backend -svg -webkit -scripttools -system-zlib
-system-libtiff -system-libpng -system-libmng -system-libjpeg -system-libtiff -system-libpng -system-libmng -system-libjpeg
-openssl-linked -no-rpath -optimized-qmake -reduce-relocations -openssl-linked -optimized-qmake -no-rpath -reduce-relocations
-no-separate-debug-info -gtkstyle -opengl -glib -no-sql-db2 -no-sql-ibase -no-separate-debug-info -gtkstyle -opengl -glib -no-sql-db2 -no-sql-ibase
-no-sql-mysql -no-sql-oci -no-sql-odbc -no-sql-sqlite2 -no-sql-tds -no-sql-mysql -no-sql-oci -no-sql-odbc -no-sql-sqlite2 -no-sql-tds
-no-cups -dbus-linked -no-nas-sound -iconv -shared -release -fast" -no-cups -dbus-linked -no-nas-sound -iconv -shared -release -fast"
make_install_target="INSTALL_ROOT=$XBPS_DESTDIR/$pkgname-$version install" make_install_target="INSTALL_ROOT=$XBPS_DESTDIR/$pkgname-$version install"
short_desc="A cross-platform application and UI framework" short_desc="A cross-platform application and UI framework"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
checksum=0c87fc42825d3556970db4412257c6874e716ac3bc45e6f273924d5d6a089aa6 checksum=55259c813324f6383cbd441aa2f23e01c320b6d63fbe3b5d52a7715055d28589
long_desc=" long_desc="
Qt(TM) is a GUI software toolkit. Qt simplifies the task of writing and Qt(TM) is a GUI software toolkit. Qt simplifies the task of writing and
maintaining GUI (graphical user interface) applications." maintaining GUI (graphical user interface) applications."
@ -29,44 +29,21 @@ subpackages="${subpackages} qt-designer qt-devel qt-devel-tools"
# XXX Missing dependencies: unixodbc, postgresql, mysql, cups. # XXX Missing dependencies: unixodbc, postgresql, mysql, cups.
Add_dependency run glibc Add_dependency run glibc
Add_dependency run openssl
Add_dependency run dbus-libs Add_dependency run dbus-libs
Add_dependency run fontconfig
Add_dependency run freetype
Add_dependency run glib
Add_dependency run MesaLib
Add_dependency run jpeg
Add_dependency run libmng
Add_dependency run libpng
Add_dependency run tiff
Add_dependency run sqlite
Add_dependency run libxml2
Add_dependency run libICE
Add_dependency run libSM
Add_dependency run libX11
Add_dependency run libXext
Add_dependency run libXrender
Add_dependency run libstdc++
Add_dependency run zlib
Add_dependency build openssl-devel
Add_dependency build dbus-devel Add_dependency build dbus-devel
Add_dependency build fontconfig-devel _qt_deps="fontconfig freetype glib MesaLib jpeg libmng libpng tiff"
Add_dependency build freetype-devel _qt_deps="${_qt_deps} sqlite libxml2 libICE libSM libX11 libXext libXrender"
Add_dependency build glib-devel _qt_deps="${_qt_deps} zlib openssl alsa-lib"
Add_dependency build MesaLib-devel
Add_dependency build gst-plugins-base-devel for _dep_ in ${_qt_deps}; do
Add_dependency build jpeg-devel Add_dependency run ${_dep_}
Add_dependency build libmng-devel Add_dependency build ${_dep_}-devel
Add_dependency build libpng-devel done
Add_dependency build tiff-devel
Add_dependency build sqlite-devel pre_build()
Add_dependency build libxml2-devel {
Add_dependency build libICE-devel export LD_LIBRARY_PATH="${wrksrc}/lib:${LD_LIBRARY_PATH}"
Add_dependency build libSM-devel }
Add_dependency build libX11-devel
Add_dependency build libXext-devel
Add_dependency build libXrender-devel
Add_dependency build zlib-devel
post_install() post_install()
{ {