diff --git a/srcpkgs/python-PyQt4-webkit b/srcpkgs/python-PyQt4-webkit new file mode 120000 index 0000000000..fe02248dee --- /dev/null +++ b/srcpkgs/python-PyQt4-webkit @@ -0,0 +1 @@ +python-PyQt4 \ No newline at end of file diff --git a/srcpkgs/python-PyQt4/template b/srcpkgs/python-PyQt4/template index c7dab37fcf..5e66d1856a 100644 --- a/srcpkgs/python-PyQt4/template +++ b/srcpkgs/python-PyQt4/template @@ -1,11 +1,12 @@ # Template file for 'python-PyQt4' pkgname=python-PyQt4 version=4.11.4 -revision=6 +revision=7 +lib32disabled=yes wrksrc="PyQt-x11-gpl-${version}" hostmakedepends="pkg-config" makedepends="python-devel python3-devel python-sip-devel python3-sip-devel - qt-devel qt-webkit-devel dbus-devel python-dbus-devel MesaLib-devel phonon-devel" + qt-webkit-devel dbus-devel python-dbus-devel MesaLib-devel phonon-devel" depends="python-sip" pycompile_module="PyQt4" short_desc="Python2 bindings for the Qt4 toolkit" @@ -27,12 +28,8 @@ do_build() { local tools= for pyver in $py2_ver $py3_ver; do - if [ "$pyver" != "$py2_ver" ]; then - tools="--no-tools" - fi - cd $wrksrc/pyqt4-$pyver - python${pyver} configure-ng.py --confirm-license --assume-shared $tools \ + python${pyver} configure-ng.py --confirm-license --assume-shared \ CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" find -name Makefile -exec sed -i "{}" \ @@ -42,16 +39,19 @@ do_build() { done } do_install() { - # install python{,3}-pyqt4 + # install python-pyqt4 make -C pyqt4-${py2_ver} DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install + # create versioned pyuic4 wrapper + sed -i 's,/usr/bin/python2.7,/usr/bin/python2,' ${DESTDIR}/usr/bin/pyuic4 + mv ${DESTDIR}/usr/bin/{,python2-}pyuic4 + + # install python3-pyqt4 make -C pyqt4-${py3_ver} DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install + # create versioned pyuic4 wrapper + sed -i 's,/usr/bin/python3[.0-9]*,/usr/bin/python3,' ${DESTDIR}/usr/bin/pyuic4 + mv ${DESTDIR}/usr/bin/{,python3-}pyuic4 cd pyqt4-${py2_ver} - # create versioned pyuic4 wrapper - mv ${DESTDIR}/usr/bin/{,python2-}pyuic4 - sed -i "s,python2.7,python${py3_ver},g" pyuic4 - vbin pyuic4 python3-pyuic4 - # install doc vmkdir usr/share/doc/${pkgname} vcopy doc/html usr/share/doc/${pkgname} @@ -73,6 +73,7 @@ python-PyQt4-devel_package() { } } python-PyQt4-dbus_package() { + lib32disabled=yes depends="${sourcepkg}-${version}_${revision} python-dbus" short_desc+=" - dbus support" pkg_install() { @@ -80,12 +81,21 @@ python-PyQt4-dbus_package() { } } python-PyQt4-phonon_package() { + lib32disabled=yes depends="${sourcepkg}-${version}_${revision}" short_desc+=" - phonon bindings" pkg_install() { vmove ${py2_sitelib}/PyQt4/phonon.so } } +python-PyQt4-webkit_package() { + lib32disabled=yes + depends="${sourcepkg}-${version}_${revision}" + short_desc+=" - webkit module" + pkg_install() { + vmove ${py2_sitelib}/PyQt4/QtWebKit.so + } +} python-PyQt4-doc_package() { noarch=yes short_desc+=" - documentation files" @@ -94,6 +104,7 @@ python-PyQt4-doc_package() { } } python3-PyQt4_package() { + lib32disabled=yes depends="python3-sip" pycompile_module="PyQt4" replaces="python3.4-PyQt4>=0" @@ -105,6 +116,7 @@ python3-PyQt4_package() { } } python3-PyQt4-dbus_package() { + lib32disabled=yes replaces="python3.4-PyQt4-dbus>=0" depends="python3-PyQt4-${version}_${revision} python3-dbus" short_desc="${short_desc/Python2/Python3} - dbus support" @@ -113,6 +125,7 @@ python3-PyQt4-dbus_package() { } } python3-PyQt4-phonon_package() { + lib32disabled=yes replaces="python3.4-PyQt4-phonon>=0" depends="python3-PyQt4-${version}_${revision}" short_desc="${short_desc/Python2/Python3} - phonon bindings" @@ -120,6 +133,14 @@ python3-PyQt4-phonon_package() { vmove ${py3_sitelib}/PyQt4/phonon.so } } +python3-PyQt4-webkit_package() { + lib32disabled=yes + depends="python3-PyQt4-${version}_${revision}" + short_desc="${short_desc/Python2/Python3} - webkit module" + pkg_install() { + vmove ${py3_sitelib}/PyQt4/QtWebKit.so + } +} python3.4-PyQt4_package() { build_style=meta short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)" diff --git a/srcpkgs/python3-PyQt4-webkit b/srcpkgs/python3-PyQt4-webkit new file mode 120000 index 0000000000..fe02248dee --- /dev/null +++ b/srcpkgs/python3-PyQt4-webkit @@ -0,0 +1 @@ +python-PyQt4 \ No newline at end of file