From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 3 Oct 2004 14:44:39 +0000 (+0000)
Subject: fun with fixing pyqt
X-Git-Tag: Release-2010-05/1~16757
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf31ea7b666f4ef946e704248c02b86be944a810;p=openembedded.git

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 ada1dc09b3..905407a660 100644
--- 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 6607e8175c..0dcc3f32a4 100644
--- 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