[dev-python/PyQt4] add PyQt4-4.5 ebuild which fixes Python 2.5 support

This commit is contained in:
Fabio Erculiani
2009-06-15 11:58:29 +02:00
parent 593e9d6909
commit 2c856730e4
9 changed files with 539 additions and 0 deletions
+261
View File
@@ -0,0 +1,261 @@
# ChangeLog for dev-python/PyQt4
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.63 2009/06/09 20:45:17 hwoarang Exp $
09 Jun 2009; Markos Chandras <hwoarang@gentoo.org> PyQt4-4.4.4-r2.ebuild,
PyQt4-4.4.4-r4.ebuild, PyQt4-4.4.4-r5.ebuild:
Add correct sip dependencies, fixes bug 273430
*PyQt4-4.5 (09 Jun 2009)
09 Jun 2009; Markos Chandras <hwoarang@gentoo.org> +PyQt4-4.5.ebuild:
Version bump
05 Jun 2009; Ben de Groot <yngwin@gentoo.org> PyQt4-4.4.4-r5.ebuild:
Specify !kde for qt-phonon dep
03 Jun 2009; Ben de Groot <yngwin@gentoo.org> PyQt4-4.4.4-r5.ebuild,
metadata.xml:
Add kde useflag, for selecting media-sound/phonon, bug 270188
02 Jun 2009; Ben de Groot <yngwin@gentoo.org> PyQt4-4.4.4-r5.ebuild:
QtDesigner is triggered by USE=X, so hide sed behind X useflag. Thanks
to Davide Pesavento for alerting.
01 Jun 2009; Markos Chandras <hwoarang@gentoo.org>
+files/fix_license_check.patch:
Add missing patch. Fixes bug 272126
*PyQt4-4.4.4-r5 (01 Jun 2009)
01 Jun 2009; Markos Chandras <hwoarang@gentoo.org> +PyQt4-4.4.4-r5.ebuild,
files/configure.py.patch, metadata.xml:
Fixed automagic dependency issue. ( bug 236341 ). Fixed rpath issues ( bug
235819 , bug 271870 ). Thanks to Davide Pesavento <davidepesa@gmail.com>
for the ebuilds and the rpath patch.
20 May 2009; Ben de Groot <yngwin@gentoo.org> -PyQt4-4.4-r1.ebuild,
-PyQt4-4.4.4-r1.ebuild, -PyQt4-4.4.4-r3.ebuild, PyQt4-4.4.4-r4.ebuild:
Turn on default useflags for all Qt modules. Remove old. Move src_unpack
content to src_prepare, where it belongs.
15 May 2009; Alexis Ballier <aballier@gentoo.org> PyQt4-4.4.4-r4.ebuild:
keyword ~x86-fbsd, bug #269880
*PyQt4-4.4.4-r4 (26 Apr 2009)
26 Apr 2009; Markos Chandras <hwoarang@gentoo.org>
+files/PyQt4-4.4.4-qgraphicsproxywidget-avoid-event-callback-loop.patch,
+PyQt4-4.4.4-r4.ebuild:
Adding qt-xmlpatterns as dependency. Add patch for QGraphicsProxyWidget (
thanks to Fabio Erculiani <lxnay@sabayonlinux.org> for providing the patch
). Fixes bug #267012
*PyQt4-4.4.4-r3 (07 Apr 2009)
07 Apr 2009; Markos Chandras <hwoarang@gentoo.org>
+files/configure.py.patch, +PyQt4-4.4.4-r3.ebuild:
Fixed bug #204877 ( thanks to Davide Pesavento <davidepesa@gmail.com> )
27 Mar 2009; Jeroen Roovers <jer@gentoo.org> PyQt4-4.4.4-r2.ebuild:
Stable for HPPA (bug #261652).
24 Mar 2009; Brent Baude <ranger@gentoo.org> PyQt4-4.4.4-r2.ebuild:
stable ppc64, bug 261652
22 Mar 2009; Markus Meier <maekke@gentoo.org> PyQt4-4.4.4-r2.ebuild:
amd64 stable, bug #261652
20 Mar 2009; Raúl Porcel <armin76@gentoo.org> PyQt4-4.4.4-r2.ebuild:
alpha/ia64/sparc/x86 stable wrt #261652
20 Mar 2009; Brent Baude <ranger@gentoo.org> PyQt4-4.4.4-r2.ebuild:
stable ppc, bug 261652
20 Mar 2009; Markos Chandras <hwoarang@gentoo.org> -PyQt4-4.3.1.ebuild,
-PyQt4-4.3.3.ebuild:
Dropping old packages due to qt-4.3 removal
18 Feb 2009; Jeroen Roovers <jer@gentoo.org> PyQt4-4.4.4-r1.ebuild:
Stable for HPPA (bug #248083).
06 Feb 2009; Raúl Porcel <armin76@gentoo.org> PyQt4-4.4.4-r1.ebuild:
ia64/sparc stable wrt #248038
04 Feb 2009; Brent Baude <ranger@gentoo.org> PyQt4-4.4.4-r1.ebuild:
Marking PyQt4-4.4.4-r1 ppc64 stable for bug 248038
31 Jan 2009; Tobias Klausmann <klausman@gentoo.org> PyQt4-4.4.4-r1.ebuild:
Stable on alpha, bug #248038
*PyQt4-4.4.4-r2 (25 Jan 2009)
25 Jan 2009; Ben de Groot <yngwin@gentoo.org> +PyQt4-4.4.4-r2.ebuild:
Add dbus-python dep, thanks to Maciej Mrozowski. Remove no longer needed
zlib useflag check.
18 Jan 2009; Markus Meier <maekke@gentoo.org> PyQt4-4.4.4-r1.ebuild:
amd64/x86 stable, bug #248038
17 Jan 2009; nixnut <nixnut@gentoo.org> PyQt4-4.4.4-r1.ebuild:
ppc stable #248038
09 Jan 2009; Patrick Lauer <patrick@gentoo.org> -PyQt4-4.4.3.ebuild,
-PyQt4-4.4.4.ebuild:
Removing old
*PyQt4-4.4.4-r1 (23 Nov 2008)
23 Nov 2008; Patrick Lauer <patrick@gentoo.org> +PyQt4-4.4.4-r1.ebuild:
Adding webkit useflag. Fixes pykde failing to build because of ordering
issues.
*PyQt4-4.4.4 (21 Nov 2008)
21 Nov 2008; Ben de Groot <yngwin@gentoo.org> -PyQt4-4.4.2.ebuild,
PyQt4-4.4.3.ebuild, +PyQt4-4.4.4.ebuild:
Drop ~x86-fbsd, as qt-core isn't keyworded for that arch yet.
Version bump, with updated deps. Remove hardmasked 4.4.2 version.
07 Oct 2008; Jeroen Roovers <jer@gentoo.org> PyQt4-4.3.3.ebuild:
Stable for HPPA too.
*PyQt4-4.4.3 (06 Sep 2008)
06 Sep 2008; Ben de Groot <yngwin@gentoo.org> +PyQt4-4.4.3.ebuild:
Version bump. Fixes bug 234559.
06 Aug 2008; Jesus Rivero <neurogeek@gentoo.org> metadata.xml:
add GLEP 56 USE flag desc from use.local.desc
*PyQt4-4.4-r1 (31 Jul 2008)
31 Jul 2008; Jesus Rivero <neurogeek@gentoo.org>
+files/PyQt4-4.4_compile.patch, -PyQt4-4.4.ebuild, +PyQt4-4.4-r1.ebuild:
Fixes bugs #233369 and #222435, thanks to Remy Bosch for the patch.
Removed old version
25 May 2008; Ingmar Vanhassel <ingmar@gentoo.org> PyQt4-4.4.2.ebuild:
dev-python/PyQt4-4.4.2 needs Qt-4.4.0, fix dependencies, mask package.
*PyQt4-4.4.2 (24 May 2008)
24 May 2008; Ben de Groot <yngwin@gentoo.org> +PyQt4-4.4.2.ebuild:
Version bump. Updated homepage URL. Added split qt deps from bug 222709.
*PyQt4-4.4 (14 May 2008)
14 May 2008; Ali Polatel <hawking@gentoo.org> PyQt4-4.3.1.ebuild,
PyQt4-4.3.3.ebuild, +PyQt4-4.4.ebuild:
Version bump. Change SRC_URI of old ebuilds to mirror://gentoo because
upstream doesn't have it anymore.
13 May 2008; Ali Polatel <hawking@gentoo.org> PyQt4-4.3.1.ebuild,
PyQt4-4.3.3.ebuild:
Changed HOMEPAGE. Thanks to Elias Probst, #220653
12 May 2008; Markus Rothe <corsair@gentoo.org> PyQt4-4.3.3.ebuild:
Stable on ppc64
07 Apr 2008; Alexis Ballier <aballier@gentoo.org> PyQt4-4.3.3.ebuild:
keyword ~x86-fbsd
02 Mar 2008; Wulf C. Krueger <philantrop@gentoo.org> PyQt4-4.3.1.ebuild:
Marked stable on amd64 as per bug 201474.
21 Feb 2008; Raúl Porcel <armin76@gentoo.org> PyQt4-4.3.3.ebuild:
alpha/ia64/sparc stable
15 Feb 2008; nixnut <nixnut@gentoo.org> PyQt4-4.3.1.ebuild:
Stable on ppc wrt bug 201474
09 Feb 2008; Markus Ullmann <jokey@gentoo.org> PyQt4-4.3.3.ebuild:
Stable on x86
28 Dec 2007; Caleb Tennis <caleb@gentoo.org> PyQt4-4.3.1.ebuild,
PyQt4-4.3.3.ebuild:
Explicitly depend on Qt 4.3 for these versions
*PyQt4-4.3.3 (26 Dec 2007)
26 Dec 2007; Caleb Tennis <caleb@gentoo.org> +PyQt4-4.3.3.ebuild:
version bump
28 Nov 2007; Caleb Tennis <caleb@gentoo.org> -PyQt4-4.2.ebuild,
-PyQt4-4.3.ebuild:
Remove old versions
09 Nov 2007; Jeroen Roovers <jer@gentoo.org> PyQt4-4.3.1.ebuild:
Marked ~hppa (bug #198456). Fixed quoting issues.
07 Nov 2007; Raúl Porcel <armin76@gentoo.org> PyQt4-4.3.1.ebuild:
Add ~alpha/~ia64/~sparc
20 Oct 2007; Markus Rothe <corsair@gentoo.org> PyQt4-4.3.1.ebuild:
Added ~ppc64; bug #196474
*PyQt4-4.3.1 (02 Oct 2007)
02 Oct 2007; Caleb Tennis <caleb@gentoo.org> +PyQt4-4.3.1.ebuild:
version bump
22 Aug 2007; Robert Buchholz <rbu@gentoo.org> PyQt4-4.3.ebuild:
Added ~ppc (bug #188998)
21 Aug 2007; Caleb Tennis <caleb@gentoo.org> PyQt4-4.3.ebuild:
add a check for zlib, per bug #188389
*PyQt4-4.3 (09 Aug 2007)
09 Aug 2007; Caleb Tennis <caleb@gentoo.org> +PyQt4-4.3.ebuild:
Version bump
24 Jun 2007; Tiziano Müller <dev-zero@gentoo.org> PyQt4-4.2.ebuild:
Fixed $ROOT abuse (bug #167271) and some cleanup
30 May 2007; Caleb Tennis <caleb@gentoo.org> -PyQt4-4.0.ebuild,
-PyQt4-4.1.1.ebuild:
remove old versions
30 May 2007; Caleb Tennis <caleb@gentoo.org> PyQt4-4.2.ebuild:
Fix doc install per bug #160675
10 May 2007; Caleb Tennis <caleb@gentoo.org> PyQt4-4.2.ebuild:
fix from bug #177973
*PyQt4-4.2 (10 May 2007)
10 May 2007; Caleb Tennis <caleb@gentoo.org> +PyQt4-4.2.ebuild:
version bump
*PyQt4-4.1.1 (20 Dec 2006)
20 Dec 2006; Markus Ullmann <jokey@gentoo.org> -PyQt4-4.1.ebuild,
+PyQt4-4.1.1.ebuild:
Version bump
15 Nov 2006; Caleb Tennis <caleb@gentoo.org> -PyQt4-4.0_beta1.ebuild:
remove old version
*PyQt4-4.1 (14 Nov 2006)
14 Nov 2006; Caleb Tennis <caleb@gentoo.org> +PyQt4-4.1.ebuild:
version bump
22 Oct 2006; Thomas Cort <tcort@gentoo.org> PyQt4-4.0.ebuild:
Added ~amd64 keyword wrt Bug #137948.
11 Jul 2006; Caleb Tennis <caleb@gentoo.org> PyQt4-4.0.ebuild:
Fix a few minor issues with ebuild
*PyQt4-4.0 (26 Jun 2006)
26 Jun 2006; Caleb Tennis <caleb@gentoo.org> +PyQt4-4.0.ebuild:
adding the release version
*PyQt4-4.0_beta1 (05 May 2006)
05 May 2006; Caleb Tennis <caleb@gentoo.org> +metadata.xml,
+PyQt4-4.0_beta1.ebuild:
initial import, from bug #121554
+9
View File
@@ -0,0 +1,9 @@
AUX PyQt4-4.4.4-qgraphicsproxywidget-avoid-event-callback-loop.patch 1004 RMD160 5fa5609d31b53978846999be8045c75b940c3dd1 SHA1 a7122535d44bd8a81984870e98322b14521d2ced SHA256 db539a666d834756013fc48012914dd181116df7f5d1d21485ff947e20441eed
AUX PyQt4-4.4_compile.patch 883 RMD160 016122f1e9cbf8c74da760fd094e280fd5ec0257 SHA1 b745edae97d52882b44a53461b98c96e11dbee20 SHA256 dc95ae5b5f7d07431d563c2035d68c6097b8f20dbb2285d2762066938c69e830
AUX PyQt4-4.5-python2.5-support.patch 1379 RMD160 fc404c114bf20df9527f065a70633714b8b27734 SHA1 8895ac68bf9f8e01b23c04e2ffb1afb9b36996d6 SHA256 c1682e181f4e40f8d417dfe85b155ff661ae2e1cddf01023d806c4597ce875e8
AUX configure.py.patch 1727 RMD160 31802058d0b0488264cdbcfeebd7ce9aff250957 SHA1 df4fee27f1486422b25d0072cfc388b207814c8f SHA256 06ee44a9fe43615b6bfada4aa7294303c016fd7c378ddf537823e33546306926
AUX fix_license_check.patch 643 RMD160 f8934e527bb8bf4f9edf98e068c07fc7b3380d97 SHA1 41fa9b3962add04c8196695c9d9b82b69d7d3ea8 SHA256 117025432a5db37375554577c66edbe7a6fdef6e120fb865b2f4304961dc2c42
DIST PyQt-x11-gpl-4.5.tar.gz 6941757 RMD160 bf90e4597faa4f117fc217620a706efbf28065b1 SHA1 0c66f55d93c6fbb0c6fe5ae31be57037c1a829e0 SHA256 10ee02736b2020dbf4f23cd782e902ac4e9ded160f18eaa4db99fa9254f17110
EBUILD PyQt4-4.5-r1.ebuild 3170 RMD160 bdcf1a5945b006f6269cd21f8e8d431bda27cf47 SHA1 45d6b26f7c77d34d518be1c3e2f5ea641c10c9df SHA256 303186e395a73127fcfe66e1cb038a2a23f8604766bb8155b215309ba8eb783e
MISC ChangeLog 8732 RMD160 c7e54d2765665ae3074cc85d93f5c2895e83939a SHA1 e3c792057c87f036de03f44f6c4c52b26ffef74d SHA256 925c72b4990035572641390c572cbcb80917fed8574d8afebb7b471ad2116081
MISC metadata.xml 859 RMD160 3da7dcc5dc212af8ed4f98e73c561f2365081c98 SHA1 f607feed53689fa15b62d474d6763bc674fbcb2a SHA256 00475be82d27e0e1dab95eafcea3751ae70ee39b53a268063772d76752556d8b
+115
View File
@@ -0,0 +1,115 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.5.ebuild,v 1.1 2009/06/09 18:53:57 hwoarang Exp $
EAPI="2"
inherit distutils qt4
MY_P=PyQt-x11-gpl-${PV}
QTVER="4.5.1"
DESCRIPTION="A set of Python bindings for the Qt toolkit"
HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/"
SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz"
SLOT="0"
LICENSE="|| ( GPL-2 GPL-3 )"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="X assistant +dbus debug doc examples kde opengl phonon +qt3support sql svg webkit xmlpatterns"
DEPEND=">=dev-python/sip-4.8
>=x11-libs/qt-core-${QTVER}:4[qt3support?]
>=x11-libs/qt-script-${QTVER}:4
>=x11-libs/qt-test-${QTVER}:4
X? ( >=x11-libs/qt-gui-${QTVER}:4[dbus?,qt3support?] )
assistant? ( >=x11-libs/qt-assistant-${QTVER}:4 )
dbus? (
>=dev-python/dbus-python-0.80
>=x11-libs/qt-dbus-${QTVER}:4
)
opengl? ( >=x11-libs/qt-opengl-${QTVER}:4[qt3support?] )
phonon? (
!kde? ( || ( >=x11-libs/qt-phonon-${QTVER}:4 media-sound/phonon ) )
kde? ( media-sound/phonon )
)
qt3support? ( >=x11-libs/qt-qt3support-${QTVER}:4 )
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}/configure.py.patch"
"${FILESDIR}/fix_license_check.patch"
"${FILESDIR}/${P}-python2.5-support.patch"
)
pyqt4_use_enable() {
use $1 && echo "--enable=${2:-$1}"
}
src_prepare() {
if ! use dbus; then
sed -i -e 's,^\([[:blank:]]\+\)check_dbus(),\1pass,' \
"${S}"/configure.py || die
fi
qt4_src_prepare
}
src_configure() {
distutils_python_version
local myconf="${python} configure.py
--confirm-license
--bindir=/usr/bin
--destdir=$(python_get_sitedir)
--sipdir=/usr/share/sip
$(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 assistant QtAssistant)
$(pyqt4_use_enable assistant QtHelp)
$(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)"
echo ${myconf}
${myconf} || die "configuration failed"
# Fix insecure runpath
if use X ; then
for pkg in QtDesigner QtGui QtCore; do
sed -i -e "/^LFLAGS/s:-Wl,-rpath,${S}/qpy/${pkg}::" \
"${S}"/${pkg}/Makefile || die "failed to fix rpath issues"
done
fi
}
src_install() {
python_need_rebuild
# INSTALL_ROOT is needed for the QtDesigner module,
# the other Makefiles use DESTDIR.
emake DESTDIR="${D}" INSTALL_ROOT="${D}" install || die "installation failed"
dodoc ChangeLog NEWS THANKS || die
if use doc; then
dohtml -r doc/html/* || die
fi
if use examples; then
insinto /usr/share/doc/${PF}
doins -r examples || die
fi
}
@@ -0,0 +1,16 @@
diff -Nurp PyQt-x11-gpl-4.4.4.orig/sip/QtGui/qgraphicsproxywidget.sip PyQt-x11-gpl-4.4.4/sip/QtGui/qgraphicsproxywidget.sip
--- PyQt-x11-gpl-4.4.4.orig/sip/QtGui/qgraphicsproxywidget.sip 2008-11-08 12:55:56.000000000 +0100
+++ PyQt-x11-gpl-4.4.4/sip/QtGui/qgraphicsproxywidget.sip 2009-04-21 21:59:09.938689971 +0200
@@ -87,6 +87,12 @@ protected:
virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
+
+ virtual void dragEnterEvent(QGraphicsSceneDragDropEvent *event);
+ virtual void dragLeaveEvent(QGraphicsSceneDragDropEvent *event);
+ virtual void dragMoveEvent(QGraphicsSceneDragDropEvent *event);
+ virtual void dropEvent(QGraphicsSceneDragDropEvent *event);
+
virtual void wheelEvent(QGraphicsSceneWheelEvent *event);
virtual void keyPressEvent(QKeyEvent *event);
virtual void keyReleaseEvent(QKeyEvent *event);
@@ -0,0 +1,21 @@
diff -ru PyQt-x11-gpl-4.4_old/designer/pluginloader.cpp PyQt-x11-gpl-4.4/designer/pluginloader.cpp
--- PyQt-x11-gpl-4.4_old/designer/pluginloader.cpp 2008-05-20 20:12:41.000000000 +0200
+++ PyQt-x11-gpl-4.4/designer/pluginloader.cpp 2008-05-20 20:13:37.000000000 +0200
@@ -280,7 +280,7 @@
// Return the named attribute object from the named module.
PyObject *PyCustomWidgets::getModuleAttr(const char *module, const char *attr)
{
-#if PY_VERSION_HEX >= 0x020500
+#if PY_VERSION_HEX >= 0x02050000
PyObject *mod = PyImport_ImportModule(module);
#else
PyObject *mod = PyImport_ImportModule(const_cast<char *>(module));
@@ -292,7 +292,7 @@
return 0;
}
-#if PY_VERSION_HEX >= 0x020500
+#if PY_VERSION_HEX >= 0x02050000
PyObject *obj = PyObject_GetAttrString(mod, attr);
#else
PyObject *obj = PyObject_GetAttrString(mod, const_cast<char *>(attr));
@@ -0,0 +1,36 @@
diff -Nurp PyQt-x11-gpl-4.5.orig/pyuic/uic/port_v3/invoke.py PyQt-x11-gpl-4.5/pyuic/uic/port_v3/invoke.py
--- PyQt-x11-gpl-4.5.orig/pyuic/uic/port_v3/invoke.py 2009-06-05 10:50:39.000000000 +0200
+++ PyQt-x11-gpl-4.5/pyuic/uic/port_v3/invoke.py 2009-06-15 11:48:38.669751531 +0200
@@ -11,16 +11,16 @@ def invoke(driver):
try:
exit_status = driver.invoke()
- except IOError as e:
+ except IOError, e:
driver.on_IOError(e)
- except SyntaxError as e:
+ except SyntaxError, e:
driver.on_SyntaxError(e)
- except NoSuchWidgetError as e:
+ except NoSuchWidgetError, e:
driver.on_NoSuchWidgetError(e)
- except Exception as e:
+ except Exception, e:
driver.on_Exception(e)
return exit_status
diff -Nurp PyQt-x11-gpl-4.5.orig/pyuic/uic/port_v3/load_plugin.py PyQt-x11-gpl-4.5/pyuic/uic/port_v3/load_plugin.py
--- PyQt-x11-gpl-4.5.orig/pyuic/uic/port_v3/load_plugin.py 2009-06-05 10:50:39.000000000 +0200
+++ PyQt-x11-gpl-4.5/pyuic/uic/port_v3/load_plugin.py 2009-06-15 11:48:52.198928024 +0200
@@ -11,7 +11,7 @@ def load_plugin(plugin, plugin_globals,
exec(plugin.read(), plugin_globals, plugin_locals)
except ImportError:
return False
- except Exception as e:
+ except Exception, e:
raise WidgetPluginError("%s: %s" % (e.__class__, str(e)))
return True
+47
View File
@@ -0,0 +1,47 @@
diff -Naur PyQt-x11-gpl-4.4.4~orig/configure.py PyQt-x11-gpl-4.4.4/configure.py
--- PyQt-x11-gpl-4.4.4~orig/configure.py 2009-06-01 01:54:27.000000000 +0200
+++ PyQt-x11-gpl-4.4.4/configure.py 2009-06-01 01:55:57.000000000 +0200
@@ -300,7 +300,8 @@
check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
check_module("QtXml", "qdom.h", "new QDomDocument()")
check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
- check_module("phonon", "phonon", "new Phonon::VideoWidget()")
+ check_module("phonon", "videowidget.h", "new Phonon::VideoWidget()",
+ extra_include_dirs=["/usr/include/phonon"])
check_module("QtAssistant", "qassistantclient.h",
"new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs,
extra_libs=ass_libs)
@@ -394,7 +395,7 @@
generate_code("QtXmlPatterns")
if "phonon" in pyqt_modules:
- generate_code("phonon")
+ generate_code("phonon", extra_include_dirs=["/usr/include/phonon"])
if "QtAssistant" in pyqt_modules:
generate_code("QtAssistant")
@@ -666,6 +667,7 @@
install_dir=pydbusmoddir,
qt=["QtCore"],
debug=opts.debug,
+ strip=0,
universal=sipcfg.universal
)
@@ -1350,6 +1352,7 @@
warnings=1,
static=opts.static,
debug=opts.debug,
+ strip=0,
universal=sipcfg.universal
)
@@ -1510,7 +1513,7 @@
# The Qt binary installer has macx-xcode as the default.
args = "-spec macx-g++ " + args
- return args
+ return " QMAKE_STRIP= " + args
def get_qt_configuration():
@@ -0,0 +1,14 @@
Index: configure.py
===================================================================
--- configure.py
+++ configure.py
@@ -1469,7 +1469,8 @@ def check_license():
# Common checks.
if qt_edition and ltype != "internal":
if qt_edition != "free" and ltype == "GPL":
- sipconfig.error("This version of PyQt and the %s edition of Qt have incompatible licenses." % qt_edition)
+ if qt_edition != "Desktop":
+ sipconfig.error("This version of PyQt and the %s edition of Qt have incompatible licenses." % qt_edition)
# Confirm the license if not already done.
if not opts.license_confirmed:
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
<herd>qt</herd>
<use>
<flag name='X'>Build the QtGui and QtDesigner modules</flag>
<flag name='assistant'>Build the QtHelp and QtAssistant modules</flag>
<flag name='kde'>
Select <pkg>media-sound/phonon</pkg> as phonon variant needed for kde
</flag>
<flag name='opengl'>Build the QtOpenGL module</flag>
<flag name='phonon'>Build the phonon module</flag>
<flag name='qt3support'>Enable the Qt3Support libraries for Qt4</flag>
<flag name='sql'>Build the QtSql module</flag>
<flag name='svg'>Build the QtSvg module</flag>
<flag name='webkit'>Build the QtWebKit module</flag>
<flag name='xmlpatterns'>Build the QtXmlPatterns module</flag>
</use>
</pkgmetadata>