diff options
| -rw-r--r-- | kde-base/pykde4/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/pykde4/files/pykde4-4.6.3-python-3.2.patch | 17 | ||||
| -rw-r--r-- | kde-base/pykde4/pykde4-4.6.3-r1.ebuild | 5 | ||||
| -rw-r--r-- | kde-base/pykde4/pykde4-4.6.4-r1.ebuild | 5 |
4 files changed, 28 insertions, 5 deletions
diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog index 706739b543f7..6f3b66524a15 100644 --- a/kde-base/pykde4/ChangeLog +++ b/kde-base/pykde4/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/pykde4 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.118 2011/06/21 21:50:15 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.119 2011/06/24 21:01:56 hwoarang Exp $ + + 24 Jun 2011; Markos Chandras <hwoarang@gentoo.org> pykde4-4.6.3-r1.ebuild, + +files/pykde4-4.6.3-python-3.2.patch, pykde4-4.6.4-r1.ebuild: + Fix building with Python 3.2 (bug #365549). Requested by Arfrever. 21 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> pykde4-4.6.3-r1.ebuild, pykde4-4.6.4-r1.ebuild: diff --git a/kde-base/pykde4/files/pykde4-4.6.3-python-3.2.patch b/kde-base/pykde4/files/pykde4-4.6.3-python-3.2.patch new file mode 100644 index 000000000000..62abdf0a1ba1 --- /dev/null +++ b/kde-base/pykde4/files/pykde4-4.6.3-python-3.2.patch @@ -0,0 +1,17 @@ +--- python/pykde4/sip/kio/kfileitem.sip ++++ python/pykde4/sip/kio/kfileitem.sip +@@ -236,7 +236,13 @@ + + len = sipCpp->count(); + +- if (PySlice_GetIndicesEx((PySliceObject *)a0, len, &start, &stop, &step, &slicelength) < 0) ++ if (PySlice_GetIndicesEx( ++#if PY_VERSION_HEX >= 0x03020000 ++ a0, ++#else ++ (PySliceObject *)a0, ++#endif ++ len, &start, &stop, &step, &slicelength) < 0) + sipIsErr = 1; + else + { diff --git a/kde-base/pykde4/pykde4-4.6.3-r1.ebuild b/kde-base/pykde4/pykde4-4.6.3-r1.ebuild index 2dca96a991b1..9fc72c0785b3 100644 --- a/kde-base/pykde4/pykde4-4.6.3-r1.ebuild +++ b/kde-base/pykde4/pykde4-4.6.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.6.3-r1.ebuild,v 1.3 2011/06/21 21:50:15 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.6.3-r1.ebuild,v 1.4 2011/06/24 21:01:56 hwoarang Exp $ EAPI=3 @@ -33,7 +33,8 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-4.6.3-pyqt475.patch" ) +PATCHES=( "${FILESDIR}/${PN}-4.6.3-pyqt475.patch" + "${FILESDIR}/${P}-python-3.2.patch" ) pkg_setup() { python_pkg_setup diff --git a/kde-base/pykde4/pykde4-4.6.4-r1.ebuild b/kde-base/pykde4/pykde4-4.6.4-r1.ebuild index dd18519c948a..68c42062c161 100644 --- a/kde-base/pykde4/pykde4-4.6.4-r1.ebuild +++ b/kde-base/pykde4/pykde4-4.6.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.6.4-r1.ebuild,v 1.3 2011/06/21 21:50:15 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.6.4-r1.ebuild,v 1.4 2011/06/24 21:01:56 hwoarang Exp $ EAPI=3 @@ -33,7 +33,8 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-4.6.4-pyqt475.patch" ) +PATCHES=( "${FILESDIR}/${PN}-4.6.4-pyqt475.patch" + "${FILESDIR}/${PN}-4.6.3-python-3.2.patch" ) pkg_setup() { python_pkg_setup |