diff --git a/common/shlibs b/common/shlibs index cfe030ffe6..ac13f39150 100644 --- a/common/shlibs +++ b/common/shlibs @@ -453,8 +453,8 @@ libQtHelp.so.4 qt-4.5.3_1 libQtCore.so.4 qt-4.5.3_1 libQtSql.so.4 qt-4.5.3_1 libQtDeclarative.so.4 qt-4.5.3_1 -libQtDesignerComponents.so.4 qt-designer-4.5.3_1 -libQtDesigner.so.4 qt-designer-4.5.3_1 +libQtDesignerComponents.so.4 qt-designer-libs-4.7.8_13 +libQtDesigner.so.4 qt-designer-libs-4.7.8_13 libQtWebKit.so.4 qt-webkit-2.3.4_1 libsysfs.so.2 libsysfs-2.1.0_1 libsensors.so.4 libsensors-3.1.1_1 diff --git a/srcpkgs/qt-designer-devel b/srcpkgs/qt-designer-devel new file mode 120000 index 0000000000..382f738416 --- /dev/null +++ b/srcpkgs/qt-designer-devel @@ -0,0 +1 @@ +qt \ No newline at end of file diff --git a/srcpkgs/qt-designer-libs b/srcpkgs/qt-designer-libs new file mode 120000 index 0000000000..382f738416 --- /dev/null +++ b/srcpkgs/qt-designer-libs @@ -0,0 +1 @@ +qt \ No newline at end of file diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template index e0845cc67c..db940b71c3 100644 --- a/srcpkgs/qt/template +++ b/srcpkgs/qt/template @@ -1,7 +1,7 @@ # Template file for 'qt' pkgname=qt version=4.8.7 -revision=12 +revision=13 _distname=qt-everywhere-opensource-src patch_args="-Np1" wrksrc=${_distname}-${version} @@ -134,19 +134,33 @@ qt-doc_package() { } } qt-designer_package() { - depends="hicolor-icon-theme" + depends="hicolor-icon-theme qt-designer-libs>=${version}_${revision}" short_desc+=" - GUI designer" pkg_install() { vmove usr/bin/designer-qt4 vmove usr/lib/qt/bin/designer - vmove "usr/lib/libQtDesigner.so*" - vmove "usr/lib/libQtDesignerComponents.so*" vmove usr/lib/qt/plugins/designer vmove "usr/share/icons/hicolor/128x128/apps/designer.*" vmove "usr/share/applications/designer.*" vmove "usr/share/qt/translations/designer*" } } +qt-designer-libs_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - GUI designer libraries" + pkg_install() { + vmove usr/lib/libQtDesigner.so.* + vmove usr/lib/libQtDesignerComponents.so.* + } +} +qt-designer-devel_package() { + depends="qt-designer-libs>=${version}_${revision}" + short_desc+=" - GUI designer development" + pkg_install() { + vmove usr/lib/libQtDesigner.so + vmove usr/lib/libQtDesignerComponents.so + } +} qt-devel-tools_package() { depends="hicolor-icon-theme" short_desc+=" - development tools"