python-pyqwt: make it build again, make it work w/ qte/qte-mt

diff --git a/packages/python/python-pyqwt_3.10.bb b/packages/python/python-pyqwt_3.10.bb
index 8677ed0..8e47c04 100644 (file)
--- a/packages/python/python-pyqwt_3.10.bb
+++ b/packages/python/python-pyqwt_3.10.bb
@@ -7,14 +7,14 @@ LICENSE = "GPL"
 RDEPENDS = "python-core python-sip python-pyqt (>=${PV}) python-numeric qwt"
 DEPENDS = "virtual/libqte2 python-numeric python-pyqt qwt"
 SRCNAME = "pyqwt"
-PR = "ml3"
+PR = "ml4"
 
 SRC_URI = "http://www.vanille.de/mirror/PyQwt-20040118.tar.gz \
            file://qt2.x-compat.patch;patch=1 \
            file://features"
 S = "${WORKDIR}/PyQwt-20040118"
 
-inherit qmake sip distutils-base
+inherit palmtop sip distutils-base
 
 QMAKE_PROFILES = "pyqwt.pro"
 EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1"
@@ -22,14 +22,16 @@ SIP_MODULES = "qwt"
 SIP_FEATURES = "${WORKDIR}/features"   
 EXTRA_OEMAKE = " MAKEFLAGS= "
 
-EXTRA_QMAKEVARS_POST += "CONFIG=qt CONFIG+=warn_on CONFIG+=release \
-                         TARGET=qwt DESTDIR= VERSION=1.0.0 \
-                         DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT DEFINES+=HAS_NUMERIC DEFINES+=QWS \
+EXTRA_QMAKEVARS_POST += "TARGET=qwt \
+                         DESTDIR= \
+                         VERSION=1.0.0 \
+                         DEFINES+=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT \
+                         DEFINES+=HAS_NUMERIC DEFINES+=QWT_NO_MEMARRAY \
                          INCLUDEPATH+=../numpy \
+                         INCLUDEPATH+=${S}/qwt-sources/include \
                          INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \
                          INCLUDEPATH+=${STAGING_INCDIR} \
-                         LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages \
-                         LIBS+=-L${QTDIR}/lib LIBS+=-lqte LIBS+=-lqpe "
+                         LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages"
 
 do_generate_prepend() {
     echo -e "TEMPLATE=subdirs\nSUBDIRS=qwt\n" >pyqwt.pro