From 843ecca5c576542e407919aa719b23ffb89cfc15 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 11 Dec 2007 12:41:43 +0000 Subject: python-pydirectfb: commit missing patch --- packages/python/python-pydirectfb/.mtn2git_empty | 0 .../python-pydirectfb/fix-directfb-detection.patch | 16 ++++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 packages/python/python-pydirectfb/.mtn2git_empty create mode 100644 packages/python/python-pydirectfb/fix-directfb-detection.patch (limited to 'packages/python') diff --git a/packages/python/python-pydirectfb/.mtn2git_empty b/packages/python/python-pydirectfb/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/python/python-pydirectfb/fix-directfb-detection.patch b/packages/python/python-pydirectfb/fix-directfb-detection.patch new file mode 100644 index 0000000000..c8b7cc805a --- /dev/null +++ b/packages/python/python-pydirectfb/fix-directfb-detection.patch @@ -0,0 +1,16 @@ +Index: pydirectfb/setup.py +=================================================================== +--- pydirectfb.orig/setup.py ++++ pydirectfb/setup.py +@@ -11,9 +11,10 @@ + Check dependencies add add the flags to include_dirs, library_dirs and + libraries. The basic logic is taken from pygame. + """ +- command = name + '-config --version --cflags --libs 2>/dev/null' ++ command = 'pkg-config %s --modversion --cflags --libs 2>/dev/null' % name + try: + config = os.popen(command).readlines() ++ print config + if len(config) == 0: + raise ValueError, 'command not found' + flags = (' '.join(config[1:]) + ' ').split() -- cgit v1.2.3 From 7a7ac89e3479c80a107f9363336567b29cd963bd Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 13 Dec 2007 12:45:55 +0000 Subject: sip: upgrade sip-native and python-sip to 4.7.3 * 4.7.1 had become unfetchable * verified successful compilation in Sonkei --- packages/python/python-sip_4.7.1.bb | 42 ------------------------------------- packages/python/python-sip_4.7.3.bb | 42 +++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 packages/python/python-sip_4.7.1.bb create mode 100644 packages/python/python-sip_4.7.3.bb (limited to 'packages/python') diff --git a/packages/python/python-sip_4.7.1.bb b/packages/python/python-sip_4.7.1.bb deleted file mode 100644 index fc87b01e53..0000000000 --- a/packages/python/python-sip_4.7.1.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries" -SECTION = "devel/python" -HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip" -AUTHOR = "Phil Thompson" -LICENSE = "GPL" -DEPENDS = "python" -RDEPENDS = "python-core" -PR = "ml0" - -SRC_URI = "http://www.riverbankcomputing.com/Downloads/sip4/sip-${PV}.tar.gz" -S = "${WORKDIR}/sip-${PV}/siplib" - -inherit qt4x11 distutils-base - -EXTRA_QMAKEVARS_POST += " TEMPLATE=lib \ - CONFIG=console \ - DESTDIR= \ - VERSION=1.0.0 \ - TARGET=sip \ - DEFINES=SIP_QT_SUPPORT \ - INCLUDEPATH+=. \ - INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ - INCLUDEPATH+=${STAGING_INCDIR}" - - -do_configure_prepend() { - cat siplib.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > siplib.pro -} - -do_stage() { - install -d ${STAGING_LIBDIR_NATIVE}/${PYTHON_DIR}/site-packages/ - # sipconfig.py sipdistutils.py - install -m 0644 sip.h ${STAGING_INCDIR}/sip.h -} - -do_install() { - install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/ - install -m 0755 libsip.so.1.0.0 ${D}${libdir}/${PYTHON_DIR}/site-packages/sip.so -} - -FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/sip.so" - diff --git a/packages/python/python-sip_4.7.3.bb b/packages/python/python-sip_4.7.3.bb new file mode 100644 index 0000000000..fc87b01e53 --- /dev/null +++ b/packages/python/python-sip_4.7.3.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries" +SECTION = "devel/python" +HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip" +AUTHOR = "Phil Thompson" +LICENSE = "GPL" +DEPENDS = "python" +RDEPENDS = "python-core" +PR = "ml0" + +SRC_URI = "http://www.riverbankcomputing.com/Downloads/sip4/sip-${PV}.tar.gz" +S = "${WORKDIR}/sip-${PV}/siplib" + +inherit qt4x11 distutils-base + +EXTRA_QMAKEVARS_POST += " TEMPLATE=lib \ + CONFIG=console \ + DESTDIR= \ + VERSION=1.0.0 \ + TARGET=sip \ + DEFINES=SIP_QT_SUPPORT \ + INCLUDEPATH+=. \ + INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ + INCLUDEPATH+=${STAGING_INCDIR}" + + +do_configure_prepend() { + cat siplib.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > siplib.pro +} + +do_stage() { + install -d ${STAGING_LIBDIR_NATIVE}/${PYTHON_DIR}/site-packages/ + # sipconfig.py sipdistutils.py + install -m 0644 sip.h ${STAGING_INCDIR}/sip.h +} + +do_install() { + install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/ + install -m 0755 libsip.so.1.0.0 ${D}${libdir}/${PYTHON_DIR}/site-packages/sip.so +} + +FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/sip.so" + -- cgit v1.2.3 From 8f3ca10fbd4d6634c7c8d25570e436847e777264 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 13 Dec 2007 23:10:20 +0000 Subject: python-pyqt 4.3.1 update to 4.3.3 --- packages/python/python-pyqt_4.3.1.bb | 71 ------------------------------------ packages/python/python-pyqt_4.3.3.bb | 71 ++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 71 deletions(-) delete mode 100644 packages/python/python-pyqt_4.3.1.bb create mode 100644 packages/python/python-pyqt_4.3.3.bb (limited to 'packages/python') diff --git a/packages/python/python-pyqt_4.3.1.bb b/packages/python/python-pyqt_4.3.1.bb deleted file mode 100644 index d9c45ec14c..0000000000 --- a/packages/python/python-pyqt_4.3.1.bb +++ /dev/null @@ -1,71 +0,0 @@ -DESCRIPTION = "Python Qt4 Bindings" -HOMEPAGE = "http://riverbankcomputing.co.uk" -AUTHOR = "Phil Thomson @ riverbank.co.uk" -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "GPL" -RDEPENDS = "python-core" -SRCNAME = "pyqt" -PR = "ml0" - -SRC_URI = "\ - http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-${PV}.tar.gz \ - file://cross-compile.patch;patch=1 \ - file://01_configure.dpatch;patch=1 \ - file://02_htmllinks.dpatch;patch=1 \ - file://03_qreal.dpatch;patch=1 \ - file://04_qreal_api_fixes.dpatch;patch=1" -S = "${WORKDIR}/PyQt-x11-gpl-${PV}" - -inherit qt4x11 sip distutils-base - -PARALLEL_MAKE = "" - -QMAKE_PROFILES = "pyqt.pro" -EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_1 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" -EXTRA_OEMAKE = " MAKEFLAGS= " - -SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml" -# SIP_MODULES += "QtAssistant" -EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/Qt \ - INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ - DEFINES+=QT_NO_FPU" - -FIX_QREAL = "\ - QtCore/qtimeline.sip \ - QtCore/qrect.sip \ - QtGui/qtransform.sip \ -" - -do_generate_prepend() { - for i in ${FIX_QREAL}; do - sed -i -e s,qreal,float,g sip/$i - done -} - -do_configure_prepend() { - echo "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro -} - -do_stage() { - install -d ${STAGING_SIPDIR}/qt/ - install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages - for module in ${SIP_MODULES} - do - install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/ - install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/${module}.so - done -} - -do_install() { - install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4 - for module in ${SIP_MODULES} - do - echo "from PyQt4.${module} import *\n" >> ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/Qt.py - install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/${module}.so - done - cp -pPR elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/ - cp __init__.py ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/ -} - -FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages" diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb new file mode 100644 index 0000000000..d9c45ec14c --- /dev/null +++ b/packages/python/python-pyqt_4.3.3.bb @@ -0,0 +1,71 @@ +DESCRIPTION = "Python Qt4 Bindings" +HOMEPAGE = "http://riverbankcomputing.co.uk" +AUTHOR = "Phil Thomson @ riverbank.co.uk" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "GPL" +RDEPENDS = "python-core" +SRCNAME = "pyqt" +PR = "ml0" + +SRC_URI = "\ + http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-${PV}.tar.gz \ + file://cross-compile.patch;patch=1 \ + file://01_configure.dpatch;patch=1 \ + file://02_htmllinks.dpatch;patch=1 \ + file://03_qreal.dpatch;patch=1 \ + file://04_qreal_api_fixes.dpatch;patch=1" +S = "${WORKDIR}/PyQt-x11-gpl-${PV}" + +inherit qt4x11 sip distutils-base + +PARALLEL_MAKE = "" + +QMAKE_PROFILES = "pyqt.pro" +EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_1 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" +EXTRA_OEMAKE = " MAKEFLAGS= " + +SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml" +# SIP_MODULES += "QtAssistant" +EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/Qt \ + INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ + DEFINES+=QT_NO_FPU" + +FIX_QREAL = "\ + QtCore/qtimeline.sip \ + QtCore/qrect.sip \ + QtGui/qtransform.sip \ +" + +do_generate_prepend() { + for i in ${FIX_QREAL}; do + sed -i -e s,qreal,float,g sip/$i + done +} + +do_configure_prepend() { + echo "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro +} + +do_stage() { + install -d ${STAGING_SIPDIR}/qt/ + install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages + for module in ${SIP_MODULES} + do + install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/ + install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/${module}.so + done +} + +do_install() { + install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4 + for module in ${SIP_MODULES} + do + echo "from PyQt4.${module} import *\n" >> ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/Qt.py + install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/${module}.so + done + cp -pPR elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/ + cp __init__.py ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/ +} + +FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages" -- cgit v1.2.3 From d090606e4961c3d1efcaec58cb1d162eb7b5b4a1 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 13 Dec 2007 23:12:08 +0000 Subject: python-pyqt 4.3.3 change sip tag --- packages/python/python-pyqt_4.3.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/python') diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb index d9c45ec14c..2d30922408 100644 --- a/packages/python/python-pyqt_4.3.3.bb +++ b/packages/python/python-pyqt_4.3.3.bb @@ -22,7 +22,7 @@ inherit qt4x11 sip distutils-base PARALLEL_MAKE = "" QMAKE_PROFILES = "pyqt.pro" -EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_1 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" +EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_3 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" EXTRA_OEMAKE = " MAKEFLAGS= " SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml" -- cgit v1.2.3 From 0a080ee0fd673cc529dda6e9f464de6b011e58ca Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 14 Dec 2007 00:47:44 +0000 Subject: python-pyqt 4.3.3 set sip tag back to 4.3.2 until we actually have Qt 4.3.3 in OE --- packages/python/python-pyqt_4.3.3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages/python') diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb index 2d30922408..74a16c4720 100644 --- a/packages/python/python-pyqt_4.3.3.bb +++ b/packages/python/python-pyqt_4.3.3.bb @@ -22,7 +22,8 @@ inherit qt4x11 sip distutils-base PARALLEL_MAKE = "" QMAKE_PROFILES = "pyqt.pro" -EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_3 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" +# NOTE: match with qt version we have in OE +EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_2 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" EXTRA_OEMAKE = " MAKEFLAGS= " SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml" -- cgit v1.2.3 From d8ae3350e9da832950fc5f8566f6635e10262d60 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 20 Dec 2007 17:09:23 +0000 Subject: python-pygtk 2.10.4 add missing dependency to python-pygobject (again, it _really_ needs it at build time as well). closes #3450 --- packages/python/python-pygtk_2.10.4.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'packages/python') diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb index 9b4a034ffa..1af2093556 100644 --- a/packages/python/python-pygtk_2.10.4.bb +++ b/packages/python/python-pygtk_2.10.4.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Python GTK+ 2.10.x Bindings" SECTION = "devel/python" # needs gtk+ 2.10.x -DEPENDS = "gtk+ libglade python-pycairo" +DEPENDS = "gtk+ libglade python-pycairo python-pygobject" RDEPENDS = "python-shell python-pycairo python-pygobject" PROVIDES = "python-pygtk2" SRCNAME = "pygtk" @@ -13,8 +13,10 @@ SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar file://acinclude.m4" S = "${WORKDIR}/${SRCNAME}-${PV}" -EXTRA_OECONF = "--disable-docs" -EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" +EXTRA_OECONF = "\ + --disable-docs \ + --with-python-includes=${STAGING_INCDIR}/../ \ +" inherit autotools pkgconfig distutils-base -- cgit v1.2.3 From 163aa1a4317c5ba9284faa2a5d23e333d988f2bc Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sun, 23 Dec 2007 19:45:15 +0000 Subject: python-gammu: updated to 0.24 --- packages/python/python-gammu_0.21.bb | 10 ---------- packages/python/python-gammu_0.24.bb | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 packages/python/python-gammu_0.21.bb create mode 100644 packages/python/python-gammu_0.24.bb (limited to 'packages/python') diff --git a/packages/python/python-gammu_0.21.bb b/packages/python/python-gammu_0.21.bb deleted file mode 100644 index f8989d9181..0000000000 --- a/packages/python/python-gammu_0.21.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "Python bindings for the gammu GSM phone communication library." -HOMEPAGE = "http://cihar.com/gammu/python" -SECTION = "devel/python" -DEPENDS = "gammu" -LICENSE = "GPL" -PR = "ml0" - -SRC_URI = "http://dl.cihar.com/python-gammu/latest/python-gammu-${PV}.tar.bz2" - -inherit distutils diff --git a/packages/python/python-gammu_0.24.bb b/packages/python/python-gammu_0.24.bb new file mode 100644 index 0000000000..f8989d9181 --- /dev/null +++ b/packages/python/python-gammu_0.24.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Python bindings for the gammu GSM phone communication library." +HOMEPAGE = "http://cihar.com/gammu/python" +SECTION = "devel/python" +DEPENDS = "gammu" +LICENSE = "GPL" +PR = "ml0" + +SRC_URI = "http://dl.cihar.com/python-gammu/latest/python-gammu-${PV}.tar.bz2" + +inherit distutils -- cgit v1.2.3 From 28923e28feb20034efc37bb64132ed07679cc272 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 24 Dec 2007 15:40:25 +0000 Subject: python-pyqt 4.3.3 properly create pyqt.pro qmake profile. christmas bugsquashing: should hopefully close #2468 for good... --- packages/python/python-pyqt_4.3.3.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packages/python') diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb index 74a16c4720..0bb4b1e588 100644 --- a/packages/python/python-pyqt_4.3.3.bb +++ b/packages/python/python-pyqt_4.3.3.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" LICENSE = "GPL" RDEPENDS = "python-core" SRCNAME = "pyqt" -PR = "ml0" +PR = "ml1" SRC_URI = "\ http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-${PV}.tar.gz \ @@ -39,13 +39,13 @@ FIX_QREAL = "\ " do_generate_prepend() { - for i in ${FIX_QREAL}; do - sed -i -e s,qreal,float,g sip/$i - done + for i in ${FIX_QREAL}; do + sed -i -e s,qreal,float,g sip/$i + done } do_configure_prepend() { - echo "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro + echo -e "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro } do_stage() { -- cgit v1.2.3 From b3980479c23fe2a8cb24e7c2f2003d0ffa39513f Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 5 Jan 2008 16:21:49 +0000 Subject: add python-gsmd, python bindings for the openmoko libgsmd --- packages/python/python-gsmd_svn.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 packages/python/python-gsmd_svn.bb (limited to 'packages/python') diff --git a/packages/python/python-gsmd_svn.bb b/packages/python/python-gsmd_svn.bb new file mode 100644 index 0000000000..14d3abd607 --- /dev/null +++ b/packages/python/python-gsmd_svn.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Python bindings for the libgsmd" +SRCNAME = "python-gsmd" +AUTHOR = "Sudharshan S" +SECTION = "devel/python" +LICENSE = "LGPL" +DEPENDS = "libgsmd" +PV = "0.02+svnr${SRCREV}" +PR = "r1" + +SRC_URI = "svn://svn.projects.openmoko.org/svnroot/python-openmoko;module=python-gsmd;proto=http" +S = "${WORKDIR}/python-gsmd" + +SRCREV_pn-python-gsmd ?= "${AUTOREV}" + +inherit distutils -- cgit v1.2.3 From d1631785248a72bb4d02cd55307b2a994fa5673a Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 7 Jan 2008 18:01:44 +0000 Subject: packages/python/python-pyqt: We have Qt4.3.3 now, make use of it and enable the assistantclient --- packages/python/python-pyqt/assistantclient-fix.patch | 13 +++++++++++++ packages/python/python-pyqt_4.3.3.bb | 8 ++++---- 2 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 packages/python/python-pyqt/assistantclient-fix.patch (limited to 'packages/python') diff --git a/packages/python/python-pyqt/assistantclient-fix.patch b/packages/python/python-pyqt/assistantclient-fix.patch new file mode 100644 index 0000000000..eef0847c7c --- /dev/null +++ b/packages/python/python-pyqt/assistantclient-fix.patch @@ -0,0 +1,13 @@ +Index: PyQt-x11-gpl-4.3.3/sip/QtAssistant/qassistantclient.sip +=================================================================== +--- PyQt-x11-gpl-4.3.3.orig/sip/QtAssistant/qassistantclient.sip 2008-01-07 13:31:35.000000000 +0100 ++++ PyQt-x11-gpl-4.3.3/sip/QtAssistant/qassistantclient.sip 2008-01-07 13:32:20.000000000 +0100 +@@ -26,7 +26,7 @@ + { + + %TypeHeaderCode +-#include ++#include + %End + + %ConvertToSubClassCode diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb index 0bb4b1e588..773f646788 100644 --- a/packages/python/python-pyqt_4.3.3.bb +++ b/packages/python/python-pyqt_4.3.3.bb @@ -14,7 +14,8 @@ SRC_URI = "\ file://01_configure.dpatch;patch=1 \ file://02_htmllinks.dpatch;patch=1 \ file://03_qreal.dpatch;patch=1 \ - file://04_qreal_api_fixes.dpatch;patch=1" + file://04_qreal_api_fixes.dpatch;patch=1 \ + file://assistantclient-fix.patch;patch=1" S = "${WORKDIR}/PyQt-x11-gpl-${PV}" inherit qt4x11 sip distutils-base @@ -23,11 +24,10 @@ PARALLEL_MAKE = "" QMAKE_PROFILES = "pyqt.pro" # NOTE: match with qt version we have in OE -EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_2 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" +EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_3 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" EXTRA_OEMAKE = " MAKEFLAGS= " -SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml" -# SIP_MODULES += "QtAssistant" +SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml QtAssistant" EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/Qt \ INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ DEFINES+=QT_NO_FPU" -- cgit v1.2.3 From 484aec6e78dd9624f20779130565d1774d5b9e9f Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 7 Jan 2008 18:25:55 +0000 Subject: Bashism fix: echo -e is a bashism and doesn't work when /bin/sh points to dash Instead of using "echo -e" we simply use printf. printf doesn't add a newline by default. So some places needed an extra \n in their string. Most of the change was done by hand, so please carefully review. This bug was spotted when trying to compile python-pyqt on my ubuntu hardy system. --- packages/python/python-pyqt_4.3.3.bb | 2 +- packages/python/python24-pyqt2_3.13.bb | 2 +- packages/python/python24-pyqwt2_3.10.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packages/python') diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb index 773f646788..2fd6fcc38b 100644 --- a/packages/python/python-pyqt_4.3.3.bb +++ b/packages/python/python-pyqt_4.3.3.bb @@ -45,7 +45,7 @@ do_generate_prepend() { } do_configure_prepend() { - echo -e "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro + printf "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro } do_stage() { diff --git a/packages/python/python24-pyqt2_3.13.bb b/packages/python/python24-pyqt2_3.13.bb index 04493857dc..dc93d28a09 100644 --- a/packages/python/python24-pyqt2_3.13.bb +++ b/packages/python/python24-pyqt2_3.13.bb @@ -35,7 +35,7 @@ EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR_NATIVE}/uic \ LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages" do_configure_prepend() { - echo -e "TEMPLATE=subdirs\nSUBDIRS=qt qtcanvas qttable qtpe\n" >pyqt.pro + printf "TEMPLATE=subdirs\nSUBDIRS=qt qtcanvas qttable qtpe\n" >pyqt.pro } do_stage() { diff --git a/packages/python/python24-pyqwt2_3.10.bb b/packages/python/python24-pyqwt2_3.10.bb index 28f4080c45..4f1f9bc0c9 100644 --- a/packages/python/python24-pyqwt2_3.10.bb +++ b/packages/python/python24-pyqwt2_3.10.bb @@ -33,7 +33,7 @@ EXTRA_QMAKEVARS_POST += "TARGET=qwt \ LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages" do_generate_prepend() { - echo -e "TEMPLATE=subdirs\nSUBDIRS=qwt\n" >pyqwt.pro + printf "TEMPLATE=subdirs\nSUBDIRS=qwt\n" >pyqwt.pro echo "%Makefile qwt.pro.in" >>sip/qwtmod.sip echo "TEMPLATE=lib" >>sip/qwtmod.sip -- cgit v1.2.3 From ead98568d50eef73108411fea2a71f0038f7abe4 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 10 Jan 2008 16:47:32 +0000 Subject: python-efl 1.0 RDEPEND on dependencies, not just DEPEND --- packages/python/python-efl.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'packages/python') diff --git a/packages/python/python-efl.bb b/packages/python/python-efl.bb index c667ceff11..610688a2b4 100644 --- a/packages/python/python-efl.bb +++ b/packages/python/python-efl.bb @@ -1,7 +1,6 @@ DESCRIPTION = "Python Bindings to the Enlightenment Foundation Libraries" LICENSE = "MIT" SECTION = "devel/python" -DEPENDS = "python-evas python-ecore python-emotion python-edje python-epsilon" +RDEPENDS = "python-evas python-ecore python-emotion python-edje python-epsilon" ALLOW_EMPTY = "1" - -- cgit v1.2.3 From fd28e6d306db3d77b7986645b7633213aa96f543 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 13 Jan 2008 14:17:18 +0000 Subject: python-efl cvs add missing RDEPENDS to python-lang --- packages/python/python-ecore_cvs.bb | 2 +- packages/python/python-edje_cvs.bb | 2 +- packages/python/python-efl.bb | 1 + packages/python/python-efl.inc | 1 + packages/python/python-emotion_cvs.bb | 2 +- packages/python/python-epsilon_cvs.bb | 2 +- packages/python/python-evas_cvs.bb | 2 +- 7 files changed, 7 insertions(+), 5 deletions(-) (limited to 'packages/python') diff --git a/packages/python/python-ecore_cvs.bb b/packages/python/python-ecore_cvs.bb index 8f4db6382e..80bda20987 100644 --- a/packages/python/python-ecore_cvs.bb +++ b/packages/python/python-ecore_cvs.bb @@ -1,7 +1,7 @@ require python-efl.inc DEPENDS += "ecore" -PR = "r2" +PR = "r3" do_stage() { distutils_stage_all diff --git a/packages/python/python-edje_cvs.bb b/packages/python/python-edje_cvs.bb index dfd9722f32..6fc444a6e6 100644 --- a/packages/python/python-edje_cvs.bb +++ b/packages/python/python-edje_cvs.bb @@ -1,5 +1,5 @@ require python-efl.inc DEPENDS += "edje python-evas" -PR = "r1" +PR = "r2" diff --git a/packages/python/python-efl.bb b/packages/python/python-efl.bb index 610688a2b4..ec5e9cd7e2 100644 --- a/packages/python/python-efl.bb +++ b/packages/python/python-efl.bb @@ -2,5 +2,6 @@ DESCRIPTION = "Python Bindings to the Enlightenment Foundation Libraries" LICENSE = "MIT" SECTION = "devel/python" RDEPENDS = "python-evas python-ecore python-emotion python-edje python-epsilon" +PR = "ml1" ALLOW_EMPTY = "1" diff --git a/packages/python/python-efl.inc b/packages/python/python-efl.inc index 727c718bd2..fce05fe50f 100644 --- a/packages/python/python-efl.inc +++ b/packages/python/python-efl.inc @@ -5,6 +5,7 @@ HOMEPAGE = "http://www.enlightenment.org" # somewhere is a bug. cython should be self-contained, but somehow this # does not compile unless pyrex has been built DEPENDS = "python-cython-native python-pyrex-native python-numeric" +RDEPENDS += "python-lang" PV = "0.1.1+cvs${SRCDATE}" inherit setuptools diff --git a/packages/python/python-emotion_cvs.bb b/packages/python/python-emotion_cvs.bb index 79c7f9633b..df0e561da8 100644 --- a/packages/python/python-emotion_cvs.bb +++ b/packages/python/python-emotion_cvs.bb @@ -1,4 +1,4 @@ require python-efl.inc DEPENDS += "emotion python-evas" -PR = "r1" +PR = "r2" diff --git a/packages/python/python-epsilon_cvs.bb b/packages/python/python-epsilon_cvs.bb index 81ebfcb0c7..5b46ea5417 100644 --- a/packages/python/python-epsilon_cvs.bb +++ b/packages/python/python-epsilon_cvs.bb @@ -1,4 +1,4 @@ require python-efl.inc DEPENDS += "epsilon python-ecore" -PR = "r0" +PR = "r1" diff --git a/packages/python/python-evas_cvs.bb b/packages/python/python-evas_cvs.bb index ff14d95667..a24b50a850 100644 --- a/packages/python/python-evas_cvs.bb +++ b/packages/python/python-evas_cvs.bb @@ -1,7 +1,7 @@ require python-efl.inc DEPENDS += "evas" -PR = "r2" +PR = "r3" do_stage() { distutils_stage_all -- cgit v1.2.3 From 48af2490ed717ea3f790b4dcda78a8ed3ca96502 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 13 Jan 2008 14:19:29 +0000 Subject: python 2.5.1 remove bogus RPROVIDE for python-curses, RRECOMMEND python-readline --- packages/python/python_2.5.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/python') diff --git a/packages/python/python_2.5.1.bb b/packages/python/python_2.5.1.bb index 8ad4e797c0..2202e1d474 100644 --- a/packages/python/python_2.5.1.bb +++ b/packages/python/python_2.5.1.bb @@ -7,7 +7,7 @@ DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk" DEPENDS_sharprom = "python-native readline zlib gdbm openssl" # NOTE: Keep the digit in sync with BASEREV in contrib/generate-manifest-2.5.py -PR = "ml5" +PR = "ml6" PYTHON_MAJMIN = "2.5" @@ -79,7 +79,7 @@ do_install() { require python-${PYTHON_MAJMIN}-manifest.inc RPROVIDES_python-core = "python" -RPROVIDES_python-curses = "python" +RRECOMMEND_python-core = "python-readline" PACKAGES =+ "libpython2" FILES_libpython2 = "${libdir}/libpython*" -- cgit v1.2.3 From 2a9b0c8e76f591c44f4e3d3c16ee8501b5b02cfa Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 13 Jan 2008 15:15:45 +0000 Subject: add python-edbus, BROKEN though until someone adds dbus 1.1.x --- packages/python/python-edbus_cvs.bb | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 packages/python/python-edbus_cvs.bb (limited to 'packages/python') diff --git a/packages/python/python-edbus_cvs.bb b/packages/python/python-edbus_cvs.bb new file mode 100644 index 0000000000..7a4d53762f --- /dev/null +++ b/packages/python/python-edbus_cvs.bb @@ -0,0 +1,9 @@ +require python-efl.inc +# broken until someone adds dbus 1.1.x +DEPENDS += "edbus dbus-1.1" + +PR = "r0" + +SRC_URI = "${E_CVS};module=e17/proto/python-efl/python-e_dbus" +S = "${WORKDIR}/python-e_dbus" + -- cgit v1.2.3 From e389db6955bdb477cae726fc97ca1c6d2f53fab0 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 13 Jan 2008 15:47:53 +0000 Subject: python-efl cvs ship examples, add python-efl-examples as meta package --- packages/python/python-ecore_cvs.bb | 3 +-- packages/python/python-edje_cvs.bb | 2 +- packages/python/python-efl-examples.bb | 7 +++++++ packages/python/python-efl.inc | 12 ++++++++++++ packages/python/python-emotion_cvs.bb | 2 +- packages/python/python-epsilon_cvs.bb | 3 +-- 6 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 packages/python/python-efl-examples.bb (limited to 'packages/python') diff --git a/packages/python/python-ecore_cvs.bb b/packages/python/python-ecore_cvs.bb index 80bda20987..0ec598f5a0 100644 --- a/packages/python/python-ecore_cvs.bb +++ b/packages/python/python-ecore_cvs.bb @@ -1,7 +1,6 @@ require python-efl.inc DEPENDS += "ecore" - -PR = "r3" +PR = "r5" do_stage() { distutils_stage_all diff --git a/packages/python/python-edje_cvs.bb b/packages/python/python-edje_cvs.bb index 6fc444a6e6..1ca047ecef 100644 --- a/packages/python/python-edje_cvs.bb +++ b/packages/python/python-edje_cvs.bb @@ -1,5 +1,5 @@ require python-efl.inc DEPENDS += "edje python-evas" -PR = "r2" +PR = "r4" diff --git a/packages/python/python-efl-examples.bb b/packages/python/python-efl-examples.bb new file mode 100644 index 0000000000..5648033f13 --- /dev/null +++ b/packages/python/python-efl-examples.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "Python Examples for the Enlightenment Foundation Libraries" +LICENSE = "MIT" +SECTION = "devel/python" +RDEPENDS = "python-efl python-ecore-examples python-emotion-examples python-edje-examples python-epsilon-examples" +PR = "ml1" + +ALLOW_EMPTY = "1" diff --git a/packages/python/python-efl.inc b/packages/python/python-efl.inc index fce05fe50f..e54cfff574 100644 --- a/packages/python/python-efl.inc +++ b/packages/python/python-efl.inc @@ -13,5 +13,17 @@ inherit setuptools SRC_URI = "${E_CVS};module=e17/proto/python-efl/${PN}" S = "${WORKDIR}/${PN}" +do_install_append() { + if [ -e examples ]; then + install -d ${D}${datadir}/${PN}/ + cp -a examples ${D}${datadir}/${PN}/ + find ${D}${datadir}/${PN}/examples -name "CVS" | xargs rm -rf + find ${D}${datadir}/${PN}/examples -name ".cvsignore" | xargs rm -f + fi +} + FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*.egg/*/*/.debug" +PACKAGES += "${PN}-examples" +FILES_${PN}-examples = "${datadir}/${PN}/examples" + diff --git a/packages/python/python-emotion_cvs.bb b/packages/python/python-emotion_cvs.bb index df0e561da8..0d0ce22f54 100644 --- a/packages/python/python-emotion_cvs.bb +++ b/packages/python/python-emotion_cvs.bb @@ -1,4 +1,4 @@ require python-efl.inc DEPENDS += "emotion python-evas" -PR = "r2" +PR = "r3" diff --git a/packages/python/python-epsilon_cvs.bb b/packages/python/python-epsilon_cvs.bb index 5b46ea5417..1e77886691 100644 --- a/packages/python/python-epsilon_cvs.bb +++ b/packages/python/python-epsilon_cvs.bb @@ -1,4 +1,3 @@ require python-efl.inc DEPENDS += "epsilon python-ecore" - -PR = "r1" +PR = "r3" -- cgit v1.2.3 From 75450b3cefd66d136cf0c63b08793289dbef417b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 13 Jan 2008 15:57:08 +0000 Subject: python 2.5.1 fix RRECOMMEND_S_ typo --- packages/python/python_2.5.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/python') diff --git a/packages/python/python_2.5.1.bb b/packages/python/python_2.5.1.bb index 2202e1d474..37f7bdefb8 100644 --- a/packages/python/python_2.5.1.bb +++ b/packages/python/python_2.5.1.bb @@ -79,7 +79,7 @@ do_install() { require python-${PYTHON_MAJMIN}-manifest.inc RPROVIDES_python-core = "python" -RRECOMMEND_python-core = "python-readline" +RRECOMMENDS_python-core = "python-readline" PACKAGES =+ "libpython2" FILES_libpython2 = "${libdir}/libpython*" -- cgit v1.2.3 From 8eaa2ab5a0006f8010425f95246ae27cca59a793 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 13 Jan 2008 16:03:15 +0000 Subject: python-2.5-manifest: regenerate --- packages/python/python-2.5-manifest.inc | 116 ++++++++++++++++---------------- 1 file changed, 58 insertions(+), 58 deletions(-) (limited to 'packages/python') diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc index f899eb2fea..165fd2ae60 100644 --- a/packages/python/python-2.5-manifest.inc +++ b/packages/python/python-2.5-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by 'contrib/python/generate-manifest-2.5.py' [(C) 2002-2007 Michael 'Mickey' Lauer ] on Fri Dec 7 11:51:27 2007 +### AUTO-GENERATED by '../../contrib/python/generate-manifest-2.5.py' [(C) 2002-2007 Michael 'Mickey' Lauer ] on Sun Jan 13 16:02:57 2008 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -13,287 +13,287 @@ PROVIDES+="python-profile python-threading python-distutils python-textutils pyt PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " DESCRIPTION_python-profile="Python Basic Profiling Support" -PR_python-profile="ml5" +PR_python-profile="ml6" RDEPENDS_python-profile="python-core" FILES_python-profile="${libdir}/python2.5/profile.* ${libdir}/python2.5/pstats.* " DESCRIPTION_python-threading="Python Threading & Synchronization Support" -PR_python-threading="ml5" +PR_python-threading="ml6" RDEPENDS_python-threading="python-core python-lang" FILES_python-threading="${libdir}/python2.5/_threading_local.* ${libdir}/python2.5/dummy_thread.* ${libdir}/python2.5/dummy_threading.* ${libdir}/python2.5/mutex.* ${libdir}/python2.5/threading.* ${libdir}/python2.5/Queue.* " DESCRIPTION_python-distutils="Python Distribution Utilities" -PR_python-distutils="ml5" +PR_python-distutils="ml6" RDEPENDS_python-distutils="python-core" FILES_python-distutils="${libdir}/python2.5/config ${libdir}/python2.5/distutils " DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support" -PR_python-textutils="ml5" +PR_python-textutils="ml6" RDEPENDS_python-textutils="python-core python-io python-re python-stringold" FILES_python-textutils="${libdir}/python2.5/lib-dynload/_csv.so ${libdir}/python2.5/csv.* ${libdir}/python2.5/optparse.* ${libdir}/python2.5/textwrap.* " DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support" -PR_python-codecs="ml5" +PR_python-codecs="ml6" RDEPENDS_python-codecs="python-core python-lang" FILES_python-codecs="${libdir}/python2.5/codecs.* ${libdir}/python2.5/encodings ${libdir}/python2.5/gettext.* ${libdir}/python2.5/locale.* ${libdir}/python2.5/lib-dynload/_locale.so ${libdir}/python2.5/lib-dynload/unicodedata.so ${libdir}/python2.5/stringprep.* ${libdir}/python2.5/xdrlib.* " DESCRIPTION_python-ctypes="Python C Types Support" -PR_python-ctypes="ml5" +PR_python-ctypes="ml6" RDEPENDS_python-ctypes="python-core" FILES_python-ctypes="${libdir}/python2.5/ctypes ${libdir}/python2.5/lib-dynload/_ctypes.so " DESCRIPTION_python-pickle="Python Persistence Support" -PR_python-pickle="ml5" +PR_python-pickle="ml6" RDEPENDS_python-pickle="python-core python-codecs python-io python-re" FILES_python-pickle="${libdir}/python2.5/pickle.* ${libdir}/python2.5/shelve.* ${libdir}/python2.5/lib-dynload/cPickle.so " DESCRIPTION_python-datetime="Python Calendar and Time support" -PR_python-datetime="ml5" +PR_python-datetime="ml6" RDEPENDS_python-datetime="python-core python-codecs" FILES_python-datetime="${libdir}/python2.5/_strptime.* ${libdir}/python2.5/calendar.* ${libdir}/python2.5/lib-dynload/datetime.so " DESCRIPTION_python-core="Python Interpreter and core modules (needed!)" -PR_python-core="ml5" +PR_python-core="ml6" RDEPENDS_python-core="" FILES_python-core="${libdir}/python2.5/__future__.* ${libdir}/python2.5/copy.* ${libdir}/python2.5/copy_reg.* ${libdir}/python2.5/ConfigParser.* ${libdir}/python2.5/getopt.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/new.* ${libdir}/python2.5/os.* ${libdir}/python2.5/posixpath.* ${libdir}/python2.5/struct.* ${libdir}/python2.5/warnings.* ${libdir}/python2.5/site.* ${libdir}/python2.5/stat.* ${libdir}/python2.5/UserDict.* ${libdir}/python2.5/UserList.* ${libdir}/python2.5/UserString.* ${libdir}/python2.5/lib-dynload/binascii.so ${libdir}/python2.5/lib-dynload/_struct.so ${libdir}/python2.5/lib-dynload/time.so ${libdir}/python2.5/lib-dynload/xreadlines.so ${libdir}/python2.5/types.* ${bindir}/python* " DESCRIPTION_python-io="Python Low-Level I/O" -PR_python-io="ml5" +PR_python-io="ml6" RDEPENDS_python-io="python-core python-math" FILES_python-io="${libdir}/python2.5/lib-dynload/_socket.so ${libdir}/python2.5/lib-dynload/_ssl.so ${libdir}/python2.5/lib-dynload/select.so ${libdir}/python2.5/lib-dynload/termios.so ${libdir}/python2.5/lib-dynload/cStringIO.so ${libdir}/python2.5/pipes.* ${libdir}/python2.5/socket.* ${libdir}/python2.5/tempfile.* ${libdir}/python2.5/StringIO.* " DESCRIPTION_python-compiler="Python Compiler Support" -PR_python-compiler="ml5" +PR_python-compiler="ml6" RDEPENDS_python-compiler="python-core" FILES_python-compiler="${libdir}/python2.5/compiler " DESCRIPTION_python-compression="Python High Level Compression Support" -PR_python-compression="ml5" +PR_python-compression="ml6" RDEPENDS_python-compression="python-core python-zlib" FILES_python-compression="${libdir}/python2.5/gzip.* ${libdir}/python2.5/zipfile.* " DESCRIPTION_python-re="Python Regular Expression APIs" -PR_python-re="ml5" +PR_python-re="ml6" RDEPENDS_python-re="python-core" FILES_python-re="${libdir}/python2.5/re.* ${libdir}/python2.5/sre.* ${libdir}/python2.5/sre_compile.* ${libdir}/python2.5/sre_constants* ${libdir}/python2.5/sre_parse.* " DESCRIPTION_python-xmlrpc="Python XMLRPC Support" -PR_python-xmlrpc="ml5" +PR_python-xmlrpc="ml6" RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang" FILES_python-xmlrpc="${libdir}/python2.5/xmlrpclib.* ${libdir}/python2.5/SimpleXMLRPCServer.* " DESCRIPTION_python-terminal="Python Terminal Controlling Support" -PR_python-terminal="ml5" +PR_python-terminal="ml6" RDEPENDS_python-terminal="python-core python-io" FILES_python-terminal="${libdir}/python2.5/pty.* ${libdir}/python2.5/tty.* " DESCRIPTION_python-email="Python Email Support" -PR_python-email="ml5" +PR_python-email="ml6" RDEPENDS_python-email="python-core python-io python-re python-mime python-audio python-image" FILES_python-email="${libdir}/python2.5/email " DESCRIPTION_python-image="Python Graphical Image Handling" -PR_python-image="ml5" +PR_python-image="ml6" RDEPENDS_python-image="python-core" FILES_python-image="${libdir}/python2.5/colorsys.* ${libdir}/python2.5/imghdr.* ${libdir}/python2.5/lib-dynload/imageop.so ${libdir}/python2.5/lib-dynload/rgbimg.so " DESCRIPTION_python-core-dbg="Python core module debug information" -PR_python-core-dbg="ml5" +PR_python-core-dbg="ml6" RDEPENDS_python-core-dbg="python-core" FILES_python-core-dbg="${libdir}/python2.5/lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug " DESCRIPTION_python-resource="Python Resource Control Interface" -PR_python-resource="ml5" +PR_python-resource="ml6" RDEPENDS_python-resource="python-core" FILES_python-resource="${libdir}/python2.5/lib-dynload/resource.so " DESCRIPTION_python-devel="Python Development Package" -PR_python-devel="ml5" +PR_python-devel="ml6" RDEPENDS_python-devel="python-core" FILES_python-devel="${includedir} ${libdir}/python2.5/config " DESCRIPTION_python-math="Python Math Support" -PR_python-math="ml5" +PR_python-math="ml6" RDEPENDS_python-math="python-core" FILES_python-math="${libdir}/python2.5/lib-dynload/cmath.so ${libdir}/python2.5/lib-dynload/math.so ${libdir}/python2.5/lib-dynload/_random.so ${libdir}/python2.5/random.* ${libdir}/python2.5/sets.* " DESCRIPTION_python-hotshot="Python Hotshot Profiler" -PR_python-hotshot="ml5" +PR_python-hotshot="ml6" RDEPENDS_python-hotshot="python-core" FILES_python-hotshot="${libdir}/python2.5/hotshot ${libdir}/python2.5/lib-dynload/_hotshot.so " DESCRIPTION_python-unixadmin="Python Unix Administration Support" -PR_python-unixadmin="ml5" +PR_python-unixadmin="ml6" RDEPENDS_python-unixadmin="python-core" FILES_python-unixadmin="${libdir}/python2.5/lib-dynload/nis.so ${libdir}/python2.5/lib-dynload/grp.so ${libdir}/python2.5/lib-dynload/pwd.so ${libdir}/python2.5/getpass.* " DESCRIPTION_python-syslog="Python's syslog Interface" -PR_python-syslog="ml5" +PR_python-syslog="ml6" RDEPENDS_python-syslog="python-core" FILES_python-syslog="${libdir}/python2.5/lib-dynload/syslog.so " DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings" -PR_python-tkinter="ml5" +PR_python-tkinter="ml6" RDEPENDS_python-tkinter="python-core" FILES_python-tkinter="${libdir}/python2.5/lib-dynload/_tkinter.so ${libdir}/python2.5/lib-tk " DESCRIPTION_python-gdbm="Python GNU Database Support" -PR_python-gdbm="ml5" +PR_python-gdbm="ml6" RDEPENDS_python-gdbm="python-core" FILES_python-gdbm="${libdir}/python2.5/lib-dynload/gdbm.so " DESCRIPTION_python-fcntl="Python's fcntl Interface" -PR_python-fcntl="ml5" +PR_python-fcntl="ml6" RDEPENDS_python-fcntl="python-core" FILES_python-fcntl="${libdir}/python2.5/lib-dynload/fcntl.so " DESCRIPTION_python-netclient="Python Internet Protocol Clients" -PR_python-netclient="ml5" +PR_python-netclient="ml6" RDEPENDS_python-netclient="python-core python-crypt python-datetime python-io python-lang python-logging python-mime" FILES_python-netclient="${libdir}/python2.5/*Cookie*.* ${libdir}/python2.5/base64.* ${libdir}/python2.5/cookielib.* ${libdir}/python2.5/ftplib.* ${libdir}/python2.5/gopherlib.* ${libdir}/python2.5/hmac.* ${libdir}/python2.5/httplib.* ${libdir}/python2.5/mimetypes.* ${libdir}/python2.5/nntplib.* ${libdir}/python2.5/poplib.* ${libdir}/python2.5/smtplib.* ${libdir}/python2.5/telnetlib.* ${libdir}/python2.5/urllib.* ${libdir}/python2.5/urllib2.* ${libdir}/python2.5/urlparse.* " DESCRIPTION_python-pprint="Python Pretty-Print Support" -PR_python-pprint="ml5" +PR_python-pprint="ml6" RDEPENDS_python-pprint="python-core" FILES_python-pprint="${libdir}/python2.5/pprint.* " DESCRIPTION_python-netserver="Python Internet Protocol Servers" -PR_python-netserver="ml5" +PR_python-netserver="ml6" RDEPENDS_python-netserver="python-core python-netclient" FILES_python-netserver="${libdir}/python2.5/cgi.* ${libdir}/python2.5/BaseHTTPServer.* ${libdir}/python2.5/SimpleHTTPServer.* ${libdir}/python2.5/SocketServer.* " DESCRIPTION_python-curses="Python Curses Support" -PR_python-curses="ml5" +PR_python-curses="ml6" RDEPENDS_python-curses="python-core" FILES_python-curses="${libdir}/python2.5/curses ${libdir}/python2.5/lib-dynload/_curses.so ${libdir}/python2.5/lib-dynload/_curses_panel.so " DESCRIPTION_python-smtpd="Python Simple Mail Transport Daemon" -PR_python-smtpd="ml5" +PR_python-smtpd="ml6" RDEPENDS_python-smtpd="python-core python-netserver python-email python-mime" FILES_python-smtpd="${bindir}/smtpd.* " DESCRIPTION_python-html="Python HTML Processing" -PR_python-html="ml5" +PR_python-html="ml6" RDEPENDS_python-html="python-core" FILES_python-html="${libdir}/python2.5/formatter.* ${libdir}/python2.5/htmlentitydefs.* ${libdir}/python2.5/htmllib.* ${libdir}/python2.5/markupbase.* ${libdir}/python2.5/sgmllib.* " DESCRIPTION_python-readline="Python Readline Support" -PR_python-readline="ml5" +PR_python-readline="ml6" RDEPENDS_python-readline="python-core" FILES_python-readline="${libdir}/python2.5/lib-dynload/readline.so ${libdir}/python2.5/rlcompleter.* " DESCRIPTION_python-subprocess="Python Subprocess Support" -PR_python-subprocess="ml5" +PR_python-subprocess="ml6" RDEPENDS_python-subprocess="python-core python-io python-re python-fcntl python-pickle" FILES_python-subprocess="${libdir}/python2.5/subprocess.* " DESCRIPTION_python-pydoc="Python Interactive Help Support" -PR_python-pydoc="ml5" +PR_python-pydoc="ml6" RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re" FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.5/pydoc.* " DESCRIPTION_python-logging="Python Logging Support" -PR_python-logging="ml5" +PR_python-logging="ml6" RDEPENDS_python-logging="python-core python-io python-lang python-stringold" FILES_python-logging="${libdir}/python2.5/logging " DESCRIPTION_python-mailbox="Python Mailbox Format Support" -PR_python-mailbox="ml5" +PR_python-mailbox="ml6" RDEPENDS_python-mailbox="python-core python-mime" FILES_python-mailbox="${libdir}/python2.5/mailbox.* " DESCRIPTION_python-xml="Python basic XML support." -PR_python-xml="ml5" +PR_python-xml="ml6" RDEPENDS_python-xml="python-core python-re python-netclient" FILES_python-xml="${libdir}/python2.5/lib-dynload/pyexpat.so ${libdir}/python2.5/xml ${libdir}/python2.5/xmllib.* " DESCRIPTION_python-mime="Python MIME Handling APIs" -PR_python-mime="ml5" +PR_python-mime="ml6" RDEPENDS_python-mime="python-core python-io" FILES_python-mime="${libdir}/python2.5/mimetools.* ${libdir}/python2.5/uu.* ${libdir}/python2.5/quopri.* ${libdir}/python2.5/rfc822.* " DESCRIPTION_python-sqlite3="Python Sqlite3 Database Support" -PR_python-sqlite3="ml5" +PR_python-sqlite3="ml6" RDEPENDS_python-sqlite3="python-core" FILES_python-sqlite3="${libdir}/python2.5/sqlite3 " DESCRIPTION_python-tests="Python Tests" -PR_python-tests="ml5" +PR_python-tests="ml6" RDEPENDS_python-tests="python-core" FILES_python-tests="${libdir}/python2.5/test " DESCRIPTION_python-unittest="Python Unit Testing Framework" -PR_python-unittest="ml5" +PR_python-unittest="ml6" RDEPENDS_python-unittest="python-core python-stringold python-lang" FILES_python-unittest="${libdir}/python2.5/unittest.* " DESCRIPTION_python-stringold="Python String APIs [deprecated]" -PR_python-stringold="ml5" +PR_python-stringold="ml6" RDEPENDS_python-stringold="python-core python-re" FILES_python-stringold="${libdir}/python2.5/lib-dynload/strop.so ${libdir}/python2.5/string.* " DESCRIPTION_python-robotparser="Python robots.txt parser" -PR_python-robotparser="ml5" +PR_python-robotparser="ml6" RDEPENDS_python-robotparser="python-core python-netclient" FILES_python-robotparser="${libdir}/python2.5/robotparser.* " DESCRIPTION_python-lib-old-and-deprecated="Python Deprecated Libraries" -PR_python-lib-old-and-deprecated="ml5" +PR_python-lib-old-and-deprecated="ml6" RDEPENDS_python-lib-old-and-deprecated="python-core" FILES_python-lib-old-and-deprecated="${libdir}/python2.5/lib-old " DESCRIPTION_python-compile="Python Bytecode Compilation Support" -PR_python-compile="ml5" +PR_python-compile="ml6" RDEPENDS_python-compile="python-core" FILES_python-compile="${libdir}/python2.5/py_compile.* ${libdir}/python2.5/compileall.* " DESCRIPTION_python-debugger="Python Debugger" -PR_python-debugger="ml5" +PR_python-debugger="ml6" RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell" FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* " DESCRIPTION_python-shell="Python Shell-Like Functionality" -PR_python-shell="ml5" +PR_python-shell="ml6" RDEPENDS_python-shell="python-core python-re" FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shutil.* " DESCRIPTION_python-bsddb="Python Berkeley Database Bindings" -PR_python-bsddb="ml5" +PR_python-bsddb="ml6" RDEPENDS_python-bsddb="python-core" FILES_python-bsddb="${libdir}/python2.5/bsddb " DESCRIPTION_python-mmap="Python Memory-Mapped-File Support" -PR_python-mmap="ml5" +PR_python-mmap="ml6" RDEPENDS_python-mmap="python-core python-io" FILES_python-mmap="${libdir}/python2.5/lib-dynload/mmap.so " DESCRIPTION_python-zlib="Python zlib Support." -PR_python-zlib="ml5" +PR_python-zlib="ml6" RDEPENDS_python-zlib="python-core" FILES_python-zlib="${libdir}/python2.5/lib-dynload/zlib.so " DESCRIPTION_python-db="Python File-Based Database Support" -PR_python-db="ml5" +PR_python-db="ml6" RDEPENDS_python-db="python-core" FILES_python-db="${libdir}/python2.5/anydbm.* ${libdir}/python2.5/dumbdbm.* ${libdir}/python2.5/whichdb.* " DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support" -PR_python-crypt="ml5" +PR_python-crypt="ml6" RDEPENDS_python-crypt="python-core" FILES_python-crypt="${libdir}/python2.5/hashlib.* ${libdir}/python2.5/md5.* ${libdir}/python2.5/sha.* ${libdir}/python2.5/lib-dynload/crypt.so ${libdir}/python2.5/lib-dynload/_hashlib.so ${libdir}/python2.5/lib-dynload/_sha256.so ${libdir}/python2.5/lib-dynload/_sha512.so " DESCRIPTION_python-idle="Python Integrated Development Environment" -PR_python-idle="ml5" +PR_python-idle="ml6" RDEPENDS_python-idle="python-core python-tkinter" FILES_python-idle="${bindir}/idle ${libdir}/python2.5/idlelib " DESCRIPTION_python-lang="Python Low-Level Language Support" -PR_python-lang="ml5" +PR_python-lang="ml6" RDEPENDS_python-lang="python-core" FILES_python-lang="${libdir}/python2.5/lib-dynload/array.so ${libdir}/python2.5/lib-dynload/parser.so ${libdir}/python2.5/lib-dynload/operator.so ${libdir}/python2.5/lib-dynload/_weakref.so ${libdir}/python2.5/lib-dynload/itertools.so ${libdir}/python2.5/lib-dynload/collections.so ${libdir}/python2.5/lib-dynload/_bisect.so ${libdir}/python2.5/lib-dynload/_heapq.so ${libdir}/python2.5/atexit.* ${libdir}/python2.5/bisect.* ${libdir}/python2.5/code.* ${libdir}/python2.5/codeop.* ${libdir}/python2.5/dis.* ${libdir}/python2.5/heapq.* ${libdir}/python2.5/inspect.* ${libdir}/python2.5/keyword.* ${libdir}/python2.5/opcode.* ${libdir}/python2.5/repr.* ${libdir}/python2.5/token.* ${libdir}/python2.5/tokenize.* ${libdir}/python2.5/traceback.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/weakref.* " DESCRIPTION_python-audio="Python Audio Handling" -PR_python-audio="ml5" +PR_python-audio="ml6" RDEPENDS_python-audio="python-core" FILES_python-audio="${libdir}/python2.5/wave.* ${libdir}/python2.5/chunk.* ${libdir}/python2.5/sndhdr.* ${libdir}/python2.5/lib-dynload/ossaudiodev.so ${libdir}/python2.5/lib-dynload/audioop.so " -- cgit v1.2.3 From ab4f7ee8fff64fe00fc0b0be32f2faee5440b0e0 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 13 Jan 2008 23:28:42 +0000 Subject: python-efl cvs generate .edj files and ship 'em --- packages/python/python-edje_cvs.bb | 3 +-- packages/python/python-efl-examples.bb | 7 +++++-- packages/python/python-efl.inc | 8 ++++++++ packages/python/python-emotion_cvs.bb | 3 +-- packages/python/python-epsilon_cvs.bb | 2 +- packages/python/python-evas_cvs.bb | 3 +-- 6 files changed, 17 insertions(+), 9 deletions(-) (limited to 'packages/python') diff --git a/packages/python/python-edje_cvs.bb b/packages/python/python-edje_cvs.bb index 1ca047ecef..1205e7ec84 100644 --- a/packages/python/python-edje_cvs.bb +++ b/packages/python/python-edje_cvs.bb @@ -1,5 +1,4 @@ require python-efl.inc DEPENDS += "edje python-evas" - -PR = "r4" +PR = "r5" diff --git a/packages/python/python-efl-examples.bb b/packages/python/python-efl-examples.bb index 5648033f13..0a4e32097f 100644 --- a/packages/python/python-efl-examples.bb +++ b/packages/python/python-efl-examples.bb @@ -1,7 +1,10 @@ DESCRIPTION = "Python Examples for the Enlightenment Foundation Libraries" LICENSE = "MIT" SECTION = "devel/python" -RDEPENDS = "python-efl python-ecore-examples python-emotion-examples python-edje-examples python-epsilon-examples" -PR = "ml1" +RDEPENDS = "\ + python-efl python-ecore-examples python-emotion-examples python-edje-examples python-epsilon-examples \ + python-math python-textutils \ +" +PR = "ml2" ALLOW_EMPTY = "1" diff --git a/packages/python/python-efl.inc b/packages/python/python-efl.inc index e54cfff574..e6cc62df5e 100644 --- a/packages/python/python-efl.inc +++ b/packages/python/python-efl.inc @@ -15,6 +15,14 @@ S = "${WORKDIR}/${PN}" do_install_append() { if [ -e examples ]; then + for i in `find examples -name "*.edc"`; do + pushd `dirname $i` + echo "Generating .edj file for $i..." + edje_cc `basename $i` + echo "Removing sources in this directory..." + rm -f *.edc *.png *.ttf *.jpeg + popd + done install -d ${D}${datadir}/${PN}/ cp -a examples ${D}${datadir}/${PN}/ find ${D}${datadir}/${PN}/examples -name "CVS" | xargs rm -rf diff --git a/packages/python/python-emotion_cvs.bb b/packages/python/python-emotion_cvs.bb index 0d0ce22f54..d3f5109d86 100644 --- a/packages/python/python-emotion_cvs.bb +++ b/packages/python/python-emotion_cvs.bb @@ -1,4 +1,3 @@ require python-efl.inc DEPENDS += "emotion python-evas" - -PR = "r3" +PR = "r4" diff --git a/packages/python/python-epsilon_cvs.bb b/packages/python/python-epsilon_cvs.bb index 1e77886691..204dd95610 100644 --- a/packages/python/python-epsilon_cvs.bb +++ b/packages/python/python-epsilon_cvs.bb @@ -1,3 +1,3 @@ require python-efl.inc DEPENDS += "epsilon python-ecore" -PR = "r3" +PR = "r4" diff --git a/packages/python/python-evas_cvs.bb b/packages/python/python-evas_cvs.bb index a24b50a850..e0de4569bd 100644 --- a/packages/python/python-evas_cvs.bb +++ b/packages/python/python-evas_cvs.bb @@ -1,7 +1,6 @@ require python-efl.inc DEPENDS += "evas" - -PR = "r3" +PR = "r4" do_stage() { distutils_stage_all -- cgit v1.2.3 From b548b86158d28374bea97dd2e96a490cabcd0bb2 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 22 Jan 2008 15:42:08 +0000 Subject: python 2.5.1 ship sitecustomize.py that enables some convenient features when working with the interactive interpreter: attribute completion and persistent command history --- packages/python/python-2.5-manifest.inc | 116 +++++++++++++------------- packages/python/python-2.5.1/sitecustomize.py | 45 ++++++++++ packages/python/python_2.5.1.bb | 46 +++++----- 3 files changed, 130 insertions(+), 77 deletions(-) create mode 100644 packages/python/python-2.5.1/sitecustomize.py (limited to 'packages/python') diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc index 165fd2ae60..edf5c7697f 100644 --- a/packages/python/python-2.5-manifest.inc +++ b/packages/python/python-2.5-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by '../../contrib/python/generate-manifest-2.5.py' [(C) 2002-2007 Michael 'Mickey' Lauer ] on Sun Jan 13 16:02:57 2008 +### AUTO-GENERATED by 'contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer ] on Tue Jan 22 04:03:18 2008 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -13,287 +13,287 @@ PROVIDES+="python-profile python-threading python-distutils python-textutils pyt PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " DESCRIPTION_python-profile="Python Basic Profiling Support" -PR_python-profile="ml6" +PR_python-profile="ml7" RDEPENDS_python-profile="python-core" FILES_python-profile="${libdir}/python2.5/profile.* ${libdir}/python2.5/pstats.* " DESCRIPTION_python-threading="Python Threading & Synchronization Support" -PR_python-threading="ml6" +PR_python-threading="ml7" RDEPENDS_python-threading="python-core python-lang" FILES_python-threading="${libdir}/python2.5/_threading_local.* ${libdir}/python2.5/dummy_thread.* ${libdir}/python2.5/dummy_threading.* ${libdir}/python2.5/mutex.* ${libdir}/python2.5/threading.* ${libdir}/python2.5/Queue.* " DESCRIPTION_python-distutils="Python Distribution Utilities" -PR_python-distutils="ml6" +PR_python-distutils="ml7" RDEPENDS_python-distutils="python-core" FILES_python-distutils="${libdir}/python2.5/config ${libdir}/python2.5/distutils " DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support" -PR_python-textutils="ml6" +PR_python-textutils="ml7" RDEPENDS_python-textutils="python-core python-io python-re python-stringold" FILES_python-textutils="${libdir}/python2.5/lib-dynload/_csv.so ${libdir}/python2.5/csv.* ${libdir}/python2.5/optparse.* ${libdir}/python2.5/textwrap.* " DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support" -PR_python-codecs="ml6" +PR_python-codecs="ml7" RDEPENDS_python-codecs="python-core python-lang" FILES_python-codecs="${libdir}/python2.5/codecs.* ${libdir}/python2.5/encodings ${libdir}/python2.5/gettext.* ${libdir}/python2.5/locale.* ${libdir}/python2.5/lib-dynload/_locale.so ${libdir}/python2.5/lib-dynload/unicodedata.so ${libdir}/python2.5/stringprep.* ${libdir}/python2.5/xdrlib.* " DESCRIPTION_python-ctypes="Python C Types Support" -PR_python-ctypes="ml6" +PR_python-ctypes="ml7" RDEPENDS_python-ctypes="python-core" FILES_python-ctypes="${libdir}/python2.5/ctypes ${libdir}/python2.5/lib-dynload/_ctypes.so " DESCRIPTION_python-pickle="Python Persistence Support" -PR_python-pickle="ml6" +PR_python-pickle="ml7" RDEPENDS_python-pickle="python-core python-codecs python-io python-re" FILES_python-pickle="${libdir}/python2.5/pickle.* ${libdir}/python2.5/shelve.* ${libdir}/python2.5/lib-dynload/cPickle.so " DESCRIPTION_python-datetime="Python Calendar and Time support" -PR_python-datetime="ml6" +PR_python-datetime="ml7" RDEPENDS_python-datetime="python-core python-codecs" FILES_python-datetime="${libdir}/python2.5/_strptime.* ${libdir}/python2.5/calendar.* ${libdir}/python2.5/lib-dynload/datetime.so " DESCRIPTION_python-core="Python Interpreter and core modules (needed!)" -PR_python-core="ml6" +PR_python-core="ml7" RDEPENDS_python-core="" FILES_python-core="${libdir}/python2.5/__future__.* ${libdir}/python2.5/copy.* ${libdir}/python2.5/copy_reg.* ${libdir}/python2.5/ConfigParser.* ${libdir}/python2.5/getopt.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/new.* ${libdir}/python2.5/os.* ${libdir}/python2.5/posixpath.* ${libdir}/python2.5/struct.* ${libdir}/python2.5/warnings.* ${libdir}/python2.5/site.* ${libdir}/python2.5/stat.* ${libdir}/python2.5/UserDict.* ${libdir}/python2.5/UserList.* ${libdir}/python2.5/UserString.* ${libdir}/python2.5/lib-dynload/binascii.so ${libdir}/python2.5/lib-dynload/_struct.so ${libdir}/python2.5/lib-dynload/time.so ${libdir}/python2.5/lib-dynload/xreadlines.so ${libdir}/python2.5/types.* ${bindir}/python* " DESCRIPTION_python-io="Python Low-Level I/O" -PR_python-io="ml6" +PR_python-io="ml7" RDEPENDS_python-io="python-core python-math" FILES_python-io="${libdir}/python2.5/lib-dynload/_socket.so ${libdir}/python2.5/lib-dynload/_ssl.so ${libdir}/python2.5/lib-dynload/select.so ${libdir}/python2.5/lib-dynload/termios.so ${libdir}/python2.5/lib-dynload/cStringIO.so ${libdir}/python2.5/pipes.* ${libdir}/python2.5/socket.* ${libdir}/python2.5/tempfile.* ${libdir}/python2.5/StringIO.* " DESCRIPTION_python-compiler="Python Compiler Support" -PR_python-compiler="ml6" +PR_python-compiler="ml7" RDEPENDS_python-compiler="python-core" FILES_python-compiler="${libdir}/python2.5/compiler " DESCRIPTION_python-compression="Python High Level Compression Support" -PR_python-compression="ml6" +PR_python-compression="ml7" RDEPENDS_python-compression="python-core python-zlib" FILES_python-compression="${libdir}/python2.5/gzip.* ${libdir}/python2.5/zipfile.* " DESCRIPTION_python-re="Python Regular Expression APIs" -PR_python-re="ml6" +PR_python-re="ml7" RDEPENDS_python-re="python-core" FILES_python-re="${libdir}/python2.5/re.* ${libdir}/python2.5/sre.* ${libdir}/python2.5/sre_compile.* ${libdir}/python2.5/sre_constants* ${libdir}/python2.5/sre_parse.* " DESCRIPTION_python-xmlrpc="Python XMLRPC Support" -PR_python-xmlrpc="ml6" +PR_python-xmlrpc="ml7" RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang" FILES_python-xmlrpc="${libdir}/python2.5/xmlrpclib.* ${libdir}/python2.5/SimpleXMLRPCServer.* " DESCRIPTION_python-terminal="Python Terminal Controlling Support" -PR_python-terminal="ml6" +PR_python-terminal="ml7" RDEPENDS_python-terminal="python-core python-io" FILES_python-terminal="${libdir}/python2.5/pty.* ${libdir}/python2.5/tty.* " DESCRIPTION_python-email="Python Email Support" -PR_python-email="ml6" +PR_python-email="ml7" RDEPENDS_python-email="python-core python-io python-re python-mime python-audio python-image" FILES_python-email="${libdir}/python2.5/email " DESCRIPTION_python-image="Python Graphical Image Handling" -PR_python-image="ml6" +PR_python-image="ml7" RDEPENDS_python-image="python-core" FILES_python-image="${libdir}/python2.5/colorsys.* ${libdir}/python2.5/imghdr.* ${libdir}/python2.5/lib-dynload/imageop.so ${libdir}/python2.5/lib-dynload/rgbimg.so " DESCRIPTION_python-core-dbg="Python core module debug information" -PR_python-core-dbg="ml6" +PR_python-core-dbg="ml7" RDEPENDS_python-core-dbg="python-core" FILES_python-core-dbg="${libdir}/python2.5/lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug " DESCRIPTION_python-resource="Python Resource Control Interface" -PR_python-resource="ml6" +PR_python-resource="ml7" RDEPENDS_python-resource="python-core" FILES_python-resource="${libdir}/python2.5/lib-dynload/resource.so " DESCRIPTION_python-devel="Python Development Package" -PR_python-devel="ml6" +PR_python-devel="ml7" RDEPENDS_python-devel="python-core" FILES_python-devel="${includedir} ${libdir}/python2.5/config " DESCRIPTION_python-math="Python Math Support" -PR_python-math="ml6" +PR_python-math="ml7" RDEPENDS_python-math="python-core" FILES_python-math="${libdir}/python2.5/lib-dynload/cmath.so ${libdir}/python2.5/lib-dynload/math.so ${libdir}/python2.5/lib-dynload/_random.so ${libdir}/python2.5/random.* ${libdir}/python2.5/sets.* " DESCRIPTION_python-hotshot="Python Hotshot Profiler" -PR_python-hotshot="ml6" +PR_python-hotshot="ml7" RDEPENDS_python-hotshot="python-core" FILES_python-hotshot="${libdir}/python2.5/hotshot ${libdir}/python2.5/lib-dynload/_hotshot.so " DESCRIPTION_python-unixadmin="Python Unix Administration Support" -PR_python-unixadmin="ml6" +PR_python-unixadmin="ml7" RDEPENDS_python-unixadmin="python-core" FILES_python-unixadmin="${libdir}/python2.5/lib-dynload/nis.so ${libdir}/python2.5/lib-dynload/grp.so ${libdir}/python2.5/lib-dynload/pwd.so ${libdir}/python2.5/getpass.* " DESCRIPTION_python-syslog="Python's syslog Interface" -PR_python-syslog="ml6" +PR_python-syslog="ml7" RDEPENDS_python-syslog="python-core" FILES_python-syslog="${libdir}/python2.5/lib-dynload/syslog.so " DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings" -PR_python-tkinter="ml6" +PR_python-tkinter="ml7" RDEPENDS_python-tkinter="python-core" FILES_python-tkinter="${libdir}/python2.5/lib-dynload/_tkinter.so ${libdir}/python2.5/lib-tk " DESCRIPTION_python-gdbm="Python GNU Database Support" -PR_python-gdbm="ml6" +PR_python-gdbm="ml7" RDEPENDS_python-gdbm="python-core" FILES_python-gdbm="${libdir}/python2.5/lib-dynload/gdbm.so " DESCRIPTION_python-fcntl="Python's fcntl Interface" -PR_python-fcntl="ml6" +PR_python-fcntl="ml7" RDEPENDS_python-fcntl="python-core" FILES_python-fcntl="${libdir}/python2.5/lib-dynload/fcntl.so " DESCRIPTION_python-netclient="Python Internet Protocol Clients" -PR_python-netclient="ml6" +PR_python-netclient="ml7" RDEPENDS_python-netclient="python-core python-crypt python-datetime python-io python-lang python-logging python-mime" FILES_python-netclient="${libdir}/python2.5/*Cookie*.* ${libdir}/python2.5/base64.* ${libdir}/python2.5/cookielib.* ${libdir}/python2.5/ftplib.* ${libdir}/python2.5/gopherlib.* ${libdir}/python2.5/hmac.* ${libdir}/python2.5/httplib.* ${libdir}/python2.5/mimetypes.* ${libdir}/python2.5/nntplib.* ${libdir}/python2.5/poplib.* ${libdir}/python2.5/smtplib.* ${libdir}/python2.5/telnetlib.* ${libdir}/python2.5/urllib.* ${libdir}/python2.5/urllib2.* ${libdir}/python2.5/urlparse.* " DESCRIPTION_python-pprint="Python Pretty-Print Support" -PR_python-pprint="ml6" +PR_python-pprint="ml7" RDEPENDS_python-pprint="python-core" FILES_python-pprint="${libdir}/python2.5/pprint.* " DESCRIPTION_python-netserver="Python Internet Protocol Servers" -PR_python-netserver="ml6" +PR_python-netserver="ml7" RDEPENDS_python-netserver="python-core python-netclient" FILES_python-netserver="${libdir}/python2.5/cgi.* ${libdir}/python2.5/BaseHTTPServer.* ${libdir}/python2.5/SimpleHTTPServer.* ${libdir}/python2.5/SocketServer.* " DESCRIPTION_python-curses="Python Curses Support" -PR_python-curses="ml6" +PR_python-curses="ml7" RDEPENDS_python-curses="python-core" FILES_python-curses="${libdir}/python2.5/curses ${libdir}/python2.5/lib-dynload/_curses.so ${libdir}/python2.5/lib-dynload/_curses_panel.so " DESCRIPTION_python-smtpd="Python Simple Mail Transport Daemon" -PR_python-smtpd="ml6" +PR_python-smtpd="ml7" RDEPENDS_python-smtpd="python-core python-netserver python-email python-mime" FILES_python-smtpd="${bindir}/smtpd.* " DESCRIPTION_python-html="Python HTML Processing" -PR_python-html="ml6" +PR_python-html="ml7" RDEPENDS_python-html="python-core" FILES_python-html="${libdir}/python2.5/formatter.* ${libdir}/python2.5/htmlentitydefs.* ${libdir}/python2.5/htmllib.* ${libdir}/python2.5/markupbase.* ${libdir}/python2.5/sgmllib.* " DESCRIPTION_python-readline="Python Readline Support" -PR_python-readline="ml6" +PR_python-readline="ml7" RDEPENDS_python-readline="python-core" FILES_python-readline="${libdir}/python2.5/lib-dynload/readline.so ${libdir}/python2.5/rlcompleter.* " DESCRIPTION_python-subprocess="Python Subprocess Support" -PR_python-subprocess="ml6" +PR_python-subprocess="ml7" RDEPENDS_python-subprocess="python-core python-io python-re python-fcntl python-pickle" FILES_python-subprocess="${libdir}/python2.5/subprocess.* " DESCRIPTION_python-pydoc="Python Interactive Help Support" -PR_python-pydoc="ml6" +PR_python-pydoc="ml7" RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re" FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.5/pydoc.* " DESCRIPTION_python-logging="Python Logging Support" -PR_python-logging="ml6" +PR_python-logging="ml7" RDEPENDS_python-logging="python-core python-io python-lang python-stringold" FILES_python-logging="${libdir}/python2.5/logging " DESCRIPTION_python-mailbox="Python Mailbox Format Support" -PR_python-mailbox="ml6" +PR_python-mailbox="ml7" RDEPENDS_python-mailbox="python-core python-mime" FILES_python-mailbox="${libdir}/python2.5/mailbox.* " DESCRIPTION_python-xml="Python basic XML support." -PR_python-xml="ml6" +PR_python-xml="ml7" RDEPENDS_python-xml="python-core python-re python-netclient" FILES_python-xml="${libdir}/python2.5/lib-dynload/pyexpat.so ${libdir}/python2.5/xml ${libdir}/python2.5/xmllib.* " DESCRIPTION_python-mime="Python MIME Handling APIs" -PR_python-mime="ml6" +PR_python-mime="ml7" RDEPENDS_python-mime="python-core python-io" FILES_python-mime="${libdir}/python2.5/mimetools.* ${libdir}/python2.5/uu.* ${libdir}/python2.5/quopri.* ${libdir}/python2.5/rfc822.* " DESCRIPTION_python-sqlite3="Python Sqlite3 Database Support" -PR_python-sqlite3="ml6" +PR_python-sqlite3="ml7" RDEPENDS_python-sqlite3="python-core" FILES_python-sqlite3="${libdir}/python2.5/sqlite3 " DESCRIPTION_python-tests="Python Tests" -PR_python-tests="ml6" +PR_python-tests="ml7" RDEPENDS_python-tests="python-core" FILES_python-tests="${libdir}/python2.5/test " DESCRIPTION_python-unittest="Python Unit Testing Framework" -PR_python-unittest="ml6" +PR_python-unittest="ml7" RDEPENDS_python-unittest="python-core python-stringold python-lang" FILES_python-unittest="${libdir}/python2.5/unittest.* " DESCRIPTION_python-stringold="Python String APIs [deprecated]" -PR_python-stringold="ml6" +PR_python-stringold="ml7" RDEPENDS_python-stringold="python-core python-re" FILES_python-stringold="${libdir}/python2.5/lib-dynload/strop.so ${libdir}/python2.5/string.* " DESCRIPTION_python-robotparser="Python robots.txt parser" -PR_python-robotparser="ml6" +PR_python-robotparser="ml7" RDEPENDS_python-robotparser="python-core python-netclient" FILES_python-robotparser="${libdir}/python2.5/robotparser.* " DESCRIPTION_python-lib-old-and-deprecated="Python Deprecated Libraries" -PR_python-lib-old-and-deprecated="ml6" +PR_python-lib-old-and-deprecated="ml7" RDEPENDS_python-lib-old-and-deprecated="python-core" FILES_python-lib-old-and-deprecated="${libdir}/python2.5/lib-old " DESCRIPTION_python-compile="Python Bytecode Compilation Support" -PR_python-compile="ml6" +PR_python-compile="ml7" RDEPENDS_python-compile="python-core" FILES_python-compile="${libdir}/python2.5/py_compile.* ${libdir}/python2.5/compileall.* " DESCRIPTION_python-debugger="Python Debugger" -PR_python-debugger="ml6" +PR_python-debugger="ml7" RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell" FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* " DESCRIPTION_python-shell="Python Shell-Like Functionality" -PR_python-shell="ml6" +PR_python-shell="ml7" RDEPENDS_python-shell="python-core python-re" FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shutil.* " DESCRIPTION_python-bsddb="Python Berkeley Database Bindings" -PR_python-bsddb="ml6" +PR_python-bsddb="ml7" RDEPENDS_python-bsddb="python-core" FILES_python-bsddb="${libdir}/python2.5/bsddb " DESCRIPTION_python-mmap="Python Memory-Mapped-File Support" -PR_python-mmap="ml6" +PR_python-mmap="ml7" RDEPENDS_python-mmap="python-core python-io" FILES_python-mmap="${libdir}/python2.5/lib-dynload/mmap.so " DESCRIPTION_python-zlib="Python zlib Support." -PR_python-zlib="ml6" +PR_python-zlib="ml7" RDEPENDS_python-zlib="python-core" FILES_python-zlib="${libdir}/python2.5/lib-dynload/zlib.so " DESCRIPTION_python-db="Python File-Based Database Support" -PR_python-db="ml6" +PR_python-db="ml7" RDEPENDS_python-db="python-core" FILES_python-db="${libdir}/python2.5/anydbm.* ${libdir}/python2.5/dumbdbm.* ${libdir}/python2.5/whichdb.* " DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support" -PR_python-crypt="ml6" +PR_python-crypt="ml7" RDEPENDS_python-crypt="python-core" FILES_python-crypt="${libdir}/python2.5/hashlib.* ${libdir}/python2.5/md5.* ${libdir}/python2.5/sha.* ${libdir}/python2.5/lib-dynload/crypt.so ${libdir}/python2.5/lib-dynload/_hashlib.so ${libdir}/python2.5/lib-dynload/_sha256.so ${libdir}/python2.5/lib-dynload/_sha512.so " DESCRIPTION_python-idle="Python Integrated Development Environment" -PR_python-idle="ml6" +PR_python-idle="ml7" RDEPENDS_python-idle="python-core python-tkinter" FILES_python-idle="${bindir}/idle ${libdir}/python2.5/idlelib " DESCRIPTION_python-lang="Python Low-Level Language Support" -PR_python-lang="ml6" +PR_python-lang="ml7" RDEPENDS_python-lang="python-core" FILES_python-lang="${libdir}/python2.5/lib-dynload/array.so ${libdir}/python2.5/lib-dynload/parser.so ${libdir}/python2.5/lib-dynload/operator.so ${libdir}/python2.5/lib-dynload/_weakref.so ${libdir}/python2.5/lib-dynload/itertools.so ${libdir}/python2.5/lib-dynload/collections.so ${libdir}/python2.5/lib-dynload/_bisect.so ${libdir}/python2.5/lib-dynload/_heapq.so ${libdir}/python2.5/atexit.* ${libdir}/python2.5/bisect.* ${libdir}/python2.5/code.* ${libdir}/python2.5/codeop.* ${libdir}/python2.5/dis.* ${libdir}/python2.5/heapq.* ${libdir}/python2.5/inspect.* ${libdir}/python2.5/keyword.* ${libdir}/python2.5/opcode.* ${libdir}/python2.5/repr.* ${libdir}/python2.5/token.* ${libdir}/python2.5/tokenize.* ${libdir}/python2.5/traceback.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/weakref.* " DESCRIPTION_python-audio="Python Audio Handling" -PR_python-audio="ml6" +PR_python-audio="ml7" RDEPENDS_python-audio="python-core" FILES_python-audio="${libdir}/python2.5/wave.* ${libdir}/python2.5/chunk.* ${libdir}/python2.5/sndhdr.* ${libdir}/python2.5/lib-dynload/ossaudiodev.so ${libdir}/python2.5/lib-dynload/audioop.so " diff --git a/packages/python/python-2.5.1/sitecustomize.py b/packages/python/python-2.5.1/sitecustomize.py new file mode 100644 index 0000000000..b5e78d3200 --- /dev/null +++ b/packages/python/python-2.5.1/sitecustomize.py @@ -0,0 +1,45 @@ +# OpenEmbedded sitecustomize.py (C) 2002-2008 Michael 'Mickey' Lauer +# GPLv2 or later +# Version: 20082201 +# Features: +# * set proper default encoding +# * enable readline completion in the interactive interpreter +# * load command line history on startup +# * save command line history on exit + +HISTORY_FILENAME = "/tmp/python-history-file.txt" + +def __exithandler(): + try: + readline.write_history_file( HISTORY_FILENAME ) + except IOError: + pass + +def __registerExitHandler(): + import atexit + atexit.register( __exithandler ) + +def __enableReadlineSupport(): + readline.parse_and_bind("tab: complete") + try: + readline.read_history_file( "/tmp/python-history-file.txt" ) + except IOError: + pass + +def __enableDefaultEncoding(): + import sys + try: + sys.setdefaultencoding('utf8') + except LookupError: + pass + +import sys +try: + import rlcompleter, readline +except ImportError: + sys.stderr.write( "Python %s (OpenEmbedded build) sitecustomize.py not active. Please install python-readline.\n" % sys.version.split()[0] ) +else: + __enableDefaultEncoding() + __registerExitHandler() + __enableReadlineSupport() + sys.stderr.write( "Python %s (OpenEmbedded build) sitecustomize.py active.\n" % sys.version.split()[0] ) diff --git a/packages/python/python_2.5.1.bb b/packages/python/python_2.5.1.bb index 37f7bdefb8..b274b0d7f9 100644 --- a/packages/python/python_2.5.1.bb +++ b/packages/python/python_2.5.1.bb @@ -7,7 +7,7 @@ DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk" DEPENDS_sharprom = "python-native readline zlib gdbm openssl" # NOTE: Keep the digit in sync with BASEREV in contrib/generate-manifest-2.5.py -PR = "ml6" +PR = "ml7" PYTHON_MAJMIN = "2.5" @@ -18,7 +18,8 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ file://autohell.patch;patch=1 \ file://sitebranding.patch;patch=1 \ file://enable-ctypes-module.patch;patch=1 \ - file://default-is-optimized.patch;patch=1" + file://default-is-optimized.patch;patch=1 \ + file://sitecustomize.py" S = "${WORKDIR}/Python-${PV}" inherit autotools @@ -44,21 +45,21 @@ do_compile_prepend() { } do_compile() { - oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ - HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ - STAGING_LIBDIR=${STAGING_LIBDIR} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - OPT="${CFLAGS}" libpython2.5.so + oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ + HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ + STAGING_INCDIR=${STAGING_INCDIR} \ + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + OPT="${CFLAGS}" libpython2.5.so oe_libinstall -so libpython2.5 ${STAGING_LIBDIR} oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ - HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ - STAGING_LIBDIR=${STAGING_LIBDIR} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - OPT="${CFLAGS}" + HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ + STAGING_INCDIR=${STAGING_INCDIR} \ + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + OPT="${CFLAGS}" } do_stage() { @@ -68,12 +69,15 @@ do_stage() { do_install() { install -m 0644 Makefile.orig Makefile - oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ - HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ - STAGING_LIBDIR=${STAGING_LIBDIR} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - DESTDIR=${D} LIBDIR=${libdir} install + + oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ + HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ + STAGING_INCDIR=${STAGING_INCDIR} \ + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + DESTDIR=${D} LIBDIR=${libdir} install + + install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN} } require python-${PYTHON_MAJMIN}-manifest.inc @@ -81,6 +85,10 @@ require python-${PYTHON_MAJMIN}-manifest.inc RPROVIDES_python-core = "python" RRECOMMENDS_python-core = "python-readline" +# add sitecustomize +FILES_python-core += "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py" + +# package libpython PACKAGES =+ "libpython2" FILES_libpython2 = "${libdir}/libpython*" -- cgit v1.2.3 From c09fa7252df8731fb5f7a4e5b573a34921bf0318 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 23 Jan 2008 21:38:08 +0000 Subject: python-dbus: remove dbus-python, add staging for python-dbus --- packages/python/python-dbus_0.81.1.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'packages/python') diff --git a/packages/python/python-dbus_0.81.1.bb b/packages/python/python-dbus_0.81.1.bb index ad3b1c177b..86628bad26 100644 --- a/packages/python/python-dbus_0.81.1.bb +++ b/packages/python/python-dbus_0.81.1.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus" LICENSE = "GPL" DEPENDS = "expat glib-2.0 virtual/libintl python-pyrex-native python" RDEPENDS = "dbus python-threading python-io python-stringold python-logging" -PR = "ml1" +PR = "ml2" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz \ file://allow-older-autotools.patch;patch=1 \ @@ -16,3 +16,7 @@ inherit distutils-base autotools EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" +do_stage() { + autotools_stage_all +} + -- cgit v1.2.3 From 6b23e923fddee891ca94cb9dee5c74346bdafda4 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 23 Jan 2008 21:39:24 +0000 Subject: python-edbus: remove BROKENness, now that python-dbus stages its includes python-efl: RDEPEND on python-edbus, now that it builds --- packages/python/python-edbus_cvs.bb | 3 +-- packages/python/python-efl.bb | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'packages/python') diff --git a/packages/python/python-edbus_cvs.bb b/packages/python/python-edbus_cvs.bb index 7a4d53762f..652cf919cd 100644 --- a/packages/python/python-edbus_cvs.bb +++ b/packages/python/python-edbus_cvs.bb @@ -1,8 +1,7 @@ require python-efl.inc -# broken until someone adds dbus 1.1.x DEPENDS += "edbus dbus-1.1" -PR = "r0" +PR = "r1" SRC_URI = "${E_CVS};module=e17/proto/python-efl/python-e_dbus" S = "${WORKDIR}/python-e_dbus" diff --git a/packages/python/python-efl.bb b/packages/python/python-efl.bb index ec5e9cd7e2..1c7f23a1eb 100644 --- a/packages/python/python-efl.bb +++ b/packages/python/python-efl.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Python Bindings to the Enlightenment Foundation Libraries" LICENSE = "MIT" SECTION = "devel/python" -RDEPENDS = "python-evas python-ecore python-emotion python-edje python-epsilon" -PR = "ml1" +RDEPENDS = "python-evas python-ecore python-emotion python-edje python-epsilon python-edbus" +PR = "ml2" ALLOW_EMPTY = "1" -- cgit v1.2.3 From ca2dd4565504ad3239ca73c5cf23c234d57a71b8 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 24 Jan 2008 16:55:05 +0000 Subject: python-edbus: fix dbus dependency --- packages/python/python-edbus_cvs.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/python') diff --git a/packages/python/python-edbus_cvs.bb b/packages/python/python-edbus_cvs.bb index 652cf919cd..06a5a45c06 100644 --- a/packages/python/python-edbus_cvs.bb +++ b/packages/python/python-edbus_cvs.bb @@ -1,7 +1,7 @@ require python-efl.inc -DEPENDS += "edbus dbus-1.1" +DEPENDS += "edbus dbus" -PR = "r1" +PR = "r2" SRC_URI = "${E_CVS};module=e17/proto/python-efl/python-e_dbus" S = "${WORKDIR}/python-e_dbus" -- cgit v1.2.3 From a9a239b1b486b9355f0d92422594e135680b05a5 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 28 Jan 2008 11:05:14 +0000 Subject: divers: delete 22 empty directories * skipping packages/netbase/ since those seem to be used albeit incorrectly --- packages/python/python-formencode/.mtn2git_empty | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 packages/python/python-formencode/.mtn2git_empty (limited to 'packages/python') diff --git a/packages/python/python-formencode/.mtn2git_empty b/packages/python/python-formencode/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 -- cgit v1.2.3