qt5: resolve file conflicts with qt.
This commit is contained in:
parent
15e6481300
commit
2a09174c16
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'qt5'
|
# Template file for 'qt5'
|
||||||
pkgname=qt5
|
pkgname=qt5
|
||||||
version=5.3.2
|
version=5.3.2
|
||||||
revision=2
|
revision=3
|
||||||
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)"
|
||||||
|
@ -106,6 +106,8 @@ qt5-declarative_package() {
|
||||||
rm ${PKGDESTDIR}/usr/lib/*.a
|
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
|
||||||
|
# Rename conflicting file
|
||||||
|
mv ${PKGDESTDIR}/usr/bin/{qmlplugindump,qt5-qmlplugindump}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
qt5-enginio-devel_package() {
|
qt5-enginio-devel_package() {
|
||||||
|
@ -218,6 +220,8 @@ qt5-quick1_package() {
|
||||||
rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs
|
rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs
|
||||||
rm ${PKGDESTDIR}/usr/lib/*.so
|
rm ${PKGDESTDIR}/usr/lib/*.so
|
||||||
rm ${PKGDESTDIR}/usr/lib/*.prl
|
rm ${PKGDESTDIR}/usr/lib/*.prl
|
||||||
|
# Rename conflicting file
|
||||||
|
mv ${PKGDESTDIR}/usr/bin/{qmlviewer,qt5-qmlviewer}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
qt5-quickcontrols_package() {
|
qt5-quickcontrols_package() {
|
||||||
|
|
Loading…
Reference in New Issue