diff options
-rw-r--r-- | conf/distro/shr.conf | 2 | ||||
-rw-r--r-- | recipes/e17/e-wm_svn.bb | 34 | ||||
-rw-r--r-- | recipes/e17/illume-keyboard-default_svn.bb | 44 | ||||
-rw-r--r-- | recipes/e17/illume-keyboards-shr/0001-Makefile-update-KEYBOARDS_DIR-for-new-illume2.patch | 23 | ||||
-rw-r--r-- | recipes/e17/illume-keyboards-shr_git.bb | 7 | ||||
-rw-r--r-- | recipes/images/illume-image.bb | 7 | ||||
-rw-r--r-- | recipes/obsolete/shr/e-wm-config-illume-shr_git.bb (renamed from recipes/shr/e-wm-config-illume-shr_git.bb) | 0 | ||||
-rw-r--r-- | recipes/tasks/task-shr-minimal.bb | 4 | ||||
-rw-r--r-- | recipes/tasks/task-x11-illume.bb | 4 |
9 files changed, 67 insertions, 58 deletions
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf index f7f4cf4945..1191d8c88c 100644 --- a/conf/distro/shr.conf +++ b/conf/distro/shr.conf @@ -98,7 +98,7 @@ IMAGE_INITSCRIPTS = "initscripts-shr" IPKG_VARIANT = "opkg" #Illume settings -ILLUME_CONFIG = "e-wm-config-illume-shr" +ILLUME_CONFIG = "e-wm-config-illume2-shr" ILLUME_THEME = "e-wm-theme-illume-gry" # From minimal.conf diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb index e87cd64d72..557e2d9fd4 100644 --- a/recipes/e17/e-wm_svn.bb +++ b/recipes/e17/e-wm_svn.bb @@ -3,7 +3,7 @@ DEPENDS = "eet evas ecore edje efreet edbus" LICENSE = "MIT BSD" SRCNAME = "e" PV = "0.16.999.060+svnr${SRCPV}" -PR = "r14" +PR = "r15" SRCREV = "${EFL_SRCREV}" inherit e update-alternatives @@ -13,7 +13,6 @@ SRC_URI += "\ file://applications.menu \ file://gsm-segfault-fix.patch;maxrev=37617 \ file://fix-profiles.diff;maxrev=39889 \ - file://drop-illume-keyboards.patch \ " SRC_URI_append_openmoko = " file://illume-disable-screensaver.patch" @@ -62,6 +61,7 @@ RREPLACES_${PN} = "systray" PACKAGES =+ "\ ${PN}-config-default \ ${PN}-config-illume \ + ${PN}-config-illume2 \ ${PN}-config-minimalist \ ${PN}-config-netbook \ ${PN}-config-scaleable \ @@ -77,6 +77,9 @@ PACKAGES =+ "\ ${PN}-sysactions \ ${PN}-utils \ ${PN}-menu \ + illume-keyboard-default-alpha \ + illume-keyboard-default-numeric \ + illume-keyboard-default-terminal \ " RRECOMMENDS_${PN} = "\ @@ -90,6 +93,7 @@ RRECOMMENDS_${PN} = "\ PACKAGE_ARCH_${PN}-config-default = "all" PACKAGE_ARCH_${PN}-config-illume = "all" +PACKAGE_ARCH_${PN}-config-illume2 = "all" PACKAGE_ARCH_${PN}-config-minimalist = "all" PACKAGE_ARCH_${PN}-config-netbook = "all" PACKAGE_ARCH_${PN}-config-scaleable = "all" @@ -104,6 +108,9 @@ PACKAGE_ARCH_${PN}-other = "all" PACKAGE_ARCH_${PN}-input-methods = "all" PACKAGE_ARCH_${PN}-sysactions = "all" PACKAGE_ARCH_${PN}-menu = "all" +PACKAGE_ARCH_illume-keyboard-default-alpha = "all" +PACKAGE_ARCH_illume-keyboard-default-numeric = "all" +PACKAGE_ARCH_illume-keyboard-default-terminal = "all" FILES_${PN} = "\ ${bindir}/* \ @@ -112,7 +119,6 @@ FILES_${PN} = "\ ${libdir}/enlightenment/modules/*/*/* \ ${libdir}/enlightenment/*plugins/*/*/* \ ${libdir}/enlightenment/preload/e_precache.so \ - ${datadir}/locale \ ${datadir}/enlightenment/data/icons \ ${datadir}/enlightenment/data/input_methods \ ${datadir}/enlightenment/data/config/profile.cfg \ @@ -120,11 +126,11 @@ FILES_${PN} = "\ ${datadir}/enlightenment/COPYING \ ${datadir}/xsessions/enlightenment.desktop \ ${sysconfdir}/xdg \ - ${datadir}/enlightenment/data/config/illume-home \ " FILES_${PN}-config-default = "${datadir}/enlightenment/data/config/default" FILES_${PN}-config-illume = "${datadir}/enlightenment/data/config/illume" +FILES_${PN}-config-illume2 = "${datadir}/enlightenment/data/config/illume-home" FILES_${PN}-config-minimalist = "${datadir}/enlightenment/data/config/minimalist" FILES_${PN}-config-netbook = "${datadir}/enlightenment/data/config/netbook" FILES_${PN}-config-scaleable = "${datadir}/enlightenment/data/config/scaleable" @@ -142,6 +148,20 @@ FILES_${PN}-sysactions = "${sysconfdir}/enlightenment/sysactions.conf" FILES_${PN}-utils = "${libdir}/enlightenment/utils/*" FILES_${PN}-menu = "${sysconfdir}/xdg/menus/applications.menu" +KEYBOARDS_DIR="${libdir}/enlightenment/modules/illume-keyboard/keyboards" +FILES_illume-keyboard-default-alpha = "\ + ${KEYBOARDS_DIR}/Default.kbd \ + ${KEYBOARDS_DIR}/alpha.png \ +" +FILES_illume-keyboard-default-numeric = "\ + ${KEYBOARDS_DIR}/Numbers.kbd \ + ${KEYBOARDS_DIR}/numeric.png \ +" +FILES_illume-keyboard-default-terminal = "\ + ${KEYBOARDS_DIR}/Terminal.kbd \ + ${KEYBOARDS_DIR}/qwerty.png \ +" + RRECOMMENDS_${PN}-config-default = "${PN}-theme-default" RRECOMMENDS_${PN}-config-illume = "\ ${PN}-theme-illume \ @@ -149,6 +169,12 @@ RRECOMMENDS_${PN}-config-illume = "\ illume-keyboard-default-numeric \ illume-keyboard-default-terminal \ " +RRECOMMENDS_${PN}-config-illume2 = "\ + ${PN}-theme-illume \ + illume-keyboard-default-alpha \ + illume-keyboard-default-numeric \ + illume-keyboard-default-terminal \ +" RRECOMMENDS_${PN}-config-minimalist = "\ ${PN}-background-light-gradient \ diff --git a/recipes/e17/illume-keyboard-default_svn.bb b/recipes/e17/illume-keyboard-default_svn.bb deleted file mode 100644 index 4eb8ed2156..0000000000 --- a/recipes/e17/illume-keyboard-default_svn.bb +++ /dev/null @@ -1,44 +0,0 @@ -DESCRIPTION = "The illume default keyboards" -SECTION = "x11/data" -SRCNAME = "e/src/modules/illume/keyboards" -PV = "0.16.999.060+svnr${SRCPV}" -PR = "r1" -SRCREV = "${EFL_SRCREV}" - -SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=${SRCNAME};proto=http" -S = "${WORKDIR}/${SRCNAME}" - -PACKAGE_ARCH = "all" - -INSTPATH = "/enlightenment/modules/illume/keyboards" -INSTFILES = "\ -Default.kbd \ -alpha.png \ -Numbers.kbd \ -numeric.png \ -Terminal.kbd \ -qwerty.png \ -" - -PACKAGES = "${PN}-alpha ${PN}-numeric ${PN}-terminal" - -FILES_${PN}-alpha = "\ - ${libdir}${INSTPATH}/Default.kbd \ - ${libdir}${INSTPATH}/alpha.png \ -" -FILES_${PN}-numeric = "\ - ${libdir}${INSTPATH}/Numbers.kbd \ - ${libdir}${INSTPATH}/numeric.png \ -" -FILES_${PN}-terminal = "\ - ${libdir}${INSTPATH}/Terminal.kbd \ - ${libdir}${INSTPATH}/qwerty.png \ -" - -do_install() { - install -d ${D}${libdir}${INSTPATH} - for f in ${INSTFILES}; do - install -m 0644 ${S}/${f} ${D}${libdir}${INSTPATH} - done -} - diff --git a/recipes/e17/illume-keyboards-shr/0001-Makefile-update-KEYBOARDS_DIR-for-new-illume2.patch b/recipes/e17/illume-keyboards-shr/0001-Makefile-update-KEYBOARDS_DIR-for-new-illume2.patch new file mode 100644 index 0000000000..b18a69b0ba --- /dev/null +++ b/recipes/e17/illume-keyboards-shr/0001-Makefile-update-KEYBOARDS_DIR-for-new-illume2.patch @@ -0,0 +1,23 @@ +From 9316e3973c44b981e73b953b2861060c6902de47 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Mon, 23 Aug 2010 12:54:05 +0200 +Subject: [PATCH] Makefile: update KEYBOARDS_DIR for new illume2 + +--- + Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile b/Makefile +index 46e9420..3d8757c 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,5 @@ + +-INSTBASE = /usr/lib/enlightenment/modules/illume/keyboards ++INSTBASE = /usr/lib/enlightenment/modules/illume-keyboard/keyboards + + FILES-arabic = Arabic.kbd Arabic.png + FILES-persian = Persian.kbd Persian.png +-- +1.7.2 + diff --git a/recipes/e17/illume-keyboards-shr_git.bb b/recipes/e17/illume-keyboards-shr_git.bb index 49abb9c1a5..302dbd8d24 100644 --- a/recipes/e17/illume-keyboards-shr_git.bb +++ b/recipes/e17/illume-keyboards-shr_git.bb @@ -1,12 +1,13 @@ SECTION = "x11/data" -SRC_URI = "git://git.shr-project.org/repo/illume-keyboards.git;protocol=http;branch=master" +SRC_URI = "git://git.shr-project.org/repo/illume-keyboards.git;protocol=http;branch=master \ + file://0001-Makefile-update-KEYBOARDS_DIR-for-new-illume2.patch" S = "${WORKDIR}/git" SRCREV = "4064489f359a1addf572089b582f317dff5f50e1" PV = "0.0+gitr${SRCPV}" PE = "1" -PR = "r3" +PR = "r4" PACKAGES = "\ @@ -28,7 +29,7 @@ illume-keyboard-persian \ " PACKAGE_ARCH = "all" -KEYBOARDS_DIR="${libdir}/enlightenment/modules/illume/keyboards" +KEYBOARDS_DIR="${libdir}/enlightenment/modules/illume-keyboard/keyboards" AUTHOR_illume-keyboard-alpha = "Jesus McCloud" DESCRIPTION_illume-keyboard-alpha = "Illume keyboard with phone-like layout" diff --git a/recipes/images/illume-image.bb b/recipes/images/illume-image.bb index 8d87d92ae1..8a56f5ae1d 100644 --- a/recipes/images/illume-image.bb +++ b/recipes/images/illume-image.bb @@ -7,6 +7,10 @@ IMAGE_LINGUAS = "en-us de-de fr-fr pt-br ca-es zh-cn zh-tw bg-bg cs-cz da-dk nl- # use exquisite splash SPLASH = "exquisite exquisite-themes exquisite-theme-illume" +# Default illume theme +ILLUME_THEME ?= "e-wm-theme-illume" +ILLUME_CONFIG ?= "e-wm-config-illume2" + # getting the base system up BASE_INSTALL = "\ angstrom-libc-fixup-hack \ @@ -40,7 +44,8 @@ X_INSTALL = "\ e-wm \ e-wm-menu \ e-wm-sysactions \ - e-wm-config-illume \ + ${ILLUME_CONFIG} \ + ${ILLUME_THEME} \ e-wm-config-standard \ e-wm-config-netbook \ e-wm-config-minimalist \ diff --git a/recipes/shr/e-wm-config-illume-shr_git.bb b/recipes/obsolete/shr/e-wm-config-illume-shr_git.bb index 12b3324a41..12b3324a41 100644 --- a/recipes/shr/e-wm-config-illume-shr_git.bb +++ b/recipes/obsolete/shr/e-wm-config-illume-shr_git.bb diff --git a/recipes/tasks/task-shr-minimal.bb b/recipes/tasks/task-shr-minimal.bb index 6f82334896..4e7dbae0d5 100644 --- a/recipes/tasks/task-shr-minimal.bb +++ b/recipes/tasks/task-shr-minimal.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SHR Lite Image Feed" -PR = "r32" +PR = "r33" PV = "2.0" LICENSE = "GPL" @@ -116,8 +116,6 @@ RDEPENDS_${PN}-x = "\ libx11-locale \ # All localedata based on IMAGE_LINGUAS ${@get_rdepends(bb, d)} \ -# Make sure it's available for those who want's to play with illume2 - e-wm-config-illume2-shr \ " RDEPENDS_${PN}-apps = "\ diff --git a/recipes/tasks/task-x11-illume.bb b/recipes/tasks/task-x11-illume.bb index 9af914f3e0..5af3a30d51 100644 --- a/recipes/tasks/task-x11-illume.bb +++ b/recipes/tasks/task-x11-illume.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The Illume Windowing Environment -- install this task to get the SECTION = "x11/wm" LICENSE = "MIT" PV = "1.0" -PR = "r0" +PR = "r1" # WORK IN PROGRESS @@ -10,7 +10,7 @@ inherit task # Default illume theme ILLUME_THEME ?= "e-wm-theme-illume" -ILLUME_CONFIG ?= "e-wm-config-illume" +ILLUME_CONFIG ?= "e-wm-config-illume2" RDEPENDS_${PN} = "\ task-x11-server \ |