merge of 'e4ac19c8fb4b1bbdef43e088c2683bcbf2c68ce4'

     and 'f0eacab861487e4f57866eb471b16e78a2167a7e'

3 files changed, 75 insertions, 2 deletions

diff --git a/packages/openmoko-projects/illume/.mtn2git_empty b/packages/openmoko-projects/illume/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko-projects/illume/.mtn2git_empty
diff --git a/packages/openmoko-projects/illume/illume-fix-includes.patch b/packages/openmoko-projects/illume/illume-fix-includes.patch
new file mode 100644
index 0000000000..74418b31de
--- /dev/null
+++ b/packages/openmoko-projects/illume/illume-fix-includes.patch
@@ -0,0 +1,70 @@
+Index: src/e_mod_win.c
+===================================================================
+--- src/e_mod_win.c	(revision 14)
++++ src/e_mod_win.c	(working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ #include "e_mod_win.h"
+ #include "e_slipshelf.h"
+ #include "e_slipwin.h"
+Index: src/e_kbd.c
+===================================================================
+--- src/e_kbd.c	(revision 14)
++++ src/e_kbd.c	(working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ #include "e_kbd.h"
+ 
+ /* internal calls */
+Index: src/e_slip.c
+===================================================================
+--- src/e_slip.c	(revision 14)
++++ src/e_slip.c	(working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ #include "e_slip.h"
+ 
+ EAPI int E_EVENT_SLIP_DEL = 0;
+Index: src/e_mod_layout.c
+===================================================================
+--- src/e_mod_layout.c	(revision 14)
++++ src/e_mod_layout.c	(working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ #include "e_mod_main.h"
+ #include "e_mod_layout.h"
+ 
+Index: src/e_mod_main.c
+===================================================================
+--- src/e_mod_main.c	(revision 14)
++++ src/e_mod_main.c	(working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ 
+ #include "e_kbd.h"
+ #include "e_slipshelf.h"
+Index: src/e_slipwin.c
+===================================================================
+--- src/e_slipwin.c	(revision 14)
++++ src/e_slipwin.c	(working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ #include "e_slipwin.h"
+ 
+ EAPI int E_EVENT_SLIPWIN_DEL = 0;
+Index: src/e_slipshelf.c
+===================================================================
+--- src/e_slipshelf.c	(revision 14)
++++ src/e_slipshelf.c	(working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ #include "e_slipshelf.h"
+ 
+ /* FIXME: break out gadcons for 2 swallow areas */
diff --git a/packages/openmoko-projects/illume_svn.bb b/packages/openmoko-projects/illume_svn.bb
index 194eac8d42..f93108dca4 100644
--- a/packages/openmoko-projects/illume_svn.bb
+++ b/packages/openmoko-projects/illume_svn.bb
@@ -2,11 +2,13 @@ DESCRIPTION = "Illume - Mobile UI module for Enlightenment"
 HOMEPAGE = "http://illume.projects.openmoko.org/"
 LICENSE = "MIT/BSD"
 
-DEPENDS = "eet evas ecore edje embryo efreet edbus edje-native embryo-native"
+DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native"
 
 PV = "0.0+svnr${SRCREV}"
+PR = "r1"
 
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https"
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https \
+	   file://illume-fix-includes.patch;patch=1;pnum=0;minrev=14"
 
 S = "${WORKDIR}/${PN}"
 
@@ -17,6 +19,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
 		--enable-simple-x11 \
                 --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
+export CFLAGS += "-DE_TYPEDEFS=1"
 
 do_configure_append() {
   find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'