python-PyQt5: update to 5.10.1

This commit is contained in:
Alessio Sergi 2018-04-11 19:40:11 +02:00
parent 21268e10a0
commit 922e8adb3b
4 changed files with 94 additions and 111 deletions

View File

@ -1,20 +0,0 @@
--- configure.py.orig 2017-03-30 10:46:57.000000000 +0200
+++ configure.py 2017-12-17 14:51:45.159142941 +0100
@@ -2276,6 +2276,7 @@
name_pro = name + '.pro'
name_makefile = name + '.mk'
name_source = name + '.cpp'
+ name_inc = name + '.inc'
# Create the .pro file.
pro_lines = []
@@ -2283,6 +2284,9 @@
pro_lines.append('TARGET = %s' % name)
pro_lines.append('SOURCES = %s' % name_source)
+ if (os.path.isfile(name_inc)):
+ pro_lines.append('include(%s)' % name_inc)
+
f = open_for_writing(name_pro)
f.write('\n'.join(pro_lines))
f.close()

View File

@ -1,33 +1,26 @@
# Template file for 'python-PyQt5'
pkgname=python-PyQt5
version=5.8.2
revision=3
version=5.10.1
revision=1
_sipver=4.19.4
lib32disabled=yes
wrksrc="PyQt5_gpl-${version}"
replaces="python-PyQt5-enginio<5.7_1"
hostmakedepends="pkg-config"
makedepends="
replaces="python-PyQt5-doc<5.10.1"
pycompile_module="PyQt5"
hostmakedepends="pkg-config
python-devel python3-devel python-sip-devel python3-sip-devel python-dbus-devel
qt5-tools-devel qt5-connectivity-devel qt5-declarative-devel qt5-location-devel
qt5-multimedia-devel qt5-sensors-devel qt5-serialport-devel qt5-svg-devel
qt5-webchannel-devel qt5-webengine-devel qt5-webkit-devel qt5-websockets-devel
qt5-x11extras-devel qt5-xmlpatterns-devel pulseaudio-devel"
depends="python-sip"
pycompile_module="PyQt5"
qt5-x11extras-devel qt5-xmlpatterns-devel qt5-networkauth-devel pulseaudio-devel"
makedepends="${hostmakedepends/pkg-config/}"
depends="python-sip>=${_sipver}"
short_desc="Python2 bindings for the Qt5 toolkit"
maintainer="Alessio Sergi <al3hex@gmail.com>"
homepage="http://www.riverbankcomputing.co.uk/software/pyqt/intro"
homepage="https://riverbankcomputing.com/software/pyqt/intro"
license="GPL-3"
distfiles="${SOURCEFORGE_SITE}/pyqt/PyQt5_gpl-${version}.tar.gz"
checksum=ebd70515b30bbd6098fee29e6271a6696b1183c5530ee30e6ba9aaab195536e8
if [ -n "$CROSS_BUILD" ]; then
hostmakedepends+=" python python3 sip python-dbus-devel
qt5-tools-devel qt5-connectivity-devel qt5-declarative-devel qt5-location-devel
qt5-multimedia-devel qt5-sensors-devel qt5-serialport-devel qt5-svg-devel
qt5-webchannel-devel qt5-webengine-devel qt5-webkit-devel qt5-websockets-devel
qt5-x11extras-devel qt5-xmlpatterns-devel"
fi
checksum=9932e971e825ece4ea08f84ad95017837fa8f3f29c6b0496985fa1093661e9ef
pre_build() {
mkdir -p pyqt5-${py2_ver}
@ -37,40 +30,40 @@ pre_build() {
rm -rf pyqt5-${py3_ver}/pyuic/uic/port_v2
}
do_build() {
local tools=
local _sysroot= _configuration= py_abiver=
for pyver in $py2_ver $py3_ver; do
cd $wrksrc/pyqt5-$pyver
if [ -n "$CROSS_BUILD" ]; then
cat > qtdetail.inc << END
QMAKE_CC="$CC_host"
QMAKE_CFLAGS="$CFLAGS_host"
QMAKE_CXX="$CXX_host"
QMAKE_CXXFLAGS="$CXXFLAGS_host"
QMAKE_LINK="$CXX_host"
QMAKE_LINK_SHLIB=
QMAKE_LFLAGS=
END
# target opengl features arent detected when cross compiling
case "$XBPS_TARGET_MACHINE" in
arm*|aarch64*) sed -i -e "/self.pyqt_disabled_features = lines\[1:-1\]/a \
\ self.pyqt_disabled_features.append('PyQt_Desktop_OpenGL')" configure.py ;;
esac
# configure.py stops when $XBPS_CROSS_BASE is empty in a
# native build; so only set sysroot when cross compiling
_sysroot="--sysroot=$XBPS_CROSS_BASE"
else
unset _sysroot
if [ "$pyver" = "$py3_ver" ]; then
py_abiver="$py3_abiver"
fi
python${pyver} configure.py --confirm-license --assume-shared $_sysroot \
cd $wrksrc/pyqt5-$pyver
if [ "$CROSS_BUILD" ]; then
cat > pyqt5_${XBPS_CROSS_TRIPLET}.cfg <<EOF
py_platform = linux
py_inc_dir = %(sysroot)/usr/include/python%(py_major).%(py_minor)${py_abiver}
py_pyshlib = python%(py_major).%(py_minor)${py_abiver}.so
pyqt_disabled_features = PyQt_Desktop_OpenGL PyQt_qreal_double
qt_shared = True
[Qt ${version}]
# _QOpenGLFunctions_ES2 doesn't work
pyqt_modules = QtCore QtGui QtHelp QtMultimedia
QtMultimediaWidgets QtNetwork QtOpenGL QtPrintSupport QtQml QtQuick
QtSql QtSvg QtTest QtWebKit QtWebKitWidgets QtWidgets QtXml
QtXmlPatterns QtDesigner QtDBus QtSensors QtSerialPort
QtX11Extras QtBluetooth QtPositioning QtQuickWidgets QtWebSockets
QtWebChannel QtWebEngineWidgets QtLocation QtNfc QtWebEngineCore
QtWebEngine QtNetworkAuth
EOF
_sysroot="--sysroot $XBPS_CROSS_BASE"
_configuration="--configuration $wrksrc/pyqt5-$pyver/pyqt5_${XBPS_CROSS_TRIPLET}.cfg"
fi
python${pyver} configure.py --confirm-license --assume-shared $_sysroot $_configuration \
QMAKE_CC="${CC}" QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXX="${CXX}" QMAKE_CXXFLAGS="${CXXFLAGS}" \
QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}" QMAKE_LFLAGS="${LDFLAGS}" QMAKE_STRIP=""
find -name Makefile -exec sed -i "{}" \
-e "s;\(\$(INSTALL_ROOT)/usr/\)${XBPS_CROSS_TRIPLET}/;\1;g" \;
make ${makejobs}
done
}
@ -78,23 +71,16 @@ do_install() {
# install python-pyqt5
make -C pyqt5-${py2_ver} DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
for f in pylupdate5 pyrcc5 pyuic5; do
sed -i -e 's,/usr/bin/python2.7,/usr/bin/python2,' \
-e "s,${XBPS_CROSS_TRIPLET}/,," ${DESTDIR}/usr/bin/${f}
sed -i 's,/usr/bin/python2.7,/usr/bin/python2,' ${DESTDIR}/usr/bin/${f}
mv ${DESTDIR}/usr/bin/{,python2-}${f}
done
# install python3-pyqt5
make -C pyqt5-${py3_ver} DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
for f in pylupdate5 pyrcc5 pyuic5; do
sed -i -e 's,/usr/bin/python3[.0-9]*,/usr/bin/python3,' \
-e "s,${XBPS_CROSS_TRIPLET}/,," ${DESTDIR}/usr/bin/${f}
sed -i 's,/usr/bin/python3[.0-9]*,/usr/bin/python3,' ${DESTDIR}/usr/bin/${f}
mv ${DESTDIR}/usr/bin/{,python3-}${f}
done
cd pyqt5-${py2_ver}
# install doc
vmkdir usr/share/doc/${pkgname}
vcopy doc/html usr/share/doc/${pkgname}
}
python-PyQt5-devel-tools_package() {
@ -137,13 +123,6 @@ python-PyQt5-devel_package() {
vmove usr/share/sip
}
}
python-PyQt5-doc_package() {
noarch=yes
short_desc+=" - documentation files"
pkg_install() {
vmove usr/share/doc
}
}
python-PyQt5-dbus_package() {
lib32disabled=yes
depends="${sourcepkg}-${version}_${revision} python-dbus"
@ -170,18 +149,22 @@ python-PyQt5-multimedia_package() {
vmove ${py2_sitelib}/PyQt5/QtMultimediaWidgets.so
}
}
python-PyQt5-networkauth_package() {
lib32disabled=yes
depends="${sourcepkg}-${version}_${revision} python-enum34"
short_desc+=" - networkauth module"
pkg_install() {
vmove ${py2_sitelib}/PyQt5/QtNetworkAuth.so
}
}
python-PyQt5-opengl_package() {
lib32disabled=yes
depends="${sourcepkg}-${version}_${revision}"
short_desc+=" - opengl module"
pkg_install() {
vmove ${py2_sitelib}/PyQt5/QtOpenGL.so
# QOpenGLFunctions is missing for arm*/aarch64* (mips* probably, too)
# cfgtest__QOpenGLFunctions_2_0.cpp:(.text.startup+0x10): undefined reference to 'QOpenGLFunctions_2_0::QOpenGLFunctions_2_0()'
if [ -e "$DESTDIR/${py2_sitelib}/PyQt5/_QOpenGLFunctions_2_0.so" ]; then
vmove ${py2_sitelib}/PyQt5/_QOpenGLFunctions_2_0.so
if [ -z "$CROSS_BUILD" ]; then
vmove ${py2_sitelib}/PyQt5/_QOpenGLFunctions_*.so
fi
}
@ -237,20 +220,13 @@ python-PyQt5-svg_package() {
vmove ${py2_sitelib}/PyQt5/QtSvg.so
}
}
python-PyQt5-tools_package() {
lib32disabled=yes
depends="${sourcepkg}-${version}_${revision}"
short_desc+=" - designer, help modules"
pkg_install() {
vmove ${py2_sitelib}/PyQt5/QtHelp.so
# /usr/lib/gcc/armv7l-linux-musleabihf/7.2.0/../../../../armv7l-linux-musleabihf/bin/ld: cannot find -lQt5Designer
# there is no libQt5Designer.so.* in qt5-tools for arm*/aarch64* (mips* probably, too)
if [ -e "$DESTDIR/${py2_sitelib}/PyQt5/QtDesigner.so" ]; then
vmove ${py2_sitelib}/PyQt5/QtDesigner.so
fi
vmove ${py2_sitelib}/PyQt5/QtDesigner.so
}
}
python-PyQt5-webchannel_package() {
@ -307,9 +283,9 @@ python-PyQt5-xmlpatterns_package() {
}
python3-PyQt5_package() {
lib32disabled=yes
depends="python3-sip"
pycompile_module="PyQt5"
replaces="python3-PyQt5-enginio<5.7_1"
depends="python3-sip>=${_sipver}"
replaces="python-PyQt5-doc<5.10.1"
short_desc="${short_desc/Python2/Python3}"
pkg_install() {
vmove ${py3_sitelib}
@ -328,7 +304,9 @@ python3-PyQt5-connectivity_package() {
depends="python3-PyQt5-${version}_${revision}"
short_desc="${short_desc/Python2/Python3} - connectivity module"
pkg_install() {
vmove ${py3_sitelib}/PyQt5/QtBluetooth.pyi
vmove ${py3_sitelib}/PyQt5/QtBluetooth.so
vmove ${py3_sitelib}/PyQt5/QtNfc.pyi
vmove ${py3_sitelib}/PyQt5/QtNfc.so
}
}
@ -337,21 +315,30 @@ python3-PyQt5-multimedia_package() {
depends="python3-PyQt5-${version}_${revision}"
short_desc="${short_desc/Python2/Python3} - multimedia module"
pkg_install() {
vmove ${py3_sitelib}/PyQt5/QtMultimedia.pyi
vmove ${py3_sitelib}/PyQt5/QtMultimedia.so
vmove ${py3_sitelib}/PyQt5/QtMultimediaWidgets.pyi
vmove ${py3_sitelib}/PyQt5/QtMultimediaWidgets.so
}
}
python3-PyQt5-networkauth_package() {
lib32disabled=yes
depends="python3-PyQt5-${version}_${revision}"
short_desc="${short_desc/Python2/Python3} - networkauth module"
pkg_install() {
vmove ${py3_sitelib}/PyQt5/QtNetworkAuth.pyi
vmove ${py3_sitelib}/PyQt5/QtNetworkAuth.so
}
}
python3-PyQt5-opengl_package() {
lib32disabled=yes
depends="python3-PyQt5-${version}_${revision}"
short_desc="${short_desc/Python2/Python3} - opengl module"
pkg_install() {
vmove ${py3_sitelib}/PyQt5/QtOpenGL.pyi
vmove ${py3_sitelib}/PyQt5/QtOpenGL.so
# QOpenGLFunctions is missing for arm*/aarch64* (mips* probably, too)
# cfgtest__QOpenGLFunctions_2_0.cpp:(.text.startup+0x10): undefined reference to 'QOpenGLFunctions_2_0::QOpenGLFunctions_2_0()'
if [ -e "$DESTDIR/${py3_sitelib}/PyQt5/_QOpenGLFunctions_2_0.so" ]; then
vmove ${py3_sitelib}/PyQt5/_QOpenGLFunctions_2_0.so
if [ -z "$CROSS_BUILD" ]; then
vmove ${py3_sitelib}/PyQt5/_QOpenGLFunctions_*.so
fi
}
}
@ -360,7 +347,9 @@ python3-PyQt5-location_package() {
depends="python3-PyQt5-${version}_${revision}"
short_desc="${short_desc/Python2/Python3} - location module"
pkg_install() {
vmove ${py3_sitelib}/PyQt5/QtLocation.pyi
vmove ${py3_sitelib}/PyQt5/QtLocation.so
vmove ${py3_sitelib}/PyQt5/QtPositioning.pyi
vmove ${py3_sitelib}/PyQt5/QtPositioning.so
}
}
@ -369,8 +358,11 @@ python3-PyQt5-quick_package() {
depends="python3-PyQt5-${version}_${revision}"
short_desc="${short_desc/Python2/Python3} - quick module"
pkg_install() {
vmove ${py3_sitelib}/PyQt5/QtQml.pyi
vmove ${py3_sitelib}/PyQt5/QtQml.so
vmove ${py3_sitelib}/PyQt5/QtQuick.pyi
vmove ${py3_sitelib}/PyQt5/QtQuick.so
vmove ${py3_sitelib}/PyQt5/QtQuickWidgets.pyi
vmove ${py3_sitelib}/PyQt5/QtQuickWidgets.so
vmove usr/lib/qt5/plugins/PyQt5/libpyqt5qmlplugin.so
}
@ -380,6 +372,7 @@ python3-PyQt5-sensors_package() {
depends="python3-PyQt5-${version}_${revision}"
short_desc="${short_desc/Python2/Python3} - sensors module"
pkg_install() {
vmove ${py3_sitelib}/PyQt5/QtSensors.pyi
vmove ${py3_sitelib}/PyQt5/QtSensors.so
}
}
@ -388,6 +381,7 @@ python3-PyQt5-serialport_package() {
depends="python3-PyQt5-${version}_${revision}"
short_desc="${short_desc/Python2/Python3} - serialport module"
pkg_install() {
vmove ${py3_sitelib}/PyQt5/QtSerialPort.pyi
vmove ${py3_sitelib}/PyQt5/QtSerialPort.so
}
}
@ -396,6 +390,7 @@ python3-PyQt5-sql_package() {
depends="python3-PyQt5-${version}_${revision}"
short_desc="${short_desc/Python2/Python3} - sql module"
pkg_install() {
vmove ${py3_sitelib}/PyQt5/QtSql.pyi
vmove ${py3_sitelib}/PyQt5/QtSql.so
}
}
@ -404,6 +399,7 @@ python3-PyQt5-svg_package() {
depends="python3-PyQt5-${version}_${revision}"
short_desc="${short_desc/Python2/Python3} - svg module"
pkg_install() {
vmove ${py3_sitelib}/PyQt5/QtSvg.pyi
vmove ${py3_sitelib}/PyQt5/QtSvg.so
}
}
@ -412,14 +408,11 @@ python3-PyQt5-tools_package() {
depends="python3-PyQt5-${version}_${revision}"
short_desc="${short_desc/Python2/Python3} - designer, help modules"
pkg_install() {
vmove ${py3_sitelib}/PyQt5/QtHelp.pyi
vmove ${py3_sitelib}/PyQt5/QtHelp.so
# /usr/lib/gcc/armv7l-linux-musleabihf/7.2.0/../../../../armv7l-linux-musleabihf/bin/ld: cannot find -lQt5Designer
# there is no libQt5Designer.so.* in qt5-tools for arm*/aarch64* (mips* probably, too)
if [ -e "$DESTDIR/${py3_sitelib}/PyQt5/QtDesigner.so" ]; then
vmove ${py3_sitelib}/PyQt5/QtDesigner.so
vmove usr/lib/qt5/plugins/designer/libpyqt5.so
fi
vmove ${py3_sitelib}/PyQt5/QtDesigner.pyi
vmove ${py3_sitelib}/PyQt5/QtDesigner.so
vmove usr/lib/qt5/plugins/designer/libpyqt5.so
}
}
python3-PyQt5-webchannel_package() {
@ -427,6 +420,7 @@ python3-PyQt5-webchannel_package() {
depends="python3-PyQt5-${version}_${revision}"
short_desc="${short_desc/Python2/Python3} - webchannel module"
pkg_install() {
vmove ${py3_sitelib}/PyQt5/QtWebChannel.pyi
vmove ${py3_sitelib}/PyQt5/QtWebChannel.so
}
}
@ -436,8 +430,11 @@ python3-PyQt5-webengine_package() {
python3-PyQt5-webchannel-${version}_${revision}"
short_desc="${short_desc/Python2/Python3} - webengine module"
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
}
}
@ -446,7 +443,9 @@ python3-PyQt5-webkit_package() {
depends="python3-PyQt5-${version}_${revision}"
short_desc="${short_desc/Python2/Python3} - webkit module"
pkg_install() {
vmove ${py3_sitelib}/PyQt5/QtWebKit.pyi
vmove ${py3_sitelib}/PyQt5/QtWebKit.so
vmove ${py3_sitelib}/PyQt5/QtWebKitWidgets.pyi
vmove ${py3_sitelib}/PyQt5/QtWebKitWidgets.so
}
}
@ -455,6 +454,7 @@ python3-PyQt5-websockets_package() {
depends="python3-PyQt5-${version}_${revision}"
short_desc="${short_desc/Python2/Python3} - websockets module"
pkg_install() {
vmove ${py3_sitelib}/PyQt5/QtWebSockets.pyi
vmove ${py3_sitelib}/PyQt5/QtWebSockets.so
}
}
@ -463,6 +463,7 @@ python3-PyQt5-x11extras_package() {
depends="python3-PyQt5-${version}_${revision}"
short_desc="${short_desc/Python2/Python3} - x11extras module"
pkg_install() {
vmove ${py3_sitelib}/PyQt5/QtX11Extras.pyi
vmove ${py3_sitelib}/PyQt5/QtX11Extras.so
}
}
@ -471,6 +472,7 @@ python3-PyQt5-xmlpatterns_package() {
depends="python3-PyQt5-${version}_${revision}"
short_desc="${short_desc/Python2/Python3} - xmlpatterns module"
pkg_install() {
vmove ${py3_sitelib}/PyQt5/QtXmlPatterns.pyi
vmove ${py3_sitelib}/PyQt5/QtXmlPatterns.so
}
}

View File

@ -0,0 +1 @@
python-PyQt5