From 9d3014e380a88821df71699de98defca15c580e0 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 29 Oct 2010 10:04:49 +0200 Subject: [PATCH] qt: update to 4.7.0. --- srcpkgs/qt/qt-demos.template | 3 +-- srcpkgs/qt/qt-designer.template | 3 +-- srcpkgs/qt/qt-devel-tools.template | 4 +--- srcpkgs/qt/qt-plugin-gstreamer.template | 3 +-- srcpkgs/qt/qt-plugin-mysql.template | 4 +--- srcpkgs/qt/qt-plugin-pgsql.template | 3 +-- srcpkgs/qt/qt-qmake.template | 2 +- srcpkgs/qt/qt-qtconfig.template | 11 ++--------- srcpkgs/qt/template | 9 +++++---- 9 files changed, 14 insertions(+), 28 deletions(-) diff --git a/srcpkgs/qt/qt-demos.template b/srcpkgs/qt/qt-demos.template index df47963678..170feb860c 100644 --- a/srcpkgs/qt/qt-demos.template +++ b/srcpkgs/qt/qt-demos.template @@ -7,10 +7,9 @@ long_desc="${long_desc} gtk_iconcache_dirs="/usr/share/icons/hicolor" +Add_dependency run libgcc 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 diff --git a/srcpkgs/qt/qt-designer.template b/srcpkgs/qt/qt-designer.template index c33037e950..317bd55e03 100644 --- a/srcpkgs/qt/qt-designer.template +++ b/srcpkgs/qt/qt-designer.template @@ -8,11 +8,10 @@ long_desc="${long_desc} gtk_iconcache_dirs="/usr/share/icons/hicolor" +Add_dependency run libgcc 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 gst-plugins-good diff --git a/srcpkgs/qt/qt-devel-tools.template b/srcpkgs/qt/qt-devel-tools.template index d2f76c0967..f5512241dc 100644 --- a/srcpkgs/qt/qt-devel-tools.template +++ b/srcpkgs/qt/qt-devel-tools.template @@ -8,11 +8,9 @@ long_desc="${long_desc} gtk_iconcache_dirs="/usr/share/icons/hicolor" +Add_dependency run libgcc 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 6c80642e86..26a68b8894 100644 --- a/srcpkgs/qt/qt-plugin-gstreamer.template +++ b/srcpkgs/qt/qt-plugin-gstreamer.template @@ -7,11 +7,10 @@ long_desc="${long_desc} gtk_iconcache_dirs="/usr/share/icons/hicolor" +Add_dependency run libgcc 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 diff --git a/srcpkgs/qt/qt-plugin-mysql.template b/srcpkgs/qt/qt-plugin-mysql.template index ed8602324c..5ab6d8d7dd 100644 --- a/srcpkgs/qt/qt-plugin-mysql.template +++ b/srcpkgs/qt/qt-plugin-mysql.template @@ -5,12 +5,10 @@ long_desc="${long_desc} This package contains a Qt SQL plugin for MySQL." +Add_dependency run libgcc Add_dependency run glibc Add_dependency run libstdc++ -Add_dependency run libgcc Add_dependency run libmysqlclient -Add_dependency run openssl -Add_dependency run zlib Add_dependency run qt do_install() diff --git a/srcpkgs/qt/qt-plugin-pgsql.template b/srcpkgs/qt/qt-plugin-pgsql.template index cd11d4956d..59b79a6061 100644 --- a/srcpkgs/qt/qt-plugin-pgsql.template +++ b/srcpkgs/qt/qt-plugin-pgsql.template @@ -5,11 +5,10 @@ long_desc="${long_desc} This package contains a Qt SQL plugin for PostgreSQL." +Add_dependency run libgcc Add_dependency run glibc Add_dependency run libstdc++ -Add_dependency run libgcc Add_dependency run postgresql-libs -Add_dependency run openssl Add_dependency run qt do_install() diff --git a/srcpkgs/qt/qt-qmake.template b/srcpkgs/qt/qt-qmake.template index 74b63208a0..a5f0c3d23f 100644 --- a/srcpkgs/qt/qt-qmake.template +++ b/srcpkgs/qt/qt-qmake.template @@ -14,8 +14,8 @@ long_desc="${long_desc} This package contains also these platform specifications." -Add_dependency run glibc Add_dependency run libgcc +Add_dependency run glibc Add_dependency run libstdc++ do_install() diff --git a/srcpkgs/qt/qt-qtconfig.template b/srcpkgs/qt/qt-qtconfig.template index 4683525863..2ae6a740ef 100644 --- a/srcpkgs/qt/qt-qtconfig.template +++ b/srcpkgs/qt/qt-qtconfig.template @@ -8,18 +8,11 @@ long_desc="${long_desc} gtk_iconcache_dirs="/usr/share/icons/hicolor" +Add_dependency run libgcc 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 gstreamer Add_dependency run hicolor-icon-theme Add_dependency run qt-plugin-gstreamer Add_dependency run qt diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template index 458cb78121..41a67856d9 100644 --- a/srcpkgs/qt/template +++ b/srcpkgs/qt/template @@ -1,6 +1,6 @@ # Template file for 'qt' pkgname=qt -version=4.6.3 +version=4.7.0 _distname=qt-everywhere-opensource-src wrksrc=${_distname}-${version} distfiles="ftp://ftp.qt.nokia.com/qt/source/${_distname}-$version.tar.gz" @@ -19,7 +19,7 @@ configure_args="-confirm-license -opensource make_install_target="INSTALL_ROOT=$XBPS_DESTDIR/$pkgname-$version install" short_desc="A cross-platform application and UI framework" maintainer="Juan RP " -checksum=f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768 +checksum=e05256d560ca7d674cd4310bb791748900ad14ad662cbfe22b6d72ada43e7955 long_desc=" Qt(TM) is a GUI software toolkit. Qt simplifies the task of writing and maintaining GUI (graphical user interface) applications." @@ -29,15 +29,15 @@ subpackages="${subpackages} qt-demos qt-docs qt-qmake qt-qtconfig" subpackages="${subpackages} qt-designer qt-devel qt-devel-tools" # XXX Missing dependencies: unixodbc and cups. +Add_dependency run libgcc Add_dependency run glibc +Add_dependency run libstdc++ 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 @@ -50,6 +50,7 @@ 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