diff options
Diffstat (limited to 'packages/python')
| -rw-r--r-- | packages/python/python-pyqt_4.3.bb (renamed from packages/python/python-pyqt_4.2.bb) | 19 | ||||
| -rw-r--r-- | packages/python/python24-pyqt2_3.13.bb | 2 | ||||
| -rw-r--r-- | packages/python/python24-pyqwt2_3.10.bb | 2 |
3 files changed, 19 insertions, 4 deletions
diff --git a/packages/python/python-pyqt_4.2.bb b/packages/python/python-pyqt_4.3.bb index 64a9a71f68..c867598b4f 100644 --- a/packages/python/python-pyqt_4.2.bb +++ b/packages/python/python-pyqt_4.3.bb @@ -10,14 +10,29 @@ PR = "ml0" SRC_URI = "http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-${PV}.tar.gz \ file://cross-compile.patch;patch=1" + +BROKEN = "1" +# Something really fishy wrt. to arm/mips/etc. double vs. qreal. May even be a problem in Qt headers itself. +# Symptons: +#| sipQtCoreQTimeLine.cpp:136: error: conflicting return type specified for 'virtual double sipQTimeLine::valueForTime(int) const' +#| /home/pkg/oe/fic-gta01/tmp/staging/arm-angstrom-linux-gnueabi/qt4/include/QtCore/qtimeline.h:92: error: overriding 'virtual qreal QTimeLine::valueForTime(int) const' +# And: +#| sipQtCoreQRectF.cpp: In function 'PyObject* meth_QRectF_getRect(PyObject*, PyObject*)': +#| sipQtCoreQRectF.cpp:1182: error: no matching function for call to 'QRectF::getRect(double*, double*, double*, double*)' +#| /home/pkg/oe/fic-gta01/tmp/staging/arm-angstrom-linux-gnueabi/qt4/include/QtCore/qrect.h:725: note: candidates are: void QRectF::getRect(qreal*, qreal*, qreal*, qreal*) const +#| sipQtCoreQRectF.cpp: In function 'PyObject* meth_QRectF_getCoords(PyObject*, PyObject*)': +#| sipQtCoreQRectF.cpp:1237: error: no matching function for call to 'QRectF::getCoords(double*, double*, double*, double*)' +#| /home/pkg/oe/fic-gta01/tmp/staging/arm-angstrom-linux-gnueabi/qt4/include/QtCore/qrect.h:741: note: candidates are: void QRectF::getCoords(qreal*, qreal*, qreal*, qreal*) const +#| make[1]: *** [sipQtCoreQRectF.o] Error 1 + S = "${WORKDIR}/PyQt-x11-gpl-${PV}" -inherit qmake qt4x11 sip4 distutils-base +inherit qmake qt4x11 sip distutils-base PARALLEL_MAKE = "" QMAKE_PROFILES = "pyqt.pro" -EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_2 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" +EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" EXTRA_OEMAKE = " MAKEFLAGS= " SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml" diff --git a/packages/python/python24-pyqt2_3.13.bb b/packages/python/python24-pyqt2_3.13.bb index 2c9916b366..04493857dc 100644 --- a/packages/python/python24-pyqt2_3.13.bb +++ b/packages/python/python24-pyqt2_3.13.bb @@ -14,7 +14,7 @@ SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \ file://features" S = "${WORKDIR}/PyQt-x11-gpl-${PV}" -inherit palmtop sip distutils-base +inherit palmtop sip3 distutils-base QMAKE_PROFILES = "pyqt.pro" EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" diff --git a/packages/python/python24-pyqwt2_3.10.bb b/packages/python/python24-pyqwt2_3.10.bb index d78bba7e8a..28f4080c45 100644 --- a/packages/python/python24-pyqwt2_3.10.bb +++ b/packages/python/python24-pyqwt2_3.10.bb @@ -13,7 +13,7 @@ SRC_URI = "http://www.vanille.de/mirror/PyQwt-20040118.tar.gz \ file://features" S = "${WORKDIR}/PyQwt-20040118" -inherit palmtop sip distutils-base +inherit palmtop sip3 distutils-base QMAKE_PROFILES = "pyqwt.pro" EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" |