diff options
| -rw-r--r-- | classes/sip.oeclass | 6 | ||||
| -rw-r--r-- | python-sip/python-sip_4.0.1.oe | 12 | ||||
| -rw-r--r-- | python/python-pyqt_3.12.oe | 4 |
3 files changed, 9 insertions, 13 deletions
diff --git a/classes/sip.oeclass b/classes/sip.oeclass index 7102980a23..837a31675d 100644 --- a/classes/sip.oeclass +++ b/classes/sip.oeclass @@ -32,7 +32,11 @@ sip_do_generate() { oenote "calling 'sip -I sip -I ${STAGING_SIPDIR} ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.pro.in sip/${module}/${module}mod.sip'" sip -I ${STAGING_SIPDIR} -I sip ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.sbf sip/${module}/${module}mod.sip \ || die "Error calling sip on ${module}" - cat ${module}/${module}.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, >${module}/${module}.pro + cat ${module}/${module}.sbf | sed s,target,TARGET, \ + | sed s,sources,SOURCES, \ + | sed s,headers,HEADERS, \ + | sed s,"moc_HEADERS =","HEADERS +=", \ + >${module}/${module}.pro echo "TEMPLATE=lib" >>${module}/${module}.pro [ "${module}" = "qt" ] && echo "" >>${module}/${module}.pro [ "${module}" = "qtcanvas" ] && echo "" >>${module}/${module}.pro diff --git a/python-sip/python-sip_4.0.1.oe b/python-sip/python-sip_4.0.1.oe index b7282ee93b..76d316e154 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 = "r1" +PR = "r2" SRC_URI = "http://www.vanille.de/mirror/sip-${PV}.tar.gz" S = "${WORKDIR}/sip-${PV}/siplib" @@ -14,12 +14,8 @@ inherit qmake export QTDIR = "${STAGING_LIBDIR}/.." -# -# Warning: passing ' "FOO=BAR" results in double ""FOO=BAR"" which is then ignored by qmake -# - EXTRA_QMAKEVARS_POST = " TEMPLATE=lib \ - CONFIG=qte \ + CONFIG=qt \ DESTDIR= \ VERSION=1.0.0 \ TARGET=sip \ @@ -29,10 +25,6 @@ EXTRA_QMAKEVARS_POST = " TEMPLATE=lib \ INCLUDEPATH+=${STAGING_INCDIR}" -# -# It would be nice if I could use spaces, e.g. CONFIG=qt warn_off release dll -# - do_configure_prepend() { cat siplib.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > siplib.pro } diff --git a/python/python-pyqt_3.12.oe b/python/python-pyqt_3.12.oe index a7c856114b..6607e8175c 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 = "r2" +PR = "r3" SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \ file://features" @@ -22,7 +22,7 @@ SIP_FEATURES = "${WORKDIR}/features" EXTRA_OEMAKE = " MAKEFLAGS= " EXTRA_QMAKEVARS_POST = " QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, \ - CONFIG=qte CONFIG+=warn_on CONFIG+=release \ + CONFIG=qt CONFIG+=warn_on CONFIG+=release \ DESTDIR= VERSION=1.0.0 \ DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT DEFINES+=QWS \ INCLUDEPATH=. \ |