From 586acb7d3917eab26fd078259d99d2ebc6381b3c Mon Sep 17 00:00:00 2001 From: Michael Mrozek Date: Sat, 14 Dec 2013 14:34:20 +0100 Subject: [PATCH] python: Fixed some recipes so the build server doesn't complain --- recipes/python/python-ecore_svn.bb | 6 +++++- recipes/python/python-edbus_svn.bb | 6 ++++-- .../python-edje/0001-fix-unicode-conversion.patch | 11 +++++++---- recipes/python/python-edje_svn.bb | 4 ++-- recipes/python/python-elementary_svn.bb | 10 ++++++++-- recipes/python/python-emotion_svn.bb | 2 +- recipes/python/python-evas_svn.bb | 5 +++++ recipes/python/python-pyrtc_git.bb | 6 +++--- 8 files changed, 35 insertions(+), 15 deletions(-) diff --git a/recipes/python/python-ecore_svn.bb b/recipes/python/python-ecore_svn.bb index 7d7fbbab0d..94daaf1dd4 100644 --- a/recipes/python/python-ecore_svn.bb +++ b/recipes/python/python-ecore_svn.bb @@ -1,4 +1,8 @@ require python-efl.inc SRCREV = "${EFL_SRCREV}" DEPENDS += "python-evas ecore" -RDEPENDS_${PN} += "python-evas" +RDEPENDS += "python-evas" + +do_stage() { + distutils_stage_all +} diff --git a/recipes/python/python-edbus_svn.bb b/recipes/python/python-edbus_svn.bb index 801cc2d599..00fffeda74 100644 --- a/recipes/python/python-edbus_svn.bb +++ b/recipes/python/python-edbus_svn.bb @@ -1,5 +1,7 @@ require python-efl.inc SRCREV = "${EFL_SRCREV}" DEPENDS += "edbus python-dbus" -RDEPENDS_${PN} += "python-dbus" -SRCNAME = "python-e_dbus" +RDEPENDS += "python-dbus" + +SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/BINDINGS/python;module=python-e_dbus;proto=http" +S = "${WORKDIR}/python-e_dbus" diff --git a/recipes/python/python-edje/0001-fix-unicode-conversion.patch b/recipes/python/python-edje/0001-fix-unicode-conversion.patch index 3b0cdc627c..7964e097d1 100644 --- a/recipes/python/python-edje/0001-fix-unicode-conversion.patch +++ b/recipes/python/python-edje/0001-fix-unicode-conversion.patch @@ -11,7 +11,7 @@ diff --git a/edje/edje.c_edje_object.pxi b/edje/edje.c_edje_object.pxi index 0f4da68..21c237e 100644 --- a/edje/edje.c_edje_object.pxi +++ b/edje/edje.c_edje_object.pxi -@@ -415,17 +415,20 @@ +@@ -391,17 +391,20 @@ cdef public class Edje(evas.c_evas.Object) [object PyEdje, type PyEdje_Type]: else: raise TypeError("func must be callable or None") @@ -26,7 +26,7 @@ index 0f4da68..21c237e 100644 def part_text_get(self, char *part): - "@rtype: str" + "@rtype: unicode" - cdef const_char_ptr s + cdef char *s s = edje_object_part_text_get(self.obj, part) if s == NULL: return None @@ -34,5 +34,8 @@ index 0f4da68..21c237e 100644 - return s + return s.decode("utf8") - def part_text_select_all(self, char *part): - edje_object_part_text_select_all(self.obj, part) + def part_swallow(self, char *part, c_evas.Object obj): + """Swallows an object into the edje +-- +1.5.6.3 + diff --git a/recipes/python/python-edje_svn.bb b/recipes/python/python-edje_svn.bb index 09cfbb01c3..2c087cabfd 100644 --- a/recipes/python/python-edje_svn.bb +++ b/recipes/python/python-edje_svn.bb @@ -1,6 +1,6 @@ require python-efl.inc SRCREV = "${EFL_SRCREV}" DEPENDS += "edje python-evas" -RDEPENDS_${PN} += "python-evas" +RDEPENDS += "python-evas" -SRC_URI += "file://0001-fix-unicode-conversion.patch" +SRC_URI += "file://0001-fix-unicode-conversion.patch;patch=1" diff --git a/recipes/python/python-elementary_svn.bb b/recipes/python/python-elementary_svn.bb index ea184d03a4..ad82e04813 100644 --- a/recipes/python/python-elementary_svn.bb +++ b/recipes/python/python-elementary_svn.bb @@ -1,4 +1,10 @@ require python-efl.inc SRCREV = "${EFL_SRCREV}" -DEPENDS += "elementary python-evas" -RDEPENDS_${PN} += "python-evas python-ecore python-edje" +DEPENDS += "elementary" +RDEPENDS += "python-evas python-ecore python-edje" +PV = "0.1+svnr${SRCPV}" +PR = "ml0" + +do_stage() { + distutils_stage_all +} diff --git a/recipes/python/python-emotion_svn.bb b/recipes/python/python-emotion_svn.bb index 9f558f868e..38e1355ff4 100644 --- a/recipes/python/python-emotion_svn.bb +++ b/recipes/python/python-emotion_svn.bb @@ -1,4 +1,4 @@ require python-efl.inc SRCREV = "${EFL_SRCREV}" DEPENDS += "emotion python-evas" -RDEPENDS_${PN} += "python-ecore" +RDEPENDS += "python-ecore" diff --git a/recipes/python/python-evas_svn.bb b/recipes/python/python-evas_svn.bb index 1aaec71fad..d2568bae60 100644 --- a/recipes/python/python-evas_svn.bb +++ b/recipes/python/python-evas_svn.bb @@ -1,3 +1,8 @@ require python-efl.inc SRCREV = "${EFL_SRCREV}" DEPENDS += "evas" + +do_stage() { + distutils_stage_all + distutils_stage_headers +} diff --git a/recipes/python/python-pyrtc_git.bb b/recipes/python/python-pyrtc_git.bb index bd8452f298..9b51189bf2 100644 --- a/recipes/python/python-pyrtc_git.bb +++ b/recipes/python/python-pyrtc_git.bb @@ -1,16 +1,16 @@ -require ../freesmartphone/python-helpers.inc - DESCRIPTION = "PyRTC is a python extension module that supports talking to the \ RTC (Real Time Clock) found in most PCs and SOCs" SECTION = "devel/python" +HOMEPAGE = "http://www.freesmartphone.org" AUTHOR = "Michael 'Mickey' Lauer " LICENSE = "GPLv2" SRCNAME = "pyrtc" DEPENDS = "python-cython-native" SRCREV = "${FSO_PYTHONHELPERS_SRCREV}" -PV = "1.0.0+gitr${SRCPV}" +PV = "1.0.0+gitr${SRCREV}" PR = "ml1" +SRC_URI = "git://git.freesmartphone.org/python-helpers.git;protocol=git;branch=master" S = "${WORKDIR}/git/${SRCNAME}" inherit distutils -- 2.39.5