Revert "python3-PyQt5-webengine: update to 5.15.0"
This reverts commit 362efd78ef
.
Revert all PyQt5 update.
It built fine in my machine and Travis but not in buildbot.
This commit is contained in:
parent
661211e4d5
commit
21de584e92
4 changed files with 44 additions and 59 deletions
|
@ -1,14 +1,14 @@
|
|||
# Template file for 'python-PyQt5-webengine'
|
||||
pkgname=python-PyQt5-webengine
|
||||
version=5.13.2
|
||||
revision=6
|
||||
revision=5
|
||||
wrksrc="PyQtWebEngine-${version}"
|
||||
hostmakedepends="pkg-config qt5-qmake python python-PyQt5"
|
||||
hostmakedepends="pkg-config qt5-qmake python python-PyQt5 python3-PyQt5"
|
||||
makedepends="qt5-declarative-devel qt5-webchannel-devel qt5-location-devel
|
||||
qt5-webengine-devel python-devel python-PyQt5-devel"
|
||||
qt5-webengine-devel python-devel python3-devel python-PyQt5-devel"
|
||||
depends="python-PyQt5>=${version}_1 python-PyQt5-webchannel>=${version}_1"
|
||||
short_desc="Python2 bindings for the Qt5 toolkit - webengine module"
|
||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||
maintainer="Alessio Sergi <al3hex@gmail.com>"
|
||||
license="GPL-3.0-only"
|
||||
homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
|
||||
distfiles="https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/${version}/PyQtWebEngine-${version}.tar.gz"
|
||||
|
@ -22,23 +22,50 @@ case "$XBPS_TARGET_MACHINE" in
|
|||
arm*) broken="depends on qt5-webengine";;
|
||||
esac
|
||||
|
||||
post_extract() {
|
||||
rm -rf pyuic/uic/port_v3
|
||||
}
|
||||
|
||||
do_configure() {
|
||||
python2 configure.py \
|
||||
QMAKE_CC="${CC}" QMAKE_CFLAGS="${CFLAGS}" \
|
||||
QMAKE_CXX="${CXX}" QMAKE_CXXFLAGS="${CXXFLAGS}" \
|
||||
QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}"
|
||||
QMAKE_LFLAGS="${LDFLAGS}" QMAKE_STRIP=""
|
||||
pre_build() {
|
||||
mkdir -p pyqt5-${py2_ver}
|
||||
mv * pyqt5-${py2_ver} || true
|
||||
cp -a pyqt5-${py2_ver} pyqt5-${py3_ver}
|
||||
rm -rf pyqt5-${py2_ver}/pyuic/uic/port_v3
|
||||
rm -rf pyqt5-${py3_ver}/pyuic/uic/port_v2
|
||||
}
|
||||
|
||||
do_build() {
|
||||
make ${makejobs}
|
||||
for pyver in $py2_ver $py3_ver; do
|
||||
cd $wrksrc/pyqt5-$pyver
|
||||
|
||||
python${pyver} configure.py --no-dist-info \
|
||||
QMAKE_CC="${CC}" QMAKE_CFLAGS="${CFLAGS}" \
|
||||
QMAKE_CXX="${CXX}" QMAKE_CXXFLAGS="${CXXFLAGS}" \
|
||||
QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}"
|
||||
QMAKE_LFLAGS="${LDFLAGS}" QMAKE_STRIP=""
|
||||
|
||||
make ${makejobs}
|
||||
done
|
||||
}
|
||||
|
||||
do_install() {
|
||||
make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} 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
|
||||
}
|
||||
|
||||
python3-PyQt5-webengine_package() {
|
||||
lib32disabled=yes
|
||||
depends="python3-PyQt5>=${version}_1
|
||||
python3-PyQt5-webchannel>=${version}_1"
|
||||
short_desc="${short_desc/Python2/Python3}"
|
||||
pkg_install() {
|
||||
vmove ${py3_sitelib}/PyQt5/QtWebEngine.pyi
|
||||
vmove ${py3_sitelib}/PyQt5/QtWebEngine.so
|
||||
vmove ${py3_sitelib}/PyQt5/QtWebEngineCore.pyi
|
||||
vmove ${py3_sitelib}/PyQt5/QtWebEngineCore.so
|
||||
vmove ${py3_sitelib}/PyQt5/QtWebEngineWidgets.pyi
|
||||
vmove ${py3_sitelib}/PyQt5/QtWebEngineWidgets.so
|
||||
}
|
||||
}
|
||||
|
|
1
srcpkgs/python3-PyQt5-webengine
Symbolic link
1
srcpkgs/python3-PyQt5-webengine
Symbolic link
|
@ -0,0 +1 @@
|
|||
python-PyQt5-webengine
|
|
@ -1,42 +0,0 @@
|
|||
# Template file for 'python3-PyQt5-webengine'
|
||||
pkgname=python3-PyQt5-webengine
|
||||
version=5.15.0
|
||||
revision=1
|
||||
wrksrc="PyQtWebEngine-${version}"
|
||||
hostmakedepends="pkg-config qt5-qmake python3-PyQt5 sip5"
|
||||
makedepends="qt5-declarative-devel qt5-webchannel-devel qt5-location-devel
|
||||
qt5-webengine-devel python3-devel python3-PyQt5-devel"
|
||||
depends="python3-PyQt5>=${version}_1 python3-PyQt5-webchannel>=${version}_1"
|
||||
short_desc="Python 3 bindings for the Qt5 toolkit - webengine module"
|
||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||
license="GPL-3.0-only"
|
||||
homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
|
||||
distfiles="${PYPI_SITE}/P/PyQtWebEngine/PyQtWebEngine-${version}.tar.gz"
|
||||
checksum=670812688e40bf75f70ddf01eadd897d231300318d3856b275bf8e7e0085bf75
|
||||
lib32disabled=yes
|
||||
nocross="configure script is broken for cross builds"
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
ppc64le*) ;;
|
||||
ppc*) broken="no webengine for big endian ppc";;
|
||||
arm*) broken="depends on qt5-webengine";;
|
||||
esac
|
||||
|
||||
pre_build() {
|
||||
rm -rf pyuic/uic/port_v2
|
||||
}
|
||||
|
||||
do_build() {
|
||||
python3 configure.py \
|
||||
QMAKE_CC="${CC}" QMAKE_CFLAGS="${CFLAGS}" \
|
||||
QMAKE_CXX="${CXX}" QMAKE_CXXFLAGS="${CXXFLAGS}" \
|
||||
QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}"
|
||||
QMAKE_LFLAGS="${LDFLAGS}" QMAKE_STRIP=""
|
||||
|
||||
make ${makejobs}
|
||||
}
|
||||
|
||||
do_install() {
|
||||
make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
|
||||
rm -rf ${DESTDIR}/usr/share
|
||||
}
|
|
@ -1 +0,0 @@
|
|||
pkgname="PyQtWebEngine"
|
Loading…
Reference in a new issue