diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-01-07 23:55:54 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-01-07 23:55:54 +0000 |
| commit | 939f5d55c0e4e5d9b9f04f341c848cec4e226d6b (patch) | |
| tree | 5188223fbada2e2262834fbfd5da27ba52a2731e /packages/python/python-pyqt_4.3.3.bb | |
| parent | 62b156a0fef7fdb309a6d6cb0291ccd5b49a443e (diff) | |
| parent | bb3cd6d33b47a8aa00ad8dbef0411a7721720872 (diff) | |
merge of '676ed5b61806189cd1aeea21920d3c8fa842f8c7'
and 'f556521018478109967b108bb830f8109aefbb0e'
Diffstat (limited to 'packages/python/python-pyqt_4.3.3.bb')
| -rw-r--r-- | packages/python/python-pyqt_4.3.3.bb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb index 0bb4b1e588..2fd6fcc38b 100644 --- a/packages/python/python-pyqt_4.3.3.bb +++ b/packages/python/python-pyqt_4.3.3.bb @@ -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" @@ -45,7 +45,7 @@ do_generate_prepend() { } do_configure_prepend() { - echo -e "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro + printf "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro } do_stage() { |