diff options
| -rw-r--r-- | dev-python/PyQt4/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-python/PyQt4/PyQt4-4.7.7-r1.ebuild | 169 | ||||
| -rw-r--r-- | dev-python/PyQt4/files/PyQt4-4.7.7-fix-scpk-and-flag-issue.diff | 40 |
3 files changed, 216 insertions, 1 deletions
diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog index 1f1f2b1fef20..64664854df33 100644 --- a/dev-python/PyQt4/ChangeLog +++ b/dev-python/PyQt4/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-python/PyQt4 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.129 2010/09/21 12:14:58 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.130 2010/10/06 11:05:05 tampakrap Exp $ + +*PyQt4-4.7.7-r1 (06 Oct 2010) + + 06 Oct 2010; Theo Chatzimichos <tampakrap@gentoo.org> + +PyQt4-4.7.7-r1.ebuild, +files/PyQt4-4.7.7-fix-scpk-and-flag-issue.diff: + Revision bump, add patch that fixes compilation with PyKDE 4.5.2 *PyQt4-4.7.7 (21 Sep 2010) diff --git a/dev-python/PyQt4/PyQt4-4.7.7-r1.ebuild b/dev-python/PyQt4/PyQt4-4.7.7-r1.ebuild new file mode 100644 index 000000000000..9c97939e1ddc --- /dev/null +++ b/dev-python/PyQt4/PyQt4-4.7.7-r1.ebuild @@ -0,0 +1,169 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.7-r1.ebuild,v 1.1 2010/10/06 11:05:05 tampakrap Exp $ + +EAPI="3" +PYTHON_DEPEND="*" +PYTHON_EXPORT_PHASE_FUNCTIONS="1" +SUPPORT_PYTHON_ABIS="1" + +inherit qt4-r2 python toolchain-funcs + +MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}" +QTVER="4.6.2" # minimal Qt version this is supposed to work with + +DESCRIPTION="A set of Python bindings for the Qt toolkit" +HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt" +SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz" + +SLOT="0" +LICENSE="|| ( GPL-2 GPL-3 )" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="X assistant +dbus debug doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns" + +DEPEND=">=dev-python/sip-4.11 + >=x11-libs/qt-core-${QTVER}:4 + >=x11-libs/qt-script-${QTVER}:4 + >=x11-libs/qt-test-${QTVER}:4 + X? ( >=x11-libs/qt-gui-${QTVER}:4[dbus?] ) + assistant? ( >=x11-libs/qt-assistant-${QTVER}:4 ) + dbus? ( + >=dev-python/dbus-python-0.80 + >=x11-libs/qt-dbus-${QTVER}:4 + ) + multimedia? ( >=x11-libs/qt-multimedia-${QTVER}:4 ) + opengl? ( >=x11-libs/qt-opengl-${QTVER}:4 ) + phonon? ( + !kde? ( || ( >=x11-libs/qt-phonon-${QTVER}:4 media-sound/phonon ) ) + kde? ( media-sound/phonon ) + ) + sql? ( >=x11-libs/qt-sql-${QTVER}:4 ) + svg? ( >=x11-libs/qt-svg-${QTVER}:4 ) + webkit? ( >=x11-libs/qt-webkit-${QTVER}:4 ) + xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QTVER}:4 )" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/${MY_P} + +PATCHES=( + "${FILESDIR}/${PN}-4.6.1-configure-multilib.patch" + "${FILESDIR}/${PN}-4.7.2-configure.py.patch" + "${FILESDIR}/${P}-fix-scpk-and-flag-issue.diff" +) + +src_prepare() { + if ! use dbus; then + sed -i -e 's,^\([[:blank:]]\+\)check_dbus(),\1pass,' \ + "${S}"/configure.py || die + fi + + # Patch to support qreal for arm architecture + # wrt bug #322349 + use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch" + + qt4-r2_src_prepare + + # Use proper include dir + sed -e "s|/usr/include|${EPREFIX}/usr/include|g" \ + -i configure.py + + python_copy_sources + + preparation() { + if [[ "$(python_get_version --major)" == "3" ]]; then + rm -fr pyuic/uic/port_v2 + else + rm -fr pyuic/uic/port_v3 + fi + } + python_execute_function -s preparation +} + +pyqt4_use_enable() { + use $1 && echo "--enable=${2:-$1}" +} + +src_configure() { + configuration() { + local myconf="$(PYTHON) configure.py + --confirm-license + --bindir="${EPREFIX}"/usr/bin + --destdir="${EPREFIX}"$(python_get_sitedir) + --sipdir="${EPREFIX}"/usr/share/sip + --qsci-api + $(use debug && echo '--debug') + --enable=QtCore + --enable=QtNetwork + --enable=QtScript + --enable=QtTest + --enable=QtXml + $(pyqt4_use_enable X QtGui) + $(pyqt4_use_enable X QtDesigner) + $(pyqt4_use_enable X QtScriptTools) + $(pyqt4_use_enable assistant QtAssistant) + $(pyqt4_use_enable assistant QtHelp) + $(pyqt4_use_enable multimedia QtMultimedia) + $(pyqt4_use_enable opengl QtOpenGL) + $(pyqt4_use_enable phonon) + $(pyqt4_use_enable sql QtSql) + $(pyqt4_use_enable svg QtSvg) + $(pyqt4_use_enable webkit QtWebKit) + $(pyqt4_use_enable xmlpatterns QtXmlPatterns) + CC=$(tc-getCC) CXX=$(tc-getCXX) + LINK=$(tc-getCXX) LINK_SHLIB=$(tc-getCXX) + CFLAGS='${CFLAGS}' CXXFLAGS='${CXXFLAGS}' LFLAGS='${LDFLAGS}'" + echo ${myconf} + eval ${myconf} || return 1 + + for mod in QtCore $(use X && echo 'QtDesigner QtGui'); do + # Run eqmake4 inside the qpy subdirs to prevent + # stripping and many other QA issues + pushd qpy/${mod} > /dev/null || die + eqmake4 $(ls w_qpy*.pro) + popd > /dev/null || die + + # Fix insecure runpaths + sed -i -e "/^LFLAGS/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" \ + ${mod}/Makefile || die "failed to fix rpath issues" + done + + # Fix pre-stripping of libpythonplugin.so + if use X; then + cd "${BUILDDIR}"/designer + eqmake4 python.pro + fi + } + python_execute_function -s configuration +} + +src_compile() { + python_src_compile +} + +src_install() { + installation() { + # INSTALL_ROOT is needed for the QtDesigner module, + # the other Makefiles use DESTDIR. + emake DESTDIR="${D}" INSTALL_ROOT="${D}" install + } + python_execute_function -s installation + + dodoc doc/pyqt4ref.txt NEWS THANKS || die + + if use doc; then + dohtml -r doc/* || die + fi + + if use examples; then + insinto /usr/share/doc/${PF} + doins -r examples || die + fi +} + +pkg_postinst() { + python_mod_optimize PyQt4 +} + +pkg_postrm() { + python_mod_cleanup PyQt4 +} diff --git a/dev-python/PyQt4/files/PyQt4-4.7.7-fix-scpk-and-flag-issue.diff b/dev-python/PyQt4/files/PyQt4-4.7.7-fix-scpk-and-flag-issue.diff new file mode 100644 index 000000000000..38083e76e523 --- /dev/null +++ b/dev-python/PyQt4/files/PyQt4-4.7.7-fix-scpk-and-flag-issue.diff @@ -0,0 +1,40 @@ +Index: PyQt-x11-gpl-4.7.7/pyuic/uic/Loader/loader.py +=================================================================== +--- PyQt-x11-gpl-4.7.7.orig/pyuic/uic/Loader/loader.py ++++ PyQt-x11-gpl-4.7.7/pyuic/uic/Loader/loader.py +@@ -1,3 +1,5 @@ ++import os.path ++ + from PyQt4 import QtGui, QtCore + from PyQt4.uic.uiparser import UIParser + from PyQt4.uic.Loader.qobjectcreator import LoaderCreatorPolicy +@@ -19,6 +21,7 @@ class DynamicUILoader(UIParser): + def loadUi(self, filename, toplevelInst=None): + self.toplevelInst = toplevelInst + +- # By using QFileInfo.path() rather than os.path.dirname() we allow +- # QString file names. +- return self.parse(filename, QtCore.QFileInfo(filename).path()) ++ # Allow the filename to be a QString. ++ filename = str(filename) ++ ++ return self.parse(filename, os.path.dirname(filename)) +Index: PyQt-x11-gpl-4.7.7/sip/QtCore/qglobal.sip +=================================================================== +--- PyQt-x11-gpl-4.7.7.orig/sip/QtCore/qglobal.sip ++++ PyQt-x11-gpl-4.7.7/sip/QtCore/qglobal.sip +@@ -312,12 +312,12 @@ public: + // Qt.Alignment class. + QFlags operator|(int f); + %MethodCode +- sipRes = new QFlags(*a0 | (ENUM(a1))); ++ sipRes = new QFlags(*a0 | a1); + %End + + QFlags operator^(int f); + %MethodCode +- sipRes = new QFlags(*a0 ^ (ENUM(a1))); ++ sipRes = new QFlags(*a0 ^ a1); + %End + + // These are necessary to prevent Python comparing object IDs. |