diff options
Diffstat (limited to 'packages/python/python-pyqt_4.3.3.bb')
| -rw-r--r-- | packages/python/python-pyqt_4.3.3.bb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb index 74a16c4720..2fd6fcc38b 100644 --- a/packages/python/python-pyqt_4.3.3.bb +++ b/packages/python/python-pyqt_4.3.3.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" LICENSE = "GPL" RDEPENDS = "python-core" SRCNAME = "pyqt" -PR = "ml0" +PR = "ml1" SRC_URI = "\ http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-${PV}.tar.gz \ @@ -14,7 +14,8 @@ SRC_URI = "\ file://01_configure.dpatch;patch=1 \ file://02_htmllinks.dpatch;patch=1 \ file://03_qreal.dpatch;patch=1 \ - file://04_qreal_api_fixes.dpatch;patch=1" + file://04_qreal_api_fixes.dpatch;patch=1 \ + file://assistantclient-fix.patch;patch=1" S = "${WORKDIR}/PyQt-x11-gpl-${PV}" inherit qt4x11 sip distutils-base @@ -23,11 +24,10 @@ PARALLEL_MAKE = "" QMAKE_PROFILES = "pyqt.pro" # NOTE: match with qt version we have in OE -EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_2 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" +EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_3 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" EXTRA_OEMAKE = " MAKEFLAGS= " -SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml" -# SIP_MODULES += "QtAssistant" +SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml QtAssistant" EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/Qt \ INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ DEFINES+=QT_NO_FPU" @@ -39,13 +39,13 @@ FIX_QREAL = "\ " do_generate_prepend() { - for i in ${FIX_QREAL}; do - sed -i -e s,qreal,float,g sip/$i - done + for i in ${FIX_QREAL}; do + sed -i -e s,qreal,float,g sip/$i + done } do_configure_prepend() { - echo "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro + printf "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro } do_stage() { |