python-PyQt5-webengine: remove shadow subpackage

Addresses problem noted here:

https://github.com/void-linux/void-packages/pull/13073#issuecomment-514768289

Also cleanup some xlint warnings
This commit is contained in:
Peter Bui 2019-07-24 16:35:48 -04:00 committed by Helmut Pozimski
parent ae0ce81a3b
commit d1a3133580

View file

@ -1,8 +1,7 @@
# Template file for 'python-PyQt5'
# Template file for 'python-PyQt5-webengine'
pkgname=python-PyQt5-webengine
version=5.13.0
revision=1
lib32disabled=yes
wrksrc="PyQtWebEngine_gpl-${version}"
pycompile_module="PyQt5WebEngine"
hostmakedepends="pkg-config qt5-qmake
@ -10,20 +9,20 @@ hostmakedepends="pkg-config qt5-qmake
python-devel python3-devel python-PyQt5-devel
qt5-webengine-devel"
makedepends="${hostmakedepends/pkg-config/}"
depends="python-PyQt5"
depends="python-PyQt5-${version}_${revision} python-PyQt5-webchannel-${version}_${revision}"
short_desc="Python2 bindings for the Qt5 toolkit - webengine module"
maintainer="Alessio Sergi <al3hex@gmail.com>"
homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
license="GPL-3.0-only"
homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
distfiles="https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/${version}/PyQtWebEngine_gpl-${version}.tar.gz"
checksum=bb6cabcc454ed1394aedfb42eb35dbee3ca324cf582e8c0ca5e8c8af0b00e325
lib32disabled=yes
case "$XBPS_TARGET_MACHINE" in
arm*) broken="depends on qt5-webengine";;
aarch64*) broken="https://build.voidlinux.org/builders/aarch64_builder/builds/20955/steps/shell_3/logs/stdio";;
esac
pre_build() {
mkdir -p pyqt5-${py2_ver}
mv * pyqt5-${py2_ver} || true
@ -31,6 +30,7 @@ pre_build() {
rm -rf pyqt5-${py2_ver}/pyuic/uic/port_v3
rm -rf pyqt5-${py3_ver}/pyuic/uic/port_v2
}
do_build() {
local _sysroot= _configuration= py_abiver= qt_version
for pyver in $py2_ver $py3_ver; do
@ -50,7 +50,7 @@ pyqt_disabled_features = PyQt_Desktop_OpenGL PyQt_qreal_double
qt_shared = True
[Qt ${qt_version}]
pyqt_modules = QtWebEngine QtWebEngineCore QtWebEngineWidgets
pyqt_modules = QtWebEngine QtWebEngineCore QtWebEngineWidgets
EOF
_sysroot="--sysroot $XBPS_CROSS_BASE"
@ -63,23 +63,18 @@ EOF
make ${makejobs}
done
}
do_install() {
# install python-pyqt5
make -C pyqt5-${py2_ver} DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
# install python3-pyqt5
make -C pyqt5-${py3_ver} DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
# remove unneeded shared files
rm -rf ${DESTDIR}/usr/share
}
python-PyQt5-webengine_package() {
lib32disabled=yes
depends="${sourcepkg}-${version}_${revision}
python-PyQt5-webchannel-${version}_${revision}"
pkg_install() {
vmove ${py2_sitelib}/PyQt5/QtWebEngine.so
vmove ${py2_sitelib}/PyQt5/QtWebEngineCore.so
vmove ${py2_sitelib}/PyQt5/QtWebEngineWidgets.so
}
}
python3-PyQt5-webengine_package() {
lib32disabled=yes
depends="python3-PyQt5-${version}_${revision}