illume_svn.bb : update from OM mtn

diff --git a/packages/openmoko-projects/illume/illume-fix-includes.patch b/packages/openmoko-projects/illume/illume-fix-includes.patch
deleted file mode 100644 (file)
index 74418b3..0000000
--- a/packages/openmoko-projects/illume/illume-fix-includes.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-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 f93108d..5136240 100644 (file)
--- a/packages/openmoko-projects/illume_svn.bb
+++ b/packages/openmoko-projects/illume_svn.bb
@@ -1,14 +1,13 @@
 DESCRIPTION = "Illume - Mobile UI module for Enlightenment"
 HOMEPAGE = "http://illume.projects.openmoko.org/"
 LICENSE = "MIT/BSD"
-
 DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native"
-
+RRECOMMENDS = "wamerican"
 PV = "0.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r3"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https \
-          file://illume-fix-includes.patch;patch=1;pnum=0;minrev=14"
+           file://keyboard.patch;patch=1;pnum=0;minrev=17;maxrev=20"
 
 S = "${WORKDIR}/${PN}"
 
@@ -16,18 +15,11 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
                 --x-libraries=${STAGING_LIBDIR} \
-               --enable-simple-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}:'
-  find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:'
-}
-
 FILES_${PN} = "${libdir}/enlightenment/modules/*/*.edj \
                ${libdir}/enlightenment/modules/*/*.desktop \
-               ${libdir}/enlightenment/modules/*/*/*"
-
+               ${libdir}/enlightenment/modules/*/*/* \
+               ${datadir}/${PN} "
 FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/"