Merge bk://openembedded@openembedded.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/06/26 17:33:03+02:00 uni-frankfurt.de!mickey
revamp python-sip and python-qt to comply with the
new build scheme introduced by sip v4. this patch will probably break everything, so please test :D

BKrev: 40dd9735ygV0b2fXsumXrza5v8T0Gw

diff --git a/libsip/libsip_3.10.1.oe b/libsip/libsip_3.10.1.oe
deleted file mode 100644 (file)
index 22ee2b5..0000000
--- a/libsip/libsip_3.10.1.oe
+++ /dev/null
@@ -1,42 +0,0 @@
-DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
-LICENSE = "GPL"
-DEPENDS = "virtual/libqte2 python"
-
-SRC_URI = "http://www.vanille.de/mirror/sip-${PV}.tar.gz"
-S = "${WORKDIR}/sip-${PV}/siplib"
-
-inherit qmake
-
-QMAKE_PROFILES = "siplib.pro.in"
-
-export QTDIR = "${STAGING_LIBDIR}/.."
-
-#
-# Warning: passing ' "FOO=BAR" results in double ""FOO=BAR"" which is then ignored by qmake
-#
-
-EXTRA_QMAKEVARS_POST = " CONFIG=qte \
-                         DESTDIR=${STAGING_LIBDIR}/python2.3/site-packages \
-                         TARGET=sip \
-                         DEFINES=SIP_MAKE_DLL \
-                         DEFINES+=SIP_QT_SUPPORT \
-                         INCLUDEPATH=. \
-                         INCLUDEPATH+=${STAGING_INCDIR}/python2.3 \
-                         INCLUDEPATH+=${STAGING_INCDIR} "
-
-
-#
-# It would be nice if I could use spaces, e.g. CONFIG=qt warn_off release dll
-#
-
-do_compile() {
-    oe_runmake LINK="${CC}" LIBS=""
-}
-
-do_stage() {
-    install -m 0644 sip.h ${STAGING_INCDIR}/sip.h
-    install -m 0644 sipQt.h ${STAGING_INCDIR}/sipQt.h
-}

diff --git a/python/python-pyqt-3.11/features b/python-sip/python-sip_4.0.oe
similarity index 100%
rename from python/python-pyqt-3.11/features
rename to python-sip/python-sip_4.0.oe

diff --git a/python/python-pyqt-3.12/features b/python/python-pyqt-3.12/features
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/python/python-pyqt_3.11.oe b/python/python-pyqt_3.11.oe
deleted file mode 100644 (file)
index af661ce..0000000
--- a/python/python-pyqt_3.11.oe
+++ /dev/null
@@ -1,57 +0,0 @@
-DESCRIPTION = "Python Qt/Embedded + Qt/Palmtop Bindings"
-HOMEPAGE = "http://www.vanille.de/projects/python.spy"
-SECTION = "devel/python"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "GPL"
-RDEPENDS = "python-core"
-DEPENDS = "virtual/libqte2 virtual/libqpe"
-SRCNAME = "pyqt"
-PR = "2"
-
-SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \
-           file://features"
-S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
-
-inherit qmake sip
-
-QMAKE_PROFILES = "pyqt.pro"
-EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1"
-SIP_MODULES = "qt qtcanvas qttable qtpe"
-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 \
-                         TARGET=cmodule DESTDIR= VERSION=1.0.0 \
-                         DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT DEFINES+=QWS \
-                         INCLUDEPATH=. \
-                         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+=-lsip "
-
-do_configure_prepend() {
-    echo -e "TEMPLATE=subdirs\nSUBDIRS=qt qtcanvas qttable qtpe\n" >pyqt.pro
-}
-
-do_stage() {
-    install -d ${STAGING_SIPDIR}/qt/
-    for module in ${SIP_MODULES}
-    do
-        cp -a ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/
-       install -m 0755 ${module}/libcmodule.so ${STAGING_LIBDIR}/python2.3/site-packages/lib${module}cmodule.so
-    done
-}
-
-do_install() {
-    install -d ${D}/${libdir}/python2.3/site-packages/
-    oe_libinstall -so -C ${STAGING_LIBDIR}/python2.3/site-packages libsip ${D}/${libdir}/python2.3/site-packages
-    for module in ${SIP_MODULES}
-    do
-       install -m 0755 ${module}/libcmodule.so ${D}/${libdir}/python2.3/site-packages/lib${module}cmodule.so
-        install -m 0644 ${module}/${module}.py ${D}/${libdir}/python2.3/site-packages/
-    done
-}
-
-FILES_${PN} = "/usr/lib/python2.3/site-packages"

diff --git a/python/python-pyqt_3.12.oe b/python/python-pyqt_3.12.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/sip/sip4-native_4.0.oe b/sip/sip4-native_4.0.oe
new file mode 100644 (file)
index 0000000..e69de29