tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

qt: merge the qtconfig subpkg; there's no reason to split it.

Browse Source
This commit is contained in:
Juan RP
2015-01-25 13:00:06 +01:00
parent b543780190
commit be6428b524
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
srcpkgs/qt-qtconfig
View File

@@ -1 +0,0 @@
qt

16
srcpkgs/qt/template
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=10 revision=11
_distname=qt-everywhere-opensource-src _distname=qt-everywhere-opensource-src
patch_args="-Np1" patch_args="-Np1"
wrksrc=${_distname}-${version} wrksrc=${_distname}-${version}
@@ -21,7 +21,8 @@ makedepends="
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"
depends="qtchooser" depends="qtchooser hicolor-icon-theme"
replaces="qt-qtconfig>=0"
pre_configure() { pre_configure() {
sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
@@ -162,14 +163,3 @@ qt-qmake_package() {
vmove usr/share/qt/mkspecs vmove usr/share/qt/mkspecs
} }
} }
qt-qtconfig_package() {
depends="hicolor-icon-theme"
short_desc+=" - configuration tool"
pkg_install() {
vmove usr/bin/qtconfig-qt4
vmove usr/lib/qt/bin/qtconfig
vmove usr/share/applications/qtconfig.desktop
vmove usr/share/pixmaps/qtlogo.png
vmove "usr/share/qt/translations/qtconfig*"
}
}