diff options
Diffstat (limited to 'packages/python')
24 files changed, 129 insertions, 70 deletions
diff --git a/packages/python/python-dbus/python-path.patch b/packages/python/python-dbus/python-path.patch new file mode 100644 index 0000000000..6bdbd19d03 --- /dev/null +++ b/packages/python/python-dbus/python-path.patch @@ -0,0 +1,21 @@ +--- dbus-python-0.81.1/m4.orig/am-check-python-headers.m4 ++++ dbus-python-0.81.1/m4/am-check-python-headers.m4 +@@ -7214,12 +7214,18 @@ + [AC_REQUIRE([AM_PATH_PYTHON]) + AC_MSG_CHECKING(for headers required to compile python extensions) + dnl deduce PYTHON_INCLUDES ++AC_ARG_WITH(python-includes, ++ [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) ++if test x$py_exec_prefix != x; then ++PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}" ++else + py_prefix=`$PYTHON -c "import sys; print sys.prefix"` + py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` + PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" + if test "$py_prefix" != "$py_exec_prefix"; then + PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" + fi ++fi + AC_SUBST(PYTHON_INCLUDES) + dnl check if the headers exist: + save_CPPFLAGS="$CPPFLAGS" diff --git a/packages/python/python-dbus_0.81.1.bb b/packages/python/python-dbus_0.81.1.bb index 82b9c390ca..ad3b1c177b 100644 --- a/packages/python/python-dbus_0.81.1.bb +++ b/packages/python/python-dbus_0.81.1.bb @@ -4,11 +4,15 @@ 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 = "ml0" +PR = "ml1" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz \ - file://allow-older-autotools.patch;patch=1" + file://allow-older-autotools.patch;patch=1 \ + file://python-path.patch;patch=1" + S = "${WORKDIR}/dbus-python-${PV}" inherit distutils-base autotools +EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" + diff --git a/packages/python/python-ecore_cvs.bb b/packages/python/python-ecore_cvs.bb index e87b415285..73c9f1d0b6 100644 --- a/packages/python/python-ecore_cvs.bb +++ b/packages/python/python-ecore_cvs.bb @@ -1,3 +1,5 @@ require python-efl.inc - DEPENDS += "ecore" + +PR = "r1" + diff --git a/packages/python/python-edje_cvs.bb b/packages/python/python-edje_cvs.bb index 632ca8400a..dfd9722f32 100644 --- a/packages/python/python-edje_cvs.bb +++ b/packages/python/python-edje_cvs.bb @@ -1,4 +1,5 @@ require python-efl.inc - DEPENDS += "edje python-evas" +PR = "r1" + diff --git a/packages/python/python-efl.inc b/packages/python/python-efl.inc index 875a88f5b2..aa12b979f8 100644 --- a/packages/python/python-efl.inc +++ b/packages/python/python-efl.inc @@ -3,7 +3,7 @@ LICENSE = "BSD" AUTHOR = "Gustavo Sverzut Barbieri <barbieri@gmail.com>" HOMEPAGE = "http://www.enlightenment.org" DEPENDS = "python-pyrex-native python-numeric" -PV = "0.0.0+cvs${SRCDATE}" +PV = "0.1.1+cvs${SRCDATE}" inherit distutils diff --git a/packages/python/python-emotion_cvs.bb b/packages/python/python-emotion_cvs.bb index a101c07007..79c7f9633b 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" diff --git a/packages/python/python-evas_cvs.bb b/packages/python/python-evas_cvs.bb index 78f306c060..ff14d95667 100644 --- a/packages/python/python-evas_cvs.bb +++ b/packages/python/python-evas_cvs.bb @@ -1,13 +1,8 @@ require python-efl.inc - DEPENDS += "evas" +PR = "r2" + do_stage() { - distutils_stage_headers + distutils_stage_all } - -#do_stage_append() { -# install -d ${STAGING_DIR}/${BUILD_SYS}/include/${PYTHON_DIR}/python-evas/ -# install -m 0644 evas/evas.c_evas.pxd ${STAGING_DIR}/${BUILD_SYS}/include/${PYTHON_DIR}/python-evas/ -#} - diff --git a/packages/python/python-gammu_0.21.bb b/packages/python/python-gammu_0.21.bb index 0994a9d92b..f8989d9181 100644 --- a/packages/python/python-gammu_0.21.bb +++ b/packages/python/python-gammu_0.21.bb @@ -1,6 +1,3 @@ -#TODO needs recent gammu, which in turn needs cmake which we don't have yet -BROKEN = "1" - DESCRIPTION = "Python bindings for the gammu GSM phone communication library." HOMEPAGE = "http://cihar.com/gammu/python" SECTION = "devel/python" @@ -11,4 +8,3 @@ PR = "ml0" SRC_URI = "http://dl.cihar.com/python-gammu/latest/python-gammu-${PV}.tar.bz2" inherit distutils - diff --git a/packages/python/python-pygtk-0.6.12/.mtn2git_empty b/packages/python/python-lxml/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/python/python-pygtk-0.6.12/.mtn2git_empty +++ b/packages/python/python-lxml/.mtn2git_empty diff --git a/packages/python/python-lxml/use-pkgconfig-to-detect.patch b/packages/python/python-lxml/use-pkgconfig-to-detect.patch new file mode 100644 index 0000000000..b79f1b2300 --- /dev/null +++ b/packages/python/python-lxml/use-pkgconfig-to-detect.patch @@ -0,0 +1,31 @@ +Index: lxml-1.3.3/setupinfo.py +=================================================================== +--- lxml-1.3.3.orig/setupinfo.py 2007-08-20 22:39:09.000000000 +0000 ++++ lxml-1.3.3/setupinfo.py 2007-08-20 22:39:46.000000000 +0000 +@@ -86,7 +86,7 @@ + return static_library_dirs + # filter them from xslt-config --libs + result = [] +- possible_library_dirs = flags('xslt-config --libs') ++ possible_library_dirs = flags('pkg-config libxslt --libs') + for possible_library_dir in possible_library_dirs: + if possible_library_dir.startswith('-L'): + result.append(possible_library_dir[2:]) +@@ -100,7 +100,7 @@ + return static_include_dirs + # filter them from xslt-config --cflags + result = [] +- possible_include_dirs = flags('xslt-config --cflags') ++ possible_include_dirs = flags('pkg-config libxslt --cflags') + for possible_include_dir in possible_include_dirs: + if possible_include_dir.startswith('-I'): + result.append(possible_include_dir[2:]) +@@ -119,7 +119,7 @@ + return result + + # anything from xslt-config --cflags that doesn't start with -I +- possible_cflags = flags('xslt-config --cflags') ++ possible_cflags = flags('pkg-config libxslt --cflags') + for possible_cflag in possible_cflags: + if not possible_cflag.startswith('-I'): + result.append(possible_cflag) diff --git a/packages/python/python-lxml_1.3.3.bb b/packages/python/python-lxml_1.3.3.bb index de0566e38f..7ead15b2a0 100644 --- a/packages/python/python-lxml_1.3.3.bb +++ b/packages/python/python-lxml_1.3.3.bb @@ -3,9 +3,10 @@ HOMEPAGE = "http://codespeak.net/lxml/" AUTHOR = "http://codespeak.net/mailman/listinfo/lxml-dev" LICENSE = "BSD" DEPENDS = "libxml2 libxslt" -PR = "ml0" +PR = "ml1" -SRC_URI = "http://codespeak.net/lxml/lxml-${PV}.tgz" +SRC_URI = "http://codespeak.net/lxml/lxml-${PV}.tgz \ + file://use-pkgconfig-to-detect.patch;patch=1" S = "${WORKDIR}/lxml-${PV}" inherit distutils diff --git a/packages/python/python-openmoko/.mtn2git_empty b/packages/python/python-openmoko/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-openmoko/.mtn2git_empty diff --git a/packages/python/python-openmoko/python-path.patch b/packages/python/python-openmoko/python-path.patch new file mode 100644 index 0000000000..f43260cd0e --- /dev/null +++ b/packages/python/python-openmoko/python-path.patch @@ -0,0 +1,21 @@ +--- python.orig/m4/python.m4 ++++ python/m4/python.m4 +@@ -43,12 +43,18 @@ + [AC_REQUIRE([AM_PATH_PYTHON]) + AC_MSG_CHECKING(for headers required to compile python extensions) + dnl deduce PYTHON_INCLUDES ++AC_ARG_WITH(python-includes, ++ [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) ++if test x$py_exec_prefix != x; then ++PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}" ++else + py_prefix=`$PYTHON -c "import sys; print sys.prefix"` + py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` + PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" + if test "$py_prefix" != "$py_exec_prefix"; then + PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" + fi ++fi + AC_SUBST(PYTHON_INCLUDES) + dnl check if the headers exist: + save_CPPFLAGS="$CPPFLAGS" diff --git a/packages/python/python-openmoko_0.1.bb b/packages/python/python-openmoko_0.1.bb new file mode 100644 index 0000000000..e193f0f2de --- /dev/null +++ b/packages/python/python-openmoko_0.1.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Python Bindings for the OpenMoko Platform" +AUTHOR = "Holger 'Zecke' Freyther" +LICENSE = "LGPL" +DEPENDS = "python-pygtk libmokoui2 libmokojournal2 libmokogsmd2" +SECTION = "devel/python" +PR = "r1" + +SRC_URI = "svn://svn.projects.openmoko.org/svnroot/bindings;module=python;proto=http \ + file://python-path.patch;patch=1" + +S = "${WORKDIR}/python" + +inherit autotools distutils-base + +EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" diff --git a/packages/python/python-pygobject-native_2.12.2.bb b/packages/python/python-pygobject-native_2.12.2.bb deleted file mode 100644 index c93950b31b..0000000000 --- a/packages/python/python-pygobject-native_2.12.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -require python-pygobject_${PV}.bb - -DEPENDS = "python-native" diff --git a/packages/python/python-pygobject_2.12.2.bb b/packages/python/python-pygobject_2.12.2.bb deleted file mode 100644 index 1604b54715..0000000000 --- a/packages/python/python-pygobject_2.12.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Python GObject bindings" -SECTION = "devel/python" -LICENSE = "LGPL" -DEPENDS = "python-pygobject-native" -PR = "ml2" - -SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-${PV}.tar.bz2" -S = "${WORKDIR}/pygobject-${PV}" - -inherit autotools distutils-base pkgconfig - -# otherwise the main package keeps snatching the .pc file away -# and therefore depends on glib-2.0-dev (which only the -dev -# package should). -PACKAGES =+ "${PN}-dev" - -do_stage() { - autotools_stage_all - install -d ${STAGING_LIBDIR}/../share/pygobject/ - cp -dpfR docs/* ${STAGING_LIBDIR}/../share/pygobject/ - install -d ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/ - cp docs/style.css ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/ -} diff --git a/packages/python/python-pygtk-1.2/.mtn2git_empty b/packages/python/python-pygtk-1.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-pygtk-1.2/.mtn2git_empty diff --git a/packages/python/python-pygtk-0.6.12/remove-imlib-et-al b/packages/python/python-pygtk-1.2/remove-imlib-et-al.patch index 94bb164f67..94bb164f67 100644 --- a/packages/python/python-pygtk-0.6.12/remove-imlib-et-al +++ b/packages/python/python-pygtk-1.2/remove-imlib-et-al.patch diff --git a/packages/python/python-pygtk-1.2_0.6.12.bb b/packages/python/python-pygtk-1.2_0.6.12.bb index 90f8cb3821..a974a2471d 100644 --- a/packages/python/python-pygtk-1.2_0.6.12.bb +++ b/packages/python/python-pygtk-1.2_0.6.12.bb @@ -8,7 +8,7 @@ SRCNAME = "pygtk" PR = "r1" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/python/v1.2/${SRCNAME}-${PV}.tar.gz \ - file://remove-imlib-et-al;patch=1 \ + file://remove-imlib-et-al.patch;patch=1 \ file://acinclude.m4" S = "${WORKDIR}/${SRCNAME}-${PV}" @@ -17,7 +17,7 @@ inherit autotools pkgconfig distutils-base EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" -FILES_${PN} = "${libdir}/${PYTHON_DIR}/" +#FILES_${PN} = "${libdir}/${PYTHON_DIR}/" do_configure_prepend() { install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ diff --git a/packages/python/python-pyode_1.0.0.bb b/packages/python/python-pyode_1.0.0.bb deleted file mode 100644 index 95dc0228e3..0000000000 --- a/packages/python/python-pyode_1.0.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "PyODE is a set of open-source Python bindings for The Open Dynamics Engine, \ -an open-source physics engine. PyODE also includes an XODE parser." -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "LGPL" -DEPENDS = "ode" -SRCNAME = "PyODE" - -SRC_URI = "${SOURCEFORGE_MIRROR}/pyode/${SRCNAME}-${PV}.tar.bz2" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils - -do_configure_prepend() { - ln -s ${STAGING_LIBDIR}/.. ../ode -} - diff --git a/packages/python/python-pyqt_4.2.bb b/packages/python/python-pyqt_4.3.bb index 64a9a71f68..c867598b4f 100644 --- a/packages/python/python-pyqt_4.2.bb +++ b/packages/python/python-pyqt_4.3.bb @@ -10,14 +10,29 @@ PR = "ml0" SRC_URI = "http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-${PV}.tar.gz \ file://cross-compile.patch;patch=1" + +BROKEN = "1" +# Something really fishy wrt. to arm/mips/etc. double vs. qreal. May even be a problem in Qt headers itself. +# Symptons: +#| sipQtCoreQTimeLine.cpp:136: error: conflicting return type specified for 'virtual double sipQTimeLine::valueForTime(int) const' +#| /home/pkg/oe/fic-gta01/tmp/staging/arm-angstrom-linux-gnueabi/qt4/include/QtCore/qtimeline.h:92: error: overriding 'virtual qreal QTimeLine::valueForTime(int) const' +# And: +#| sipQtCoreQRectF.cpp: In function 'PyObject* meth_QRectF_getRect(PyObject*, PyObject*)': +#| sipQtCoreQRectF.cpp:1182: error: no matching function for call to 'QRectF::getRect(double*, double*, double*, double*)' +#| /home/pkg/oe/fic-gta01/tmp/staging/arm-angstrom-linux-gnueabi/qt4/include/QtCore/qrect.h:725: note: candidates are: void QRectF::getRect(qreal*, qreal*, qreal*, qreal*) const +#| sipQtCoreQRectF.cpp: In function 'PyObject* meth_QRectF_getCoords(PyObject*, PyObject*)': +#| sipQtCoreQRectF.cpp:1237: error: no matching function for call to 'QRectF::getCoords(double*, double*, double*, double*)' +#| /home/pkg/oe/fic-gta01/tmp/staging/arm-angstrom-linux-gnueabi/qt4/include/QtCore/qrect.h:741: note: candidates are: void QRectF::getCoords(qreal*, qreal*, qreal*, qreal*) const +#| make[1]: *** [sipQtCoreQRectF.o] Error 1 + S = "${WORKDIR}/PyQt-x11-gpl-${PV}" -inherit qmake qt4x11 sip4 distutils-base +inherit qmake qt4x11 sip distutils-base PARALLEL_MAKE = "" QMAKE_PROFILES = "pyqt.pro" -EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_2 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" +EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" EXTRA_OEMAKE = " MAKEFLAGS= " SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml" diff --git a/packages/python/python-pytest_0.6.0.bb b/packages/python/python-pytester_0.6.0.bb index 17db94897c..bc7953b73e 100644 --- a/packages/python/python-pytest_0.6.0.bb +++ b/packages/python/python-pytester_0.6.0.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" HOMEPAGE = "http://oss.wxnet.org/pytester/index.html" PRIORITY = "optional" LICENSE = "GPL" -SRCNAME = "pytest" +SRCNAME = "pytester" PR = "ml0" SRC_URI = "${SOURCEFORGE_MIRROR}/meta-tools/${SRCNAME}-${PV}.tar.gz" diff --git a/packages/python/python24-pyqt2_3.13.bb b/packages/python/python24-pyqt2_3.13.bb index 2c9916b366..04493857dc 100644 --- a/packages/python/python24-pyqt2_3.13.bb +++ b/packages/python/python24-pyqt2_3.13.bb @@ -14,7 +14,7 @@ SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \ file://features" S = "${WORKDIR}/PyQt-x11-gpl-${PV}" -inherit palmtop sip distutils-base +inherit palmtop sip3 distutils-base QMAKE_PROFILES = "pyqt.pro" EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" diff --git a/packages/python/python24-pyqwt2_3.10.bb b/packages/python/python24-pyqwt2_3.10.bb index d78bba7e8a..28f4080c45 100644 --- a/packages/python/python24-pyqwt2_3.10.bb +++ b/packages/python/python24-pyqwt2_3.10.bb @@ -13,7 +13,7 @@ SRC_URI = "http://www.vanille.de/mirror/PyQwt-20040118.tar.gz \ file://features" S = "${WORKDIR}/PyQwt-20040118" -inherit palmtop sip distutils-base +inherit palmtop sip3 distutils-base QMAKE_PROFILES = "pyqwt.pro" EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" |