From 28ace0d30bc439bdf38e790b0f717bfaabc86a85 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 23 Nov 2018 21:42:08 +0100 Subject: [PATCH] sip: add python{2,3}-PyQt5 subpackage This is needed since PyQt5>=5.11 requires to have sip in it's own python module path --- srcpkgs/python-sip-PyQt5 | 1 + srcpkgs/python3-sip-PyQt5 | 1 + srcpkgs/sip/template | 44 ++++++++++++++++++++++++++++++++------- 3 files changed, 39 insertions(+), 7 deletions(-) create mode 120000 srcpkgs/python-sip-PyQt5 create mode 120000 srcpkgs/python3-sip-PyQt5 diff --git a/srcpkgs/python-sip-PyQt5 b/srcpkgs/python-sip-PyQt5 new file mode 120000 index 00000000000..633f7c0bcce --- /dev/null +++ b/srcpkgs/python-sip-PyQt5 @@ -0,0 +1 @@ +sip \ No newline at end of file diff --git a/srcpkgs/python3-sip-PyQt5 b/srcpkgs/python3-sip-PyQt5 new file mode 120000 index 00000000000..633f7c0bcce --- /dev/null +++ b/srcpkgs/python3-sip-PyQt5 @@ -0,0 +1 @@ +sip \ No newline at end of file diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template index 308e9fd77a7..729535f7ef3 100644 --- a/srcpkgs/sip/template +++ b/srcpkgs/sip/template @@ -1,14 +1,14 @@ # Template file for 'sip' pkgname=sip version=4.19.13 -revision=1 +revision=2 wrksrc="sip-${version}" hostmakedepends="python-devel python3-devel" makedepends="${hostmakedepends}" short_desc="Python extension module generator for C/C++ libraries" maintainer="Alessio Sergi " +license="GPL-2.0-only, GPL-3.0-only, SIP" homepage="https://riverbankcomputing.com/software/sip/intro" -license="GPL-2, GPL-3, SIP" distfiles="${SOURCEFORGE_SITE}/pyqt/sip/sip-${version}/sip-${version}.tar.gz" checksum=e353a7056599bf5fbd5d3ff9842a6ab2ea3cf4e0304a0f925ec5862907c0d15e @@ -16,20 +16,24 @@ pre_build() { mkdir -p sip-${py2_ver} mv * sip-${py2_ver} || true cp -a sip-${py2_ver} sip-${py3_ver} + cp -a sip-${py2_ver} sip-${py3_ver}-PyQt5 + cp -a sip-${py2_ver} sip-${py2_ver}-PyQt5 } do_build() { - for pyver in $py2_ver $py3_ver; do - if [ "$pyver" != "$py2_ver" ]; then + for pyver in $py2_ver $py3_ver ${py3_ver}-PyQt5 ${py2_ver}-PyQt5; do + if [ "${pyver%-PyQt5}" != "$py2_ver" ]; then pyinc="$py3_inc" else pyinc="$py2_inc" fi - + if [ "${pyver##*-}" = "PyQt5" ]; then + pyqt5="--sip-module PyQt5.sip --no-tools" + fi cd ${wrksrc}/sip-${pyver} - python${pyver} configure.py \ + python${pyver%-PyQt5} configure.py \ CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" \ - INCDIR="${XBPS_CROSS_BASE}/${pyinc}" + INCDIR="${XBPS_CROSS_BASE}/${pyinc}" ${pyqt5} make ${makejobs} done } @@ -48,6 +52,14 @@ do_install() { make DESTDIR=${DESTDIR} install -C siplib vinstall sipconfig.py 644 $py3_sitelib vinstall sipdistutils.py 644 $py3_sitelib + + # install python3 PyQt5 sip + cd ${wrksrc}/sip-${py3_ver}-PyQt5 + make DESTDIR=${DESTDIR} install -C siplib + + # install python2 PyQt5 sip + cd ${wrksrc}/sip-${py2_ver}-PyQt5 + make DESTDIR=${DESTDIR} install -C siplib } python-sip_package() { @@ -90,3 +102,21 @@ python3-sip-devel_package() { vmove ${py3_sitelib}/sipdistutils.py } } +python3-sip-PyQt5_package() { + lib32disabled=yes + depends="${sourcepkg}-${version}_${revision} python3" + short_desc="Python3 SIP bindings (PyQt5 version)" + pkg_install() { + vmove ${py3_sitelib}/PyQt5/sip.so + vmove ${py3_sitelib}/PyQt5/sip.pyi + } +} +python-sip-PyQt5_package() { + lib32disabled=yes + depends="${sourcepkg}-${version}_${revision} python3" + short_desc="Python2 SIP bindings (PyQt5 version)" + pkg_install() { + vmove ${py2_sitelib}/PyQt5/sip.so + vmove ${py2_sitelib}/PyQt5/sip.pyi + } +}