diff --git a/srcpkgs/qt/qt-demos.template b/srcpkgs/qt/qt-demos.template index 170feb860c3..894a1a4a65a 100644 --- a/srcpkgs/qt/qt-demos.template +++ b/srcpkgs/qt/qt-demos.template @@ -24,6 +24,6 @@ do_install() mv ${SRCPKGDESTDIR}/usr/share/doc/qt/examples \ ${DESTDIR}/usr/share/doc/qt mv ${SRCPKGDESTDIR}/usr/share/icons/hicolor/64x64/apps/qtlogo.png \ - ${DESTDIR}/usr/share/icons/hicolor/64x64/apps || return 1 + ${DESTDIR}/usr/share/icons/hicolor/64x64/apps } diff --git a/srcpkgs/qt/qt-designer.template b/srcpkgs/qt/qt-designer.template index 317bd55e03e..1c3ecd097d5 100644 --- a/srcpkgs/qt/qt-designer.template +++ b/srcpkgs/qt/qt-designer.template @@ -25,18 +25,18 @@ do_install() ${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 mv ${SRCPKGDESTDIR}/usr/lib/libQtDesigner.so* \ - ${DESTDIR}/usr/lib || return 1 + ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/libQtDesignerComponents.so* \ - ${DESTDIR}/usr/lib || return 1 + ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/qt/plugins/designer \ - ${DESTDIR}/usr/lib/qt/plugins || return 1 + ${DESTDIR}/usr/lib/qt/plugins for d in /usr/share/icons/hicolor/128x128/apps \ /usr/share/applications; do - mkdir -p ${DESTDIR}/${d} || return 1 - mv ${SRCPKGDESTDIR}/${d}/designer.* ${DESTDIR}/${d} || return 1 + mkdir -p ${DESTDIR}/${d} + mv ${SRCPKGDESTDIR}/${d}/designer.* ${DESTDIR}/${d} done mv ${SRCPKGDESTDIR}/usr/share/qt/translations/designer* \ - ${DESTDIR}/usr/share/qt/translations || return 1 + ${DESTDIR}/usr/share/qt/translations } diff --git a/srcpkgs/qt/qt-devel-tools.template b/srcpkgs/qt/qt-devel-tools.template index bf5d1ebc771..7ad0319a79d 100644 --- a/srcpkgs/qt/qt-devel-tools.template +++ b/srcpkgs/qt/qt-devel-tools.template @@ -6,7 +6,6 @@ long_desc="${long_desc} This packages contains tools used to assist in Qt development, including the Qt Assistant, Linguist, D-Bus Viewer and Pixel Tool applications. " -revision=1 gtk_iconcache_dirs="/usr/share/icons/hicolor" Add_dependency run libgcc @@ -21,7 +20,7 @@ do_install() for f in assistant* lconvert linguist pixeltool qcollectiongenerator \ qdbusviewer qhelp* xmlpatterns* qdbus qttrace* qdoc3 \ qmlviewer; do - mv ${SRCPKGDESTDIR}/usr/bin/${f} ${DESTDIR}/usr/bin || return 1 + mv ${SRCPKGDESTDIR}/usr/bin/${f} ${DESTDIR}/usr/bin done mkdir -p ${DESTDIR}/usr/lib mkdir -p ${DESTDIR}/usr/share/applications @@ -29,17 +28,17 @@ do_install() mkdir -p ${DESTDIR}/usr/share/icons mv ${SRCPKGDESTDIR}/usr/share/icons/hicolor \ - ${DESTDIR}/usr/share/icons || return 1 + ${DESTDIR}/usr/share/icons for f in linguist assistant; do mv ${SRCPKGDESTDIR}/usr/share/applications/${f}.desktop \ - ${DESTDIR}/usr/share/applications || return 1 + ${DESTDIR}/usr/share/applications [ ! -f ${SRCPKGDESTDIR}/usr/share/pixmaps/${f}.png ] && continue mv ${SRCPKGDESTDIR}/usr/share/pixmaps/${f}.png \ - ${DESTDIR}/usr/share/pixmaps || return 1 + ${DESTDIR}/usr/share/pixmaps done mv ${SRCPKGDESTDIR}/usr/share/qt/translations \ - ${DESTDIR}/usr/share/qt || return 1 + ${DESTDIR}/usr/share/qt mv ${SRCPKGDESTDIR}/usr/share/qt/phrasebooks \ - ${DESTDIR}/usr/share/qt || return 1 + ${DESTDIR}/usr/share/qt } diff --git a/srcpkgs/qt/qt-devel.template b/srcpkgs/qt/qt-devel.template index 08dfd7f15ad..f0b07eed477 100644 --- a/srcpkgs/qt/qt-devel.template +++ b/srcpkgs/qt/qt-devel.template @@ -6,8 +6,6 @@ long_desc="${long_desc} This package contains the header development files and development programs used for runing Qt applications." -revision=1 - Add_dependency run libgcc Add_dependency run glibc Add_dependency run libstdc++ diff --git a/srcpkgs/qt/qt-plugin-mysql.template b/srcpkgs/qt/qt-plugin-mysql.template index 5ab6d8d7ddc..2c2ea535cce 100644 --- a/srcpkgs/qt/qt-plugin-mysql.template +++ b/srcpkgs/qt/qt-plugin-mysql.template @@ -16,5 +16,5 @@ do_install() mkdir -p ${DESTDIR}/usr/lib/qt/plugins/sqldrivers mv ${SRCPKGDESTDIR}/usr/lib/qt/plugins/sqldrivers/libqsqlmysql.so \ - ${DESTDIR}/usr/lib/qt/plugins/sqldrivers || return 1 + ${DESTDIR}/usr/lib/qt/plugins/sqldrivers } diff --git a/srcpkgs/qt/qt-plugin-pgsql.template b/srcpkgs/qt/qt-plugin-pgsql.template index 59b79a6061d..edce3974bf6 100644 --- a/srcpkgs/qt/qt-plugin-pgsql.template +++ b/srcpkgs/qt/qt-plugin-pgsql.template @@ -16,5 +16,5 @@ do_install() mkdir -p ${DESTDIR}/usr/lib/qt/plugins/sqldrivers mv ${SRCPKGDESTDIR}/usr/lib/qt/plugins/sqldrivers/libqsqlpsql.so \ - ${DESTDIR}/usr/lib/qt/plugins/sqldrivers || return 1 + ${DESTDIR}/usr/lib/qt/plugins/sqldrivers } diff --git a/srcpkgs/qt/qt-plugin-sqlite.template b/srcpkgs/qt/qt-plugin-sqlite.template index 06cca30d359..4d42d43d8ec 100644 --- a/srcpkgs/qt/qt-plugin-sqlite.template +++ b/srcpkgs/qt/qt-plugin-sqlite.template @@ -16,5 +16,5 @@ do_install() mkdir -p ${DESTDIR}/usr/lib/qt/plugins/sqldrivers mv ${SRCPKGDESTDIR}/usr/lib/qt/plugins/sqldrivers/libqsqlite.so \ - ${DESTDIR}/usr/lib/qt/plugins/sqldrivers || return 1 + ${DESTDIR}/usr/lib/qt/plugins/sqldrivers } diff --git a/srcpkgs/qt/qt-qtconfig.template b/srcpkgs/qt/qt-qtconfig.template index 2ae6a740ef6..bb733dbad81 100644 --- a/srcpkgs/qt/qt-qtconfig.template +++ b/srcpkgs/qt/qt-qtconfig.template @@ -25,11 +25,11 @@ do_install() ${DESTDIR}/usr/share/qt/translations mv ${SRCPKGDESTDIR}/usr/bin/qtconfig \ - ${DESTDIR}/usr/bin || return 1 + ${DESTDIR}/usr/bin mv ${SRCPKGDESTDIR}/usr/share/applications/qtconfig.desktop \ - ${DESTDIR}/usr/share/applications || return 1 + ${DESTDIR}/usr/share/applications mv ${SRCPKGDESTDIR}/usr/share/pixmaps/qtlogo.png \ - ${DESTDIR}/usr/share/pixmaps || return 1 + ${DESTDIR}/usr/share/pixmaps mv ${SRCPKGDESTDIR}/usr/share/qt/translations/qtconfig* \ ${DESTDIR}/usr/share/qt/translations } diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template index 4fa2df599c9..26f495f278d 100644 --- a/srcpkgs/qt/template +++ b/srcpkgs/qt/template @@ -1,13 +1,13 @@ # Template file for 'qt' pkgname=qt -version=4.7.1 +version=4.7.2 _distname=qt-everywhere-opensource-src wrksrc=${_distname}-${version} distfiles="ftp://ftp.qt.nokia.com/qt/source/${_distname}-$version.tar.gz" build_style=custom-install short_desc="A cross-platform application and UI framework" maintainer="Juan RP " -checksum=8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a +checksum=d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336 long_desc=" Qt(TM) is a GUI software toolkit. Qt simplifies the task of writing and maintaining GUI (graphical user interface) applications."