diff --git a/srcpkgs/qt/files/gstreamer-logo.png b/srcpkgs/qt/files/gstreamer-logo.png deleted file mode 100644 index 0994c819fa..0000000000 Binary files a/srcpkgs/qt/files/gstreamer-logo.png and /dev/null differ diff --git a/srcpkgs/qt/qt-devel-tools.template b/srcpkgs/qt/qt-devel-tools.template index a32dfd540e..bf5d1ebc77 100644 --- a/srcpkgs/qt/qt-devel-tools.template +++ b/srcpkgs/qt/qt-devel-tools.template @@ -6,6 +6,7 @@ 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 diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template index b3012da0f6..4fa2df599c 100644 --- a/srcpkgs/qt/template +++ b/srcpkgs/qt/template @@ -89,36 +89,33 @@ do_build() -plugin-sql-mysql -plugin-sql-psql -no-sql-oci \ -no-sql-odbc -no-sql-sqlite2 \ -no-cups -dbus-linked -no-nas-sound -iconv -shared \ - -release -fast -no-sql-tds || return 1 + -release -fast -no-sql-tds - make ${makejobs} || return 1 + make ${makejobs} } do_install() { local hicolordir=${DESTDIR}/usr/share/icons/hicolor - cd ${wrksrc} || return 1 - make INSTALL_ROOT=${DESTDIR} install || return 1 + cd ${wrksrc} + make INSTALL_ROOT=${DESTDIR} install # install missing icons and desktop files for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do size=$(echo $(basename ${icon}) | cut -d- -f2) install -D -m644 ${icon} \ - ${hicolordir}/${size}x${size}/apps/linguist.png \ - || return 1 + ${hicolordir}/${size}x${size}/apps/linguist.png done install -D -m644 src/gui/dialogs/images/qtlogo-64.png \ - ${hicolordir}/64x64/apps/qtlogo.png || return 1 + ${hicolordir}/64x64/apps/qtlogo.png install -D -m644 src/gui/dialogs/images/qtlogo-64.png \ - ${DESTDIR}/usr/share/pixmaps/qtlogo.png || return 1 + ${DESTDIR}/usr/share/pixmaps/qtlogo.png install -D -m644 tools/assistant/tools/assistant/images/assistant.png \ - ${hicolordir}/32x32/apps/assistant.png || return 1 + ${hicolordir}/32x32/apps/assistant.png install -D -m644 tools/designer/src/designer/images/designer.png \ - ${hicolordir}/128x128/apps/designer.png || return 1 - install -D -m644 ${FILESDIR}/gstreamer-logo.png \ - ${hicolordir}/128x128/apps/phonon-gstreamer.png || return 1 + ${hicolordir}/128x128/apps/designer.png install -d ${DESTDIR}/usr/share/applications install -m644 ${FILESDIR}/*.desktop \ - ${DESTDIR}/usr/share/applications || return 1 + ${DESTDIR}/usr/share/applications }