aboutsummaryrefslogtreecommitdiff
path: root/meta-efl/recipes-devtools
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-12-13 09:49:07 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2011-12-20 14:53:58 +0100
commit458f724d9bdb716b6907ea797a92fe0f67f1f72b (patch)
treee18337d08518cf6aa916823e238d52b14671bd37 /meta-efl/recipes-devtools
parent5b1dff8b4f52873060b75813eeba864d64a70083 (diff)
e-base: bump EFL_SRCREV remove EFL_SRCREV_1.* and applied patches from libeflvala, elsa and python-elementary
* elementary (Evas_GL) and e-wm (backlight) depends on trunk again.. 10:06:36 < JaMa> shouldn't elementary and e17 depend only on efl-1.1? | ./Elementary.h:372:21: fatal error: Evas_GL.h: No such file or directory and e/src/bin/e_backlight.c:43: undefined reference to `ecore_x_randr_output_backlight_available' 10:07:32 < JaMa> but I'll recheck my configs 10:08:20 < moa> hum, that evas_gl.h would be a problem indeed 10:08:36 < moa> for e, i don't know 10:08:57 <@raster> elm requires svn evas 10:09:02 <@raster> thats unfortunately how it is 10:09:12 <@raster> requires evas_gl 10:09:35 < JaMa> maybe this is missing in 1.1 branch for e17? r65838 10:09:42 <@raster> yes 10:09:46 <@raster> its missing 10:09:50 <@raster> as its in trunk 10:09:53 <@raster> its a "new feature" 10:09:58 <@raster> not in stable 10:10:15 <@raster> uy'd have to patch out the support to make elm from svn build 10:10:42 < JaMa> raster: ok then I just didn't understand the dependency on "only" efl-1.1 right.. I'll update the rest of efl to same rev (instead of keeping them on 1.1 release) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl/recipes-devtools')
-rw-r--r--meta-efl/recipes-devtools/python/python-elementary/0001-python-elementary-temporary-fix-for-build-breakage.patch49
-rw-r--r--meta-efl/recipes-devtools/python/python-elementary_svn.bb2
2 files changed, 0 insertions, 51 deletions
diff --git a/meta-efl/recipes-devtools/python/python-elementary/0001-python-elementary-temporary-fix-for-build-breakage.patch b/meta-efl/recipes-devtools/python/python-elementary/0001-python-elementary-temporary-fix-for-build-breakage.patch
deleted file mode 100644
index ef61c99..0000000
--- a/meta-efl/recipes-devtools/python/python-elementary/0001-python-elementary-temporary-fix-for-build-breakage.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 61b8233c582bcb1786bfcafa984abfd523fedcca Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Thu, 1 Dec 2011 22:07:38 +0100
-Subject: [PATCH] python-elementary: temporary fix for build breakage
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- .../include/elementary/c_elementary.pxd | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/include/elementary/c_elementary.pxd b/include/elementary/c_elementary.pxd
-index 16535c5..09986f8 100644
---- a/include/elementary/c_elementary.pxd
-+++ b/include/elementary/c_elementary.pxd
-@@ -169,13 +169,13 @@ cdef extern from "Elementary.h":
- evas.c_evas.Eina_Bool hover_top
- evas.c_evas.Eina_Bool hover_bottom
-
-- ctypedef char *(*GenlistItemLabelGetFunc)(void *data, evas.c_evas.Evas_Object *obj, const_char_ptr part)
-+ ctypedef char *(*GenlistItemTextGetFunc)(void *data, evas.c_evas.Evas_Object *obj, const_char_ptr part)
- ctypedef evas.c_evas.Evas_Object *(*GenlistItemIconGetFunc)(void *data, evas.c_evas.Evas_Object *obj, const_char_ptr part)
- ctypedef evas.c_evas.Eina_Bool (*GenlistItemStateGetFunc)(void *data, evas.c_evas.Evas_Object *obj, const_char_ptr part)
- ctypedef void (*GenlistItemDelFunc)(void *data, evas.c_evas.Evas_Object *obj)
-
- ctypedef struct Elm_Genlist_Item_Class_Func:
-- GenlistItemLabelGetFunc label_get
-+ GenlistItemTextGetFunc text_get
- GenlistItemIconGetFunc content_get
- GenlistItemStateGetFunc state_get
- GenlistItemDelFunc del_ "del"
-@@ -184,13 +184,13 @@ cdef extern from "Elementary.h":
- char *item_style
- Elm_Genlist_Item_Class_Func func
-
-- ctypedef char *(*GengridItemLabelGetFunc)(void *data, evas.c_evas.Evas_Object *obj, const_char_ptr part)
-+ ctypedef char *(*GengridItemTextGetFunc)(void *data, evas.c_evas.Evas_Object *obj, const_char_ptr part)
- ctypedef evas.c_evas.Evas_Object *(*GengridItemIconGetFunc)(void *data, evas.c_evas.Evas_Object *obj, const_char_ptr part)
- ctypedef evas.c_evas.Eina_Bool (*GengridItemStateGetFunc)(void *data, evas.c_evas.Evas_Object *obj, const_char_ptr part)
- ctypedef void (*GengridItemDelFunc)(void *data, evas.c_evas.Evas_Object *obj)
-
- ctypedef struct Elm_Gengrid_Item_Class_Func:
-- GengridItemLabelGetFunc label_get
-+ GengridItemTextGetFunc text_get
- GengridItemIconGetFunc content_get
- GengridItemStateGetFunc state_get
- GengridItemDelFunc del_ "del"
---
-1.7.8.rc4
-
diff --git a/meta-efl/recipes-devtools/python/python-elementary_svn.bb b/meta-efl/recipes-devtools/python/python-elementary_svn.bb
index 37a8ffa..6d8b0b8 100644
--- a/meta-efl/recipes-devtools/python/python-elementary_svn.bb
+++ b/meta-efl/recipes-devtools/python/python-elementary_svn.bb
@@ -5,5 +5,3 @@ PR = "${INC_PR}.2"
SRCREV = "${EFL_SRCREV}"
DEPENDS += "elementary python-evas"
RDEPENDS_${PN} += "python-evas python-ecore python-edje"
-
-SRC_URI += " file://0001-python-elementary-temporary-fix-for-build-breakage.patch"