From c17736c6df6954699594fa1b212f95f4cc01f7cd Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 12 Jan 2010 11:33:17 +0100 Subject: [PATCH] qt: sanitize deps, fix qtconfig .desktop and its logo, bumprev. --HG-- extra : convert_revision : 4093193e90730d69465e50689299761cef36206b --- srcpkgs/qt/files/qtconfig.desktop | 2 +- srcpkgs/qt/qt-demos.template | 7 ++++ srcpkgs/qt/qt-designer.template | 7 ++++ srcpkgs/qt/qt-devel-tools.template | 7 ++++ srcpkgs/qt/qt-plugin-gstreamer.template | 11 +++++- srcpkgs/qt/qt-qmake.template | 3 ++ srcpkgs/qt/qt-qtconfig.template | 17 +++++++++ srcpkgs/qt/template | 50 +++++++++++++++++++++---- 8 files changed, 94 insertions(+), 10 deletions(-) diff --git a/srcpkgs/qt/files/qtconfig.desktop b/srcpkgs/qt/files/qtconfig.desktop index 7c221e5f88..422e50d700 100644 --- a/srcpkgs/qt/files/qtconfig.desktop +++ b/srcpkgs/qt/files/qtconfig.desktop @@ -2,7 +2,7 @@ Name=Qt Config Comment=Configure Qt behavior, styles, fonts Exec=/usr/bin/qtconfig -Icon=qtlogo +Icon=qtlogo.png Terminal=false Type=Application Categories=Qt;Settings; diff --git a/srcpkgs/qt/qt-demos.template b/srcpkgs/qt/qt-demos.template index f5b9fdbf00..ad22e97282 100644 --- a/srcpkgs/qt/qt-demos.template +++ b/srcpkgs/qt/qt-demos.template @@ -7,6 +7,13 @@ long_desc="${long_desc} gtk_iconcache_dirs="/usr/share/icons/hicolor" +revision=1 + +Add_dependency run glibc +Add_dependency run libstdc++ +Add_dependency run libgcc +Add_dependency run sqlite +Add_dependency run MesaLib Add_dependency run hicolor-icon-theme Add_dependency run qt-docs Add_dependency run qt diff --git a/srcpkgs/qt/qt-designer.template b/srcpkgs/qt/qt-designer.template index 280e66f9b8..683e0c496d 100644 --- a/srcpkgs/qt/qt-designer.template +++ b/srcpkgs/qt/qt-designer.template @@ -8,7 +8,14 @@ long_desc="${long_desc} gtk_iconcache_dirs="/usr/share/icons/hicolor" +revision=1 + # XXX Add missing gst-plugins-good dependency. +Add_dependency run glibc +Add_dependency run libstdc++ +Add_dependency run libgcc +Add_dependency run MesaLib +Add_dependency run sqlite Add_dependency run hicolor-icon-theme Add_dependency run qt-plugin-gstreamer Add_dependency run qt diff --git a/srcpkgs/qt/qt-devel-tools.template b/srcpkgs/qt/qt-devel-tools.template index 7842648cea..81a343da52 100644 --- a/srcpkgs/qt/qt-devel-tools.template +++ b/srcpkgs/qt/qt-devel-tools.template @@ -8,6 +8,13 @@ long_desc="${long_desc} gtk_iconcache_dirs="/usr/share/icons/hicolor" +revision=1 + +Add_dependency run glibc +Add_dependency run libstdc++ +Add_dependency run libgcc +Add_dependency run zlib +Add_dependency run sqlite Add_dependency run hicolor-icon-theme Add_dependency run qt diff --git a/srcpkgs/qt/qt-plugin-gstreamer.template b/srcpkgs/qt/qt-plugin-gstreamer.template index 60d85428b9..ea1a9e6384 100644 --- a/srcpkgs/qt/qt-plugin-gstreamer.template +++ b/srcpkgs/qt/qt-plugin-gstreamer.template @@ -7,8 +7,17 @@ long_desc="${long_desc} gtk_iconcache_dirs="/usr/share/icons/hicolor" -Add_dependency run hicolor-icon-theme +revision=1 + +Add_dependency run glibc +Add_dependency run libstdc++ +Add_dependency run libgcc +Add_dependency run glib +Add_dependency run libxml2 +Add_dependency run MesaLib +Add_dependency run gstreamer Add_dependency run gst-plugins-base +Add_dependency run hicolor-icon-theme Add_dependency run qt do_install() diff --git a/srcpkgs/qt/qt-qmake.template b/srcpkgs/qt/qt-qmake.template index cb007a076d..1a41440d1c 100644 --- a/srcpkgs/qt/qt-qmake.template +++ b/srcpkgs/qt/qt-qmake.template @@ -14,7 +14,10 @@ long_desc="${long_desc} This package contains also these platform specifications." +revision=1 + Add_dependency run glibc +Add_dependency run libgcc Add_dependency run libstdc++ do_install() diff --git a/srcpkgs/qt/qt-qtconfig.template b/srcpkgs/qt/qt-qtconfig.template index 97f50a944d..92476f82c0 100644 --- a/srcpkgs/qt/qt-qtconfig.template +++ b/srcpkgs/qt/qt-qtconfig.template @@ -6,8 +6,22 @@ long_desc="${long_desc} The Qt Configuration program allows end users to configure the look and behavior of any Qt application." +revision=1 + gtk_iconcache_dirs="/usr/share/icons/hicolor" +Add_dependency run glibc +Add_dependency run libstdc++ +Add_dependency run libgcc +Add_dependency run gstreamer +Add_dependency run glib +Add_dependency run libxml2 +Add_dependency run gst-plugins-base +Add_dependency run libXrender +Add_dependency run fontconfig +Add_dependency run freetype +Add_dependency run libXext +Add_dependency run libX11 Add_dependency run hicolor-icon-theme Add_dependency run qt-plugin-gstreamer Add_dependency run qt @@ -15,6 +29,7 @@ Add_dependency run qt do_install() { mkdir -p ${DESTDIR}/usr/bin \ + ${DESTDIR}/usr/share/pixmaps \ ${DESTDIR}/usr/share/applications \ ${DESTDIR}/usr/share/qt/translations @@ -22,6 +37,8 @@ do_install() ${DESTDIR}/usr/bin || return 1 mv ${SRCPKGDESTDIR}/usr/share/applications/qtconfig.desktop \ ${DESTDIR}/usr/share/applications || return 1 + mv ${SRCPKGDESTDIR}/usr/share/pixmaps/qtlogo.png \ + ${DESTDIR}/usr/share/pixmaps || return 1 mv ${SRCPKGDESTDIR}/usr/share/qt/translations/qtconfig* \ ${DESTDIR}/usr/share/qt/translations } diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template index 646708f7ed..a9a063edd8 100644 --- a/srcpkgs/qt/template +++ b/srcpkgs/qt/template @@ -1,6 +1,7 @@ # Template file for 'qt' pkgname=qt version=4.6.0 +revision=1 _distname=qt-everywhere-opensource-src wrksrc=${_distname}-${version} distfiles="ftp://ftp.qtsoftware.com/qt/source/${_distname}-$version.tar.gz" @@ -29,16 +30,47 @@ subpackages="${subpackages} qt-designer qt-devel qt-devel-tools" # XXX Missing dependencies: unixodbc, postgresql, mysql, cups. Add_dependency run glibc +Add_dependency run freetype +Add_dependency run MesaLib +Add_dependency run libXrender +Add_dependency run fontconfig +Add_dependency run libXext +Add_dependency run libX11 +Add_dependency run libstdc++ +Add_dependency run libgcc +Add_dependency run zlib Add_dependency run dbus-libs +Add_dependency run glib +Add_dependency run sqlite +Add_dependency run alsa-lib +Add_dependency run openssl +Add_dependency run tiff +Add_dependency run libmng +Add_dependency run jpeg +Add_dependency run libpng +Add_dependency run libSM +Add_dependency run libICE +Add_dependency build pkg-config +Add_dependency build glibc-devel +Add_dependency build freetype-devel +Add_dependency build MesaLib-devel +Add_dependency build libXrender-devel +Add_dependency build fontconfig-devel +Add_dependency build libXext-devel +Add_dependency build libX11-devel +Add_dependency build libstdc++-devel +Add_dependency build zlib-devel Add_dependency build dbus-devel -_qt_deps="fontconfig freetype glib MesaLib jpeg libmng libpng tiff" -_qt_deps="${_qt_deps} sqlite libxml2 libICE libSM libX11 libXext libXrender" -_qt_deps="${_qt_deps} zlib openssl alsa-lib" - -for _dep_ in ${_qt_deps}; do - Add_dependency run ${_dep_} - Add_dependency build ${_dep_}-devel -done +Add_dependency build glib-devel +Add_dependency build sqlite-devel +Add_dependency build alsa-lib-devel +Add_dependency build openssl-devel +Add_dependency build tiff-devel +Add_dependency build libmng-devel +Add_dependency build jpeg-devel +Add_dependency build libpng-devel +Add_dependency build libSM-devel +Add_dependency build libICE-devel pre_build() { @@ -59,6 +91,8 @@ post_install() done install -D -m644 src/gui/dialogs/images/qtlogo-64.png \ ${hicolordir}/64x64/apps/qtlogo.png || return 1 + install -D -m644 src/gui/dialogs/images/qtlogo-64.png \ + ${DESTDIR}/usr/share/pixmaps/qtlogo.png || return 1 install -D -m644 tools/assistant/tools/assistant/images/assistant.png \ ${hicolordir}/32x32/apps/assistant.png || return 1 install -D -m644 tools/designer/src/designer/images/designer.png \