From 4c19a10fcad560e914a43d9ec7e22c0cdc90d7e0 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 17 Oct 2016 02:35:50 +0200 Subject: [PATCH] python-pyside: rebuild for Python 3.5 Switch to python3-* pkgs. Convert python3.4-* pkgs into dummy pkgs. --- srcpkgs/libpyside-python3 | 1 + srcpkgs/libpyside-python3-devel | 1 + srcpkgs/python-pyside/template | 111 ++++++++++++++++++-------------- srcpkgs/python3-pyside | 1 + srcpkgs/python3-pyside-phonon | 1 + 5 files changed, 67 insertions(+), 48 deletions(-) create mode 120000 srcpkgs/libpyside-python3 create mode 120000 srcpkgs/libpyside-python3-devel create mode 120000 srcpkgs/python3-pyside create mode 120000 srcpkgs/python3-pyside-phonon diff --git a/srcpkgs/libpyside-python3 b/srcpkgs/libpyside-python3 new file mode 120000 index 00000000000..0b943cf46ed --- /dev/null +++ b/srcpkgs/libpyside-python3 @@ -0,0 +1 @@ +python-pyside \ No newline at end of file diff --git a/srcpkgs/libpyside-python3-devel b/srcpkgs/libpyside-python3-devel new file mode 120000 index 00000000000..0b943cf46ed --- /dev/null +++ b/srcpkgs/libpyside-python3-devel @@ -0,0 +1 @@ +python-pyside \ No newline at end of file diff --git a/srcpkgs/python-pyside/template b/srcpkgs/python-pyside/template index 3f6be6cf821..50f31b9956f 100644 --- a/srcpkgs/python-pyside/template +++ b/srcpkgs/python-pyside/template @@ -1,16 +1,14 @@ # Template file for 'python-pyside' pkgname=python-pyside version=1.2.2 -revision=4 +revision=5 wrksrc="pyside-qt4.8+${version}" -python_versions="2.7 3.4" hostmakedepends="cmake" -makedepends="python-devel python3.4-devel libshiboken-python-devel - libshiboken-python3.4-devel qt-devel qt-webkit-devel MesaLib-devel phonon-devel" +makedepends="python-devel python3-devel libshiboken-python-devel + libshiboken-python3-devel qt-devel qt-webkit-devel MesaLib-devel phonon-devel" depends="python-shiboken" pycompile_module="PySide" short_desc="LGPL-licensed Python2 bindings for the Qt4 toolkit" -_short_desc="${short_desc/Python2/Python3.4}" maintainer="Enno Boland " homepage="http://www.pyside.org/" license="LGPL-2.1" @@ -28,10 +26,10 @@ do_build() { -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TESTS=OFF" - for pyver in $python_versions; do + for pyver in $py2_ver $py3_ver; do unset args - if [ "$pyver" = "2.7" ]; then - args="-DPYTHON_SUFFIX=-python2.7" + if [ "$pyver" = "$py2_ver" ]; then + args="-DPYTHON_SUFFIX=-python$py2_ver" fi [ ! -d build-${pyver} ] && mkdir build-${pyver} @@ -42,22 +40,20 @@ do_build() { done } do_install() { - for pyver in $python_versions; do - cd ${wrksrc}/build-${pyver} - make DESTDIR=${DESTDIR} install + for pyver in $py2_ver $py3_ver; do + make -C build-${pyver} DESTDIR=${DESTDIR} install done } post_install() { # Fix conflict between .pc files rm -f ${DESTDIR}/usr/lib/pkgconfig/* - for pyver in $python_versions; do + for pyver in $py2_ver $py3_ver; do vinstall build-${pyver}/libpyside/pyside.pc 644 \ usr/lib/pkgconfig pyside-python${pyver}.pc done } libpyside-common-devel_package() { - replaces="python-pyside-devel<1.2.2_1 python3.4-pyside-devel<1.2.2_1" short_desc+=" - common development files" pkg_install() { vmove usr/include @@ -67,63 +63,82 @@ libpyside-common-devel_package() { } } libpyside-python-devel_package() { - replaces="python-pyside-devel<1.2.2_1" depends="libpyside-common-devel-${version}_${revision} libpyside-python-${version}_${revision}" short_desc+=" - shared library (development files)" pkg_install() { - vmove usr/lib/cmake/PySide-${version}/PySideConfig-python2.7.cmake - vmove usr/lib/pkgconfig/pyside-python2.7.pc - vmove usr/lib/libpyside-python2.7.so + vmove usr/lib/cmake/PySide-${version}/PySideConfig-python${py2_ver}.cmake + vmove usr/lib/pkgconfig/pyside-python${py2_ver}.pc + vmove usr/lib/libpyside-python${py2_ver}.so } } libpyside-python_package() { - replaces="python-pyside<1.2.2_1" short_desc+=" - shared library" pkg_install() { - vmove usr/lib/libpyside-python2.7.so.${version%.*} - vmove usr/lib/libpyside-python2.7.so.${version} + vmove usr/lib/libpyside-python${py2_ver}.so.${version%.*} + vmove usr/lib/libpyside-python${py2_ver}.so.${version} } } python-pyside-phonon_package() { depends="${sourcepkg}-${version}_${revision}" short_desc+=" - phonon bindings" pkg_install() { - vmove usr/lib/python2.7/site-packages/PySide/phonon.so + vmove ${py2_sitelib}/PySide/phonon.so + } +} +libpyside-python3-devel_package() { + replaces="libpyside-python3.4-devel>=0" + depends="libpyside-common-devel-${version}_${revision} + libpyside-python3-${version}_${revision}" + short_desc="${short_desc/Python2/Python3} - shared library (development files)" + pkg_install() { + vmove usr/lib/cmake/PySide-${version}/PySideConfig-python${py3_ver}.cmake + vmove usr/lib/pkgconfig/pyside-python${py3_ver}.pc + vmove usr/lib/libpyside-python${py3_ver}.so + } +} +libpyside-python3_package() { + replaces="libpyside-python3.4>=0" + short_desc="${short_desc/Python2/Python3} - shared library" + pkg_install() { + vmove usr/lib/libpyside-python${py3_ver}.so.${version%.*} + vmove usr/lib/libpyside-python${py3_ver}.so.${version} + } +} +python3-pyside-phonon_package() { + replaces="python3.4pyside-phonon>=0" + depends="python3-pyside-${version}_${revision}" + short_desc="${short_desc/Python2/Python3} - phonon bindings" + pkg_install() { + vmove ${py3_sitelib}/PySide/phonon.so + } +} +python3-pyside_package() { + replaces="python3.4pyside>=0" + depends="python3-shiboken" + pycompile_module="PySide" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove ${py3_sitelib} } } libpyside-python3.4-devel_package() { - replaces="python3.4-pyside-devel<1.2.2_1" - depends="libpyside-common-devel-${version}_${revision} - libpyside-python3.4-${version}_${revision}" - short_desc="${_short_desc} - shared library (development files)" - pkg_install() { - vmove usr/lib/cmake/PySide-${version}/PySideConfig-python3.4.cmake - vmove usr/lib/pkgconfig/pyside-python3.4.pc - vmove usr/lib/libpyside-python3.4.so - } + build_style=meta + short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)" + depends="libpyside-python3-devel>=${version}_${revision}" } libpyside-python3.4_package() { - replaces="python3.4-pyside<1.2.2_1" - short_desc="${_short_desc} - shared library" - pkg_install() { - vmove usr/lib/libpyside-python3.4.so.${version%.*} - vmove usr/lib/libpyside-python3.4.so.${version} - } + build_style=meta + short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)" + depends="libpyside-python3>=${version}_${revision}" } python3.4-pyside-phonon_package() { - depends="python3.4-pyside-${version}_${revision}" - short_desc="${_short_desc} - phonon bindings" - pkg_install() { - vmove usr/lib/python3.4/site-packages/PySide/phonon.so - } + build_style=meta + short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)" + depends="python3-pyside-phonon>=${version}_${revision}" } python3.4-pyside_package() { - depends="python3.4-shiboken" - pycompile_version="3.4" - pycompile_module="PySide" - short_desc="${_short_desc}" - pkg_install() { - vmove usr/lib/python3.4 - } + build_style=meta + short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)" + depends="python3-pyside>=${version}_${revision}" } diff --git a/srcpkgs/python3-pyside b/srcpkgs/python3-pyside new file mode 120000 index 00000000000..0b943cf46ed --- /dev/null +++ b/srcpkgs/python3-pyside @@ -0,0 +1 @@ +python-pyside \ No newline at end of file diff --git a/srcpkgs/python3-pyside-phonon b/srcpkgs/python3-pyside-phonon new file mode 120000 index 00000000000..0b943cf46ed --- /dev/null +++ b/srcpkgs/python3-pyside-phonon @@ -0,0 +1 @@ +python-pyside \ No newline at end of file