diff options
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | recipes/e17/elmdentica_svn.bb | 4 | ||||
| -rw-r--r-- | recipes/efl1/ecore/fix-ecore-fb-initialization.patch | 21 | ||||
| -rw-r--r-- | recipes/python/python-edje/0001-fix-unicode-conversion.patch | 11 | ||||
| -rw-r--r-- | recipes/python/python-efl.inc | 14 |
5 files changed, 27 insertions, 25 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index cfbee07e00..af31f67a57 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -2,4 +2,4 @@ # only SRCREVs included in more recipes should be here, otherwise put sane SRCREV to recipe directly OPKG_SRCREV ?= "554" -EFL_SRCREV ?= "51566" +EFL_SRCREV ?= "52678" diff --git a/recipes/e17/elmdentica_svn.bb b/recipes/e17/elmdentica_svn.bb index edaf7383fc..460dbc1a4e 100644 --- a/recipes/e17/elmdentica_svn.bb +++ b/recipes/e17/elmdentica_svn.bb @@ -9,6 +9,4 @@ inherit e PV = "0.9.9+svnr${SRCPV}" PR = "r1" -#temporary bump SRCREV above EFL_SRCREV to fix build after 55b3912f14b1919bf2cd330e48546f11c179794f -#SRCREV = "${EFL_SRCREV}" -SRCREV = "52153" +SRCREV = "${EFL_SRCREV}" diff --git a/recipes/efl1/ecore/fix-ecore-fb-initialization.patch b/recipes/efl1/ecore/fix-ecore-fb-initialization.patch index 2ac61ca63c..cd74c7ebd4 100644 --- a/recipes/efl1/ecore/fix-ecore-fb-initialization.patch +++ b/recipes/efl1/ecore/fix-ecore-fb-initialization.patch @@ -5,23 +5,22 @@ # Signed-off-by: Michael 'Mickey' Lauer <mlauer@vanille-media.de> # -Index: ecore/src/lib/ecore_fb/ecore_fb.c -=================================================================== ---- ecore.orig/src/lib/ecore_fb/ecore_fb.c -+++ ecore/src/lib/ecore_fb/ecore_fb.c -@@ -46,6 +46,9 @@ - +diff -uNr ecore.orig//src/lib/ecore_fb/ecore_fb.c ecore/src/lib/ecore_fb/ecore_fb.c +--- ecore.orig//src/lib/ecore_fb/ecore_fb.c 2010-09-21 12:40:06.000000000 +0200 ++++ ecore/src/lib/ecore_fb/ecore_fb.c 2010-09-24 18:42:02.000000000 +0200 +@@ -39,6 +39,9 @@ + if (!ecore_fb_vt_init()) - return --_ecore_fb_init_count; -+ + return --_ecore_fb_init_count; ++ + if (!ecore_fb_ts_init()) + return --_ecore_fb_init_count; - + ECORE_FB_EVENT_KEY_DOWN = ecore_event_type_new(); ECORE_FB_EVENT_KEY_UP = ecore_event_type_new(); -@@ -70,6 +73,7 @@ +@@ -63,6 +66,7 @@ if (--_ecore_fb_init_count != 0) - return _ecore_fb_init_count; + return _ecore_fb_init_count; + ecore_fb_ts_shutdown(); ecore_fb_vt_shutdown(); diff --git a/recipes/python/python-edje/0001-fix-unicode-conversion.patch b/recipes/python/python-edje/0001-fix-unicode-conversion.patch index 7964e097d1..3b0cdc627c 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 -@@ -391,17 +391,20 @@ cdef public class Edje(evas.c_evas.Object) [object PyEdje, type PyEdje_Type]: +@@ -415,17 +415,20 @@ 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 char *s + cdef const_char_ptr s s = edje_object_part_text_get(self.obj, part) if s == NULL: return None @@ -34,8 +34,5 @@ index 0f4da68..21c237e 100644 - return s + return s.decode("utf8") - def part_swallow(self, char *part, c_evas.Object obj): - """Swallows an object into the edje --- -1.5.6.3 - + def part_text_select_all(self, char *part): + edje_object_part_text_select_all(self.obj, part) diff --git a/recipes/python/python-efl.inc b/recipes/python/python-efl.inc index 745ba57cc6..9845fbff36 100644 --- a/recipes/python/python-efl.inc +++ b/recipes/python/python-efl.inc @@ -10,11 +10,20 @@ RDEPENDS_${PN} += "python-lang" PV = "0.3.1+svnr${SRCPV}" PR = "ml1" -inherit setuptools +# necessary to let the call for python-config succeed +export BUILD_SYS +export HOST_SYS + +inherit autotools pkgconfig distutils-base SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/BINDINGS/python;module=${PN};proto=http" S = "${WORKDIR}/${PN}" +do_configure_prepend() { + # prefix CYTHON_.*_INCLUDEDIR with path to STAGING_DIR_HOST also use $PKG_CONFIG instead of pkg-config directly + sed -i "s#\`\$PKG_CONFIG --variable=includedir \"python-evas#${STAGING_DIR_HOST}\`\$PKG_CONFIG --variable=includedir \"python-evas#g" ${S}/configure.ac +} + do_install_append() { if [ -e examples ]; then for i in `find examples -name "*.edc"`; do @@ -27,8 +36,7 @@ do_install_append() { cd ${S} 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 + find ${D}${datadir}/${PN}/examples -name ".svn" | xargs rm -rf fi } |