[oe-commits] org.oe.dev illume-theme_svn.bb, illume/keyboard.patch : illume fixes and theme from OM mtn

[xora commit]

illume-theme_svn.bb, illume/keyboard.patch : illume fixes and theme from OM mtn

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 139be51dc14a3c9462595865c5d5b27baae3d458
ViewMTN: http://monotone.openembedded.org/revision/info/139be51dc14a3c9462595865c5d5b27baae3d458
Files:
1
packages/openmoko-projects/illume/keyboard.patch
packages/openmoko-projects/illume-theme_svn.bb
Diffs:

#
# mt diff -r9246f3473a5cb0f2fba69cc0616c39b95c64b322 -r139be51dc14a3c9462595865c5d5b27baae3d458
#
#
#
# add_file "packages/openmoko-projects/illume/keyboard.patch"
#  content [d0ab0f49ef182b624e0f667a2e062b013060de99]
# 
# add_file "packages/openmoko-projects/illume-theme_svn.bb"
#  content [1b8f6932f93b1ca178de665cfc71a366cdb05123]
#
============================================================
--- packages/openmoko-projects/illume/keyboard.patch	d0ab0f49ef182b624e0f667a2e062b013060de99
+++ packages/openmoko-projects/illume/keyboard.patch	d0ab0f49ef182b624e0f667a2e062b013060de99
@@ -0,0 +1,89 @@
+Index: configure.in
+===================================================================
+--- configure.in	(Revision 17)
++++ configure.in	(Arbeitskopie)
+@@ -28,6 +28,9 @@
+ AC_SUBST(LOCALEDIR, "${localedir}")
+ AC_DEFINE_UNQUOTED(LOCALEDIR, "${localedir}", "Module Locale Directory")
+ 
++keyboarddir="${datarootdir}/${PACKAGE}/keyboard"
++AC_SUBST(keyboarddir)
++
+ #
+ # Check EFL Libs
+ #
+Index: src/e_kbd.c
+===================================================================
+--- src/e_kbd.c	(Revision 17)
++++ src/e_kbd.c	(Arbeitskopie)
+@@ -57,6 +57,7 @@
+ 
+ static int _e_kbd_config_parse(E_Kbd *kbd, const char *config);
+ static Evas_Object *_theme_obj_new(Evas *e, const char *custom_dir, const char *group);
++static char* _e_kbd_get_default_path(void);
+ 
+ /* state */
+ 
+@@ -470,7 +471,7 @@
+    edje_object_part_swallow(kbd->base_obj, "e.swallow.content", o);
+    evas_object_show(o);
+    kbd->layout_obj = o;
+-   _e_kbd_config_parse(kbd, "/home/raster/work/illume/default.kbd");
++   _e_kbd_config_parse(kbd, _e_kbd_get_default_path());
+    _e_kbd_layout_build(kbd);
+    
+    edje_object_size_min_calc(kbd->base_obj, &mw, &mh);
+@@ -744,3 +745,26 @@
+      }
+    return o;
+ }
++
++/*
++ * Return the to be used keyboard file
++ */
++static char *
++_e_kbd_get_default_path()
++{
++   static char *buf = 0;
++
++   if (getenv("ILLUME_KEYBOARD_DIR"))
++     {
++        if (!buf)
++           {
++              buf = (char*)malloc(sizeof(char)*PATH_MAX);
++           }
++
++        snprintf(buf, PATH_MAX, "%s/default.kbd", getenv("ILLUME_KEYBOARD_DIR"));
++        return buf;
++     }
++
++
++    return KEYBOARDDIR"/default.kbd";
++}
+Index: src/Makefile.am
+===================================================================
+--- src/Makefile.am	(Revision 17)
++++ src/Makefile.am	(Arbeitskopie)
+@@ -1,6 +1,8 @@
+ ACLOCAL_AMFLAGS = -I m4
+ MAINTAINERCLEANFILES = Makefile.in
+ 
++AM_CPPFLAGS = -DKEYBOARDDIR=\"$(keyboarddir)\"
++
+ INCLUDES = -I. \
+ 	 -I$(top_srcdir) \
+ 	 @e_cflags@
+Index: Makefile.am
+===================================================================
+--- Makefile.am	(Revision 17)
++++ Makefile.am	(Arbeitskopie)
+@@ -14,6 +14,9 @@
+ files_DATA = module.desktop \
+ 	     e-module-illume.edj \
+ 	     illume.edj
++
++keybddir = $(keyboarddir)
++keybd_DATA = default.kbd
+ 	     
+ EXTRA_DIST = $(files_DATA) \
+ 	     illume.edc \
============================================================
--- packages/openmoko-projects/illume-theme_svn.bb	1b8f6932f93b1ca178de665cfc71a366cdb05123
+++ packages/openmoko-projects/illume-theme_svn.bb	1b8f6932f93b1ca178de665cfc71a366cdb05123
@@ -0,0 +1,30 @@
+DESCRIPTION = "Illume - Mobile UI module for Enlightenment"
+HOMEPAGE = "http://illume.projects.openmoko.org/"
+LICENSE = "MIT/BSD"
+
+PACKAGE_ARCH="all"
+PV = "0.0+svnr${SRCREV}"
+PR = "r4"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=illume;proto=https"
+S = "${WORKDIR}/illume"
+
+python do_unpack_append() {
+	bb.note("Unpacking to %s" % os.getcwd())
+	os.system("cd illume; tar -xz --no-same-owner -f misc-data/untar-me-from-root.tar.gz")
+}
+
+CONFFILES_${PN} = "${sysconfdir}/enlightenment/default_profile"
+FILES_${PN} = "${sysconfdir}/enlightenment ${datadir}/enlightenment"
+
+do_install() {
+    install -d ${D}${sysconfdir}/enlightenment
+    install -d ${D}${datadir}/enlightenment/data/themes/
+    install -d ${D}${datadir}/enlightenment/data/config/
+
+    # Make illume the default profile
+    echo 'E_PROFILE="-profile illume"' > ${D}${sysconfdir}/enlightenment/default_profile
+
+    install -m 0644 ${S}/misc-data/illume.edj ${D}${datadir}/enlightenment/data/themes/
+    cp -pPR ${S}/.e/e/config/default ${D}${datadir}/enlightenment/data/config/illume
+}