packages/python/python-pyqt: We have Qt4.3.3 now, make use of it and enable the assis...

diff --git a/packages/python/python-pyqt/assistantclient-fix.patch b/packages/python/python-pyqt/assistantclient-fix.patch
new file mode 100644 (file)
index 0000000..eef0847
--- /dev/null
+++ b/packages/python/python-pyqt/assistantclient-fix.patch
@@ -0,0 +1,13 @@
+Index: PyQt-x11-gpl-4.3.3/sip/QtAssistant/qassistantclient.sip
+===================================================================
+--- PyQt-x11-gpl-4.3.3.orig/sip/QtAssistant/qassistantclient.sip       2008-01-07 13:31:35.000000000 +0100
++++ PyQt-x11-gpl-4.3.3/sip/QtAssistant/qassistantclient.sip    2008-01-07 13:32:20.000000000 +0100
+@@ -26,7 +26,7 @@
+ {
+ 
+ %TypeHeaderCode
+-#include <qassistantclient.h>
++#include <QtAssistant/qassistantclient.h>
+ %End
+ 
+ %ConvertToSubClassCode

diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb
index 0bb4b1e..773f646 100644 (file)
--- 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"