qt: rebuild against icu-54.1.

Looks like icu is loaded at runtime via dlopen(), that's why we didn't catch
this before.
This commit is contained in:
Juan RP 2014-10-29 13:50:47 +01:00
parent 604e8694d2
commit e942300342

View file

@ -1,7 +1,7 @@
# Template file for 'qt' # Template file for 'qt'
pkgname=qt pkgname=qt
version=4.8.6 version=4.8.6
revision=4 revision=5
_distname=qt-everywhere-opensource-src _distname=qt-everywhere-opensource-src
patch_args="-Np1" patch_args="-Np1"
wrksrc=${_distname}-${version} wrksrc=${_distname}-${version}
@ -18,7 +18,7 @@ hostmakedepends="pkg-config"
makedepends=" makedepends="
libressl-devel libpng-devel>=1.6 MesaLib-devel libXrender-devel unixodbc-devel libressl-devel libpng-devel>=1.6 MesaLib-devel libXrender-devel unixodbc-devel
fontconfig-devel libXi-devel libXv-devel libXinerama-devel libXrandr-devel fontconfig-devel libXi-devel libXv-devel libXinerama-devel libXrandr-devel
libXcursor-devel dbus-devel glib-devel icu-devel cups-devel libjpeg-turbo-devel libXcursor-devel dbus-devel glib-devel icu-devel>=54.1 cups-devel libjpeg-turbo-devel
sqlite-devel alsa-lib-devel tiff-devel libmng-devel libxshmfence-devel sqlite-devel alsa-lib-devel tiff-devel libmng-devel libxshmfence-devel
libSM-devel gtk+-devel libmysqlclient-devel>=5.5.27 postgresql-libs-devel libSM-devel gtk+-devel libmysqlclient-devel>=5.5.27 postgresql-libs-devel
pulseaudio-devel" pulseaudio-devel"
@ -92,7 +92,6 @@ qt-designer_package() {
vmove "usr/share/qt/translations/designer*" vmove "usr/share/qt/translations/designer*"
} }
} }
qt-devel-tools_package() { qt-devel-tools_package() {
depends="hicolor-icon-theme" depends="hicolor-icon-theme"
short_desc+=" - development tools" short_desc+=" - development tools"
@ -110,9 +109,7 @@ qt-devel-tools_package() {
vmove usr/share/qt/phrasebooks vmove usr/share/qt/phrasebooks
} }
} }
qt-devel_package() { qt-devel_package() {
lib32depends="libX11-devel>=0 icu-devel>=0"
depends="qt-qmake libX11-devel icu-devel qt>=${version}_${revision}" depends="qt-qmake libX11-devel icu-devel qt>=${version}_${revision}"
short_desc+=" - development files" short_desc+=" - development files"
pkg_install() { pkg_install() {
@ -133,28 +130,24 @@ qt-plugin-odbc_package() {
vmove usr/lib/qt/plugins/sqldrivers/libqsqlodbc.so vmove usr/lib/qt/plugins/sqldrivers/libqsqlodbc.so
} }
} }
qt-plugin-pgsql_package() { qt-plugin-pgsql_package() {
short_desc+=" - PostgreSQL plugin" short_desc+=" - PostgreSQL plugin"
pkg_install() { pkg_install() {
vmove usr/lib/qt/plugins/sqldrivers/libqsqlpsql.so vmove usr/lib/qt/plugins/sqldrivers/libqsqlpsql.so
} }
} }
qt-plugin-mysql_package() { qt-plugin-mysql_package() {
short_desc+=" - MySQL plugin" short_desc+=" - MySQL plugin"
pkg_install() { pkg_install() {
vmove usr/lib/qt/plugins/sqldrivers/libqsqlmysql.so vmove usr/lib/qt/plugins/sqldrivers/libqsqlmysql.so
} }
} }
qt-plugin-sqlite_package() { qt-plugin-sqlite_package() {
short_desc+=" - SQLite plugin" short_desc+=" - SQLite plugin"
pkg_install() { pkg_install() {
vmove usr/lib/qt/plugins/sqldrivers/libqsqlite.so vmove usr/lib/qt/plugins/sqldrivers/libqsqlite.so
} }
} }
qt-qmake_package() { qt-qmake_package() {
short_desc+=" - qmake Makefile generator tool" short_desc+=" - qmake Makefile generator tool"
pkg_install() { pkg_install() {
@ -162,7 +155,6 @@ qt-qmake_package() {
vmove usr/share/qt/mkspecs vmove usr/share/qt/mkspecs
} }
} }
qt-qtconfig_package() { qt-qtconfig_package() {
depends="hicolor-icon-theme" depends="hicolor-icon-theme"
short_desc+=" - configuration tool" short_desc+=" - configuration tool"