jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

qt5: resolve file conflicts detected by xclash.

Browse source
This commit is contained in:
Juan RP 2015-02-23 12:06:52 +01:00
parent beea0e0875
commit a81f38c7e6
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
srcpkgs/qt5/template
View file

@ -1,7 +1,7 @@
# Template file for 'qt5' # Template file for 'qt5'
pkgname=qt5 pkgname=qt5
version=5.4.0 version=5.4.0
revision=3 revision=4
wrksrc="qt-everywhere-opensource-src-${version}" wrksrc="qt-everywhere-opensource-src-${version}"
homepage="http://qt-project.com/" homepage="http://qt-project.com/"
short_desc="A cross-platform application and UI framework (QT5)" short_desc="A cross-platform application and UI framework (QT5)"
@ -73,6 +73,7 @@ qt5-connectivity_package() {
pkg_install() { pkg_install() {
cd ${wrksrc}/qtconnectivity cd ${wrksrc}/qtconnectivity
make INSTALL_ROOT=${PKGDESTDIR} install make INSTALL_ROOT=${PKGDESTDIR} install
rm -r ${PKGDESTDIR}/usr/bin
rm -r ${PKGDESTDIR}/usr/include rm -r ${PKGDESTDIR}/usr/include
rm -r ${PKGDESTDIR}/usr/lib/cmake rm -r ${PKGDESTDIR}/usr/lib/cmake
rm -r ${PKGDESTDIR}/usr/lib/pkgconfig rm -r ${PKGDESTDIR}/usr/lib/pkgconfig
@ -322,6 +323,7 @@ qt5-wayland_package() {
pkg_install() { pkg_install() {
cd ${wrksrc}/qtwayland cd ${wrksrc}/qtwayland
make INSTALL_ROOT=${PKGDESTDIR} install make INSTALL_ROOT=${PKGDESTDIR} install
rm -r ${PKGDESTDIR}/usr/bin
rm -r ${PKGDESTDIR}/usr/include rm -r ${PKGDESTDIR}/usr/include
rm -r ${PKGDESTDIR}/usr/lib/cmake rm -r ${PKGDESTDIR}/usr/lib/cmake
rm -r ${PKGDESTDIR}/usr/lib/pkgconfig rm -r ${PKGDESTDIR}/usr/lib/pkgconfig
@ -510,6 +512,7 @@ qt5-tools_package() {
rm -r ${PKGDESTDIR}/usr/lib/cmake rm -r ${PKGDESTDIR}/usr/lib/cmake
rm -r ${PKGDESTDIR}/usr/lib/pkgconfig rm -r ${PKGDESTDIR}/usr/lib/pkgconfig
rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs
rm ${PKGDESTDIR}/usr/lib/*.a
rm ${PKGDESTDIR}/usr/lib/*.so rm ${PKGDESTDIR}/usr/lib/*.so
rm ${PKGDESTDIR}/usr/lib/*.prl rm ${PKGDESTDIR}/usr/lib/*.prl
# install missing icons and desktop files # install missing icons and desktop files