qt5: fix -devel rdeps; use qt5 prefixed bins in cmake files.
This commit is contained in:
parent
cd81523157
commit
a1ac2999ea
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'qt5'
|
||||
pkgname=qt5
|
||||
version=5.3.2
|
||||
revision=1
|
||||
revision=2
|
||||
wrksrc="qt-everywhere-opensource-src-${version}"
|
||||
homepage="http://qt-project.com/"
|
||||
short_desc="A cross-platform application and UI framework (QT5)"
|
||||
|
@ -432,6 +432,13 @@ qt5-tools-devel_package() {
|
|||
rm -r ${PKGDESTDIR}/usr/share
|
||||
rm -r ${PKGDESTDIR}/usr/lib/qt5/plugins
|
||||
rm ${PKGDESTDIR}/usr/lib/*.so.*
|
||||
# Fix cmake files to use our qt5- bins.
|
||||
sed -e 's,/bin/lrelease,/bin/qt5-lrelease,' \
|
||||
-e 's,/bin/lupdate,/bin/qt5-lupdate,' \
|
||||
-e 's,/bin/lconvert,/bin/qt5-lconvert,' \
|
||||
-i ${PKGDESTDIR}/usr/lib/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig.cmake
|
||||
sed -e 's,/bin/qcollectiongenerator,/bin/qt5-qcollectiongenerator,' \
|
||||
-i ${PKGDESTDIR}/usr/lib/cmake/Qt5Help/Qt5HelpConfigExtras.cmake
|
||||
}
|
||||
}
|
||||
qt5-tools_package() {
|
||||
|
@ -474,8 +481,10 @@ qt5-tools_package() {
|
|||
}
|
||||
qt5-devel_package() {
|
||||
depends="zlib-devel libressl-devel libXext-devel libXrender-devel
|
||||
fontconfig-devel glib-devel MesaLib-devel mtdev-devel
|
||||
dbus-devel icu-devel qt5-${version}_${revision}"
|
||||
fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
|
||||
dbus-devel icu-devel qt5-${version}_${revision}
|
||||
qt5-plugin-gtk-${version}_${revision}
|
||||
qt5-qmake-${version}_${revision}"
|
||||
short_desc+=" - development files"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
|
@ -483,6 +492,16 @@ qt5-devel_package() {
|
|||
vmove "usr/lib/*.prl"
|
||||
vmove usr/lib/pkgconfig
|
||||
vmove usr/lib/cmake
|
||||
# Fix cmake files to use our qt5- bins.
|
||||
sed -e 's,/bin/qmake,/bin/qt5-qmake,' \
|
||||
-e 's,/bin/moc,/bin/qt5-moc,' \
|
||||
-e 's,/bin/rcc,/bin/qt5-rcc,' \
|
||||
-i ${PKGDESTDIR}/usr/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake
|
||||
sed -e 's,/bin/uic,/bin/qt5-uic,' \
|
||||
-i ${PKGDESTDIR}/usr/lib/cmake/Qt5Widgets/Qt5WidgetsConfigExtras.cmake
|
||||
sed -e 's,/bin/qdbuscpp2xml,/bin/qt5-qdbuscpp2xml,' \
|
||||
-e 's,/bin/qdbusxml2cpp,/bin/qt5-qdbusxml2cpp,' \
|
||||
-i ${PKGDESTDIR}/usr/lib/cmake/Qt5DBus/Qt5DBusConfigExtras.cmake
|
||||
}
|
||||
}
|
||||
qt5-plugin-gtk_package() {
|
||||
|
|
Loading…
Reference in New Issue
Block a user