wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-07 15:43:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

qt5: move conflicting files into correct subpkg

Browse source 
[ci skip]
This commit is contained in:
John 2019-06-21 18:16:15 +02:00 • committed by John Zimmermann
parent 6a03f6d113
commit 16107b8ada
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
srcpkgs/qt5/template
View file

@ -1,7 +1,7 @@
# Template file for 'qt5' # Template file for 'qt5'
pkgname=qt5 pkgname=qt5
version=5.11.3 version=5.11.3
revision=7 revision=8
wrksrc="qt-everywhere-src-${version}" wrksrc="qt-everywhere-src-${version}"
build_style=gnu-configure build_style=gnu-configure
hostmakedepends="cmake clang flex git glib-devel gperf ninja pkg-config hostmakedepends="cmake clang flex git glib-devel gperf ninja pkg-config
@ -1055,7 +1055,7 @@ qt5-host-tools_package() {
if [ -f ${DESTDIR}/usr/lib/qt5/bin/${f} ]; then if [ -f ${DESTDIR}/usr/lib/qt5/bin/${f} ]; then
vmove usr/lib/qt5/bin/${f} vmove usr/lib/qt5/bin/${f}
fi fi
if [ -f ${DESTDIR}/usr/bin/${f}-qt5 ]; then if [ -f ${DESTDIR}/usr/bin/${f}-qt5 ] || [ -h ${DESTDIR}/usr/bin/${f}-qt5 ]; then
vmove usr/bin/${f}-qt5 vmove usr/bin/${f}-qt5
else else
ln -sf ../lib/qt5/bin/${f} ${PKGDESTDIR}/usr/bin/${f}-qt5 ln -sf ../lib/qt5/bin/${f} ${PKGDESTDIR}/usr/bin/${f}-qt5
@ -1104,7 +1104,7 @@ qt5-tools_package() {
mkdir -p ${dest}/usr/lib/qt5/bin mkdir -p ${dest}/usr/lib/qt5/bin
mv -v ${PKGDESTDIR}/usr/lib/qt5/bin/${f} ${dest}/usr/lib/qt5/bin/ mv -v ${PKGDESTDIR}/usr/lib/qt5/bin/${f} ${dest}/usr/lib/qt5/bin/
fi fi
if [ -f ${PKGDESTDIR}/usr/bin/${f}-qt5 ]; then if [ -f ${PKGDESTDIR}/usr/bin/${f}-qt5 ] || [ -h ${PKGDESTDIR}/usr/bin/${f}-qt5 ]; then
mkdir -p ${dest}/usr/bin mkdir -p ${dest}/usr/bin
mv -v ${PKGDESTDIR}/usr/bin/${f}-qt5 ${dest}/usr/bin/ mv -v ${PKGDESTDIR}/usr/bin/${f}-qt5 ${dest}/usr/bin/
fi fi