diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-04-16 07:14:09 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-04-16 07:14:09 +0000 |
| commit | a3faaee51fa5663d08c3d57c4011ecb3f2b2fff3 (patch) | |
| tree | 08efb29a06aa649149ad03c7745f546b1c572e7d /main | |
| parent | faf8eec13460c1cb49fa837122d1efa75cb6757c (diff) | |
| download | aports-a3faaee51fa5663d08c3d57c4011ecb3f2b2fff3.tar.bz2 aports-a3faaee51fa5663d08c3d57c4011ecb3f2b2fff3.tar.xz | |
main/qt: fix circular dependency
qmlplugindump(qt) -> so:libQtDeclarative.so.4(qt-x11) -> qt
we move qmlplugindump to qt-x11
Diffstat (limited to 'main')
| -rw-r--r-- | main/qt/APKBUILD | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/main/qt/APKBUILD b/main/qt/APKBUILD index a8d67d8d28..c5cb0f29db 100644 --- a/main/qt/APKBUILD +++ b/main/qt/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt pkgver=4.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform application and UI framework" url="http://qt.nokia.com/" arch="all" @@ -213,6 +213,7 @@ tds() { webkit() { + pkgdesc="Qt Webkit libraries" mkdir -p "$subpkgdir"/usr/lib/qt/imports mv "$pkgdir"/usr/lib/libQtWebKit.so.* \ "$subpkgdir"/usr/lib/ || return 1 @@ -223,10 +224,12 @@ webkit() { x11() { pkgdesc="Qt GUI-related libraries" depends="hicolor-icon-theme" + replaces="qt" cd "$pkgdir" _mv_files \ usr/bin/qdbusviewer \ usr/bin/qmlviewer \ + usr/bin/qmlplugindump \ usr/lib/libQt3Support.so.* \ usr/lib/libQtCLucene.so.* \ usr/lib/libQtDesigner.so.* \ |