diff options
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 4 | ||||
| -rw-r--r-- | packages/openmoko-projects/illume-theme_svn.bb | 11 | ||||
| -rw-r--r-- | packages/openmoko-projects/illume/keyboard.patch | 89 | ||||
| -rw-r--r-- | packages/openmoko-projects/illume_svn.bb | 6 |
4 files changed, 8 insertions, 102 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index f60c218772..1ae05e87db 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -48,8 +48,8 @@ SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f" SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" -SRCREV_pn-illume ?= "58" -SRCREV_pn-illume-theme ?= "58" +SRCREV_pn-illume ?= "124" +SRCREV_pn-illume-theme ?= "124" SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" SRCREV_pn-libcalenabler2 ?= "1410" diff --git a/packages/openmoko-projects/illume-theme_svn.bb b/packages/openmoko-projects/illume-theme_svn.bb index b360d3b14a..3ea672117f 100644 --- a/packages/openmoko-projects/illume-theme_svn.bb +++ b/packages/openmoko-projects/illume-theme_svn.bb @@ -4,27 +4,22 @@ LICENSE = "MIT/BSD" PACKAGE_ARCH="all" PV = "0.0+svnr${SRCREV}" -PR = "r4" +PR = "r5" 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/ + install -d ${D}${datadir}/enlightenment/data/init/ # 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 + install -m 0644 ${S}/misc-data/illume_init.edj ${D}${datadir}/enlightenment/data/init/ } diff --git a/packages/openmoko-projects/illume/keyboard.patch b/packages/openmoko-projects/illume/keyboard.patch deleted file mode 100644 index 320e798a3e..0000000000 --- a/packages/openmoko-projects/illume/keyboard.patch +++ /dev/null @@ -1,89 +0,0 @@ -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 \ diff --git a/packages/openmoko-projects/illume_svn.bb b/packages/openmoko-projects/illume_svn.bb index 5136240568..f3fb611e09 100644 --- a/packages/openmoko-projects/illume_svn.bb +++ b/packages/openmoko-projects/illume_svn.bb @@ -4,10 +4,9 @@ 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 = "r3" +PR = "r6" -SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https \ - file://keyboard.patch;patch=1;pnum=0;minrev=17;maxrev=20" +SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https" S = "${WORKDIR}/${PN}" @@ -21,5 +20,6 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ FILES_${PN} = "${libdir}/enlightenment/modules/*/*.edj \ ${libdir}/enlightenment/modules/*/*.desktop \ ${libdir}/enlightenment/modules/*/*/* \ + ${datadir}/enlightenment/data/config/*/* \ ${datadir}/${PN} " FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/" |