fun with fixing pyqt

BKrev: 41601057RjdoClzbhNxdV4LgxVQ1XQ

diff --git a/python-sip/python-sip_4.0.1.oe b/python-sip/python-sip_4.0.1.oe
index ada1dc0..905407a 100644 (file)
--- a/python-sip/python-sip_4.0.1.oe
+++ b/python-sip/python-sip_4.0.1.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "virtual/libqte2 python"
 RDEPENDS = "python-core"
-PR = "r3"
+PR = "ml1"
 
 SRC_URI = "http://www.vanille.de/mirror/sip-${PV}.tar.gz"
 S = "${WORKDIR}/sip-${PV}/siplib"

diff --git a/python/python-pyqt_3.12.oe b/python/python-pyqt_3.12.oe
index 6607e81..0dcc3f3 100644 (file)
--- a/python/python-pyqt_3.12.oe
+++ b/python/python-pyqt_3.12.oe
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 RDEPENDS = "python-core python-sip"
 DEPENDS = "virtual/libqte2 virtual/libqpe"
 SRCNAME = "pyqt"
-PR = "r3"
+PR = "ml1"
 
 SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \
            file://features"
@@ -29,7 +29,7 @@ EXTRA_QMAKEVARS_POST = " QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BIN
                          INCLUDEPATH+=${STAGING_INCDIR}/python2.3 \
                          INCLUDEPATH+=${STAGING_INCDIR} \
                          LIBS+=-L${STAGING_LIBDIR}/python2.3/site-packages \
-                         LIBS+=-L${STAGING_LIBDIR} LIBS+=-lqte LIBS+=-lqpe "
+                         LIBS+=-L${QTDIR}/lib LIBS+=-lqte LIBS+=-lqpe "
 
 do_configure_prepend() {
     echo -e "TEMPLATE=subdirs\nSUBDIRS=qt qtcanvas qttable qtpe\n" >pyqt.pro