diff options
author | Michael Lauer <mickey@vanille-media.de> | 2004-03-12 19:18:35 +0000 |
---|---|---|
committer | Michael Lauer <mickey@vanille-media.de> | 2004-03-12 19:18:35 +0000 |
commit | 2905d46d01c012b82632057383e23657f1ae0703 (patch) | |
tree | a6924785a687f41c2f9162d05df485993288ea0d | |
parent | 619ef9306dce99893c796b8ad436e6c7ef443453 (diff) |
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages
2004/03/12 20:18:30+01:00 uni-frankfurt.de!mickey
fix korganizer SRC_URI. recent releases need libopie1 (d'oh!)
BKrev: 40520d0bB24NXyiBQHJEfXYt2lWrpQ
-rw-r--r-- | nonworking/korganizer/korganizer-embedded_1.6.2a.oe (renamed from nonworking/korganizer/korganizer-embedded_1.6.1a.oe) | 0 | ||||
-rw-r--r-- | python/python-pyqt-3.10/libqpe-opie.patch | 0 | ||||
-rw-r--r-- | python/python-pyqt-3.11/features (renamed from python/python-pyqt-3.10/features) | 0 | ||||
-rw-r--r-- | python/python-pyqt_3.10.oe | 66 | ||||
-rw-r--r-- | python/python-pyqt_3.11.oe (renamed from python/python-pyqt-3.10/add-missing-feature-test.patch) | 0 |
5 files changed, 0 insertions, 66 deletions
diff --git a/nonworking/korganizer/korganizer-embedded_1.6.1a.oe b/nonworking/korganizer/korganizer-embedded_1.6.2a.oe index e69de29bb2..e69de29bb2 100644 --- a/nonworking/korganizer/korganizer-embedded_1.6.1a.oe +++ b/nonworking/korganizer/korganizer-embedded_1.6.2a.oe diff --git a/python/python-pyqt-3.10/libqpe-opie.patch b/python/python-pyqt-3.10/libqpe-opie.patch deleted file mode 100644 index e69de29bb2..0000000000 --- a/python/python-pyqt-3.10/libqpe-opie.patch +++ /dev/null diff --git a/python/python-pyqt-3.10/features b/python/python-pyqt-3.11/features index e69de29bb2..e69de29bb2 100644 --- a/python/python-pyqt-3.10/features +++ b/python/python-pyqt-3.11/features diff --git a/python/python-pyqt_3.10.oe b/python/python-pyqt_3.10.oe deleted file mode 100644 index 6757a910ec..0000000000 --- a/python/python-pyqt_3.10.oe +++ /dev/null @@ -1,66 +0,0 @@ -DESCRIPTION="Python Qt/Embedded + Qt/Palmtop Bindings" -SECTION=base -PRIORITY=optional -MAINTAINER="Michael Lauer <mickey@Vanille.de>" -LICENSE=GPL -RDEPENDS=python-core libqte2 libqpe1 -DEPENDS=virtual/libc virtual/libqte2 virtual/libqpe libsip sip-native -SRCNAME=pyqt - -SRC_URI = http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \ - file://${FILESDIR}/libqpe-opie.patch;patch=1 \ - file://${FILESDIR}/add-missing-feature-test.patch;patch=1 - -S = ${WORKDIR}/PyQt-x11-gpl-${PV} - -inherit qmake - -export QTDIR=${STAGING_DIR}/target - -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 \ - DESTDIR=${STAGING_LIBDIR}/python2.3/site-packages \ - DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT \ - 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 ' - -PYTHON=${STAGING_BINDIR}/python -SIP=${STAGING_BINDIR}/sip -QMAKE=${STAGING_BINDIR}/qmake -QMAKESPEC=${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-${TARGET_ARCH}-g++ - -MODULES=qt qtcanvas qtnetwork qttable qtpe - -do_configure() { - for module in ${MODULES} - do - mkdir -p ${module} - ${SIP} -Isip -tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1 -z${FILESDIR}/features -c ${module} -m ${module}.pro.in sip/${module}/${module}mod.sip - mv -f ${module}.pro.in ${module}/${module}.pro - done - - for module in ${MODULES} - do - cd ${S}/${module} - ${QMAKE} -spec ${QMAKESPEC} -after TARGET=${module}cmodule ${EXTRA_QMAKEVARS_POST} - done -} - -do_compile() { - for module in ${MODULES} - do - cd ${S}/${module} - oe_runmake - done -} - -do_stage() { - install -d ${STAGING_SIPDIR} - for module in ${MODULES} - do - cp -a ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/ - done -} diff --git a/python/python-pyqt-3.10/add-missing-feature-test.patch b/python/python-pyqt_3.11.oe index e69de29bb2..e69de29bb2 100644 --- a/python/python-pyqt-3.10/add-missing-feature-test.patch +++ b/python/python-pyqt_3.11.oe |