Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded

5 files changed, 123 insertions, 2 deletions

diff --git a/recipes/e17/e-tasks_svn.bb b/recipes/e17/e-tasks_svn.bb
new file mode 100644
index 0000000000..4f27744717
--- /dev/null
+++ b/recipes/e17/e-tasks_svn.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "tasks app for openmoko phones based on elementary"
+HOMEPAGE = "http://code.google.com/p/e-tasks/"
+AUTHOR = "cchandel"
+LICENSE = "GPLv2"
+SECTION = "e/apps"
+#DEPENDS = "elementary eina edbus"
+
+PV = "0.0.1+svnr${SRCPV}"
+PR = "r0"
+
+SRC_URI = "svn://e-tasks.googlecode.com/svn/trunk;module=.;proto=http"
+S = "${WORKDIR}"
+
+inherit autotools
+
diff --git a/recipes/e17/e-wm/wizard-module-skipping.patch b/recipes/e17/e-wm/wizard-module-skipping.patch
new file mode 100644
index 0000000000..d124325b3b
--- /dev/null
+++ b/recipes/e17/e-wm/wizard-module-skipping.patch
@@ -0,0 +1,63 @@
+Index: e/src/modules/wizard/Makefile.am
+===================================================================
+--- e/src/modules/wizard/Makefile.am	(revision 43860)
++++ e/src/modules/wizard/Makefile.am	(working copy)
+@@ -6,7 +6,7 @@
+ files_DATA = \
+ e-module-$(MODULE).edj module.desktop
+ 
+-EXTRA_DIST = $(files_DATA) page_040.c page_050.c page_060.c
++EXTRA_DIST = $(files_DATA) page_030.c page_040.c page_050.c page_060.c page_070.c page_080.c
+ 
+ # the module .so file
+ INCLUDES               = -I. \
+@@ -21,9 +21,6 @@
+                          page_000.la \
+                          page_010.la \
+                          page_020.la \
+-                         page_030.la \
+-                         page_070.la \
+-                         page_080.la \
+                          page_200.la
+ 
+ ### disabled because profile selector really does the job. code here just for
+@@ -60,10 +57,10 @@
+ page_020_la_DEPENDENCIES = $(top_builddir)/config.h
+ 
+ #Choose Menus
+-page_030_la_SOURCES      = page_030.c
+-page_030_la_LIBADD       = @e_libs@ @dlopen_libs@
+-page_030_la_LDFLAGS      = -module -avoid-version
+-page_030_la_DEPENDENCIES = $(top_builddir)/config.h
++#page_030_la_SOURCES      = page_030.c
++#page_030_la_LIBADD       = @e_libs@ @dlopen_libs@
++#page_030_la_LDFLAGS      = -module -avoid-version
++#page_030_la_DEPENDENCIES = $(top_builddir)/config.h
+ 
+ #page_040_la_SOURCES      = page_040.c
+ #page_040_la_LIBADD       = @e_libs@ @dlopen_libs@
+@@ -81,16 +78,16 @@
+ #page_060_la_DEPENDENCIES = $(top_builddir)/config.h
+ 
+ #Choose appliactions
+-page_070_la_SOURCES      = page_070.c
+-page_070_la_LIBADD       = @e_libs@ @dlopen_libs@
+-page_070_la_LDFLAGS      = -module -avoid-version
+-page_070_la_DEPENDENCIES = $(top_builddir)/config.h
++#page_070_la_SOURCES      = page_070.c
++#page_070_la_LIBADD       = @e_libs@ @dlopen_libs@
++#page_070_la_LDFLAGS      = -module -avoid-version
++#page_070_la_DEPENDENCIES = $(top_builddir)/config.h
+ 
+ #Choose quick launch
+-page_080_la_SOURCES      = page_080.c
+-page_080_la_LIBADD       = @e_libs@ @dlopen_libs@
+-page_080_la_LDFLAGS      = -module -avoid-version
+-page_080_la_DEPENDENCIES = $(top_builddir)/config.h
++#page_080_la_SOURCES      = page_080.c
++#page_080_la_LIBADD       = @e_libs@ @dlopen_libs@
++#page_080_la_LDFLAGS      = -module -avoid-version
++#page_080_la_DEPENDENCIES = $(top_builddir)/config.h
+ 
+ page_200_la_SOURCES      = page_200.c
+ page_200_la_LIBADD       = @e_libs@ @dlopen_libs@
diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb
index de0f48f059..a935728e02 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 = "r6"
+PR = "r7"
 
 inherit e update-alternatives
 
@@ -16,6 +16,11 @@ SRC_URI += "\
 
 SRC_URI_append_openmoko = " file://illume-disable-screensaver.patch;patch=1"
 
+SRC_URI_append_shr = " \
+  file://illume-disable-screensaver.patch;patch=1 \
+  file://wizard-module-skipping.patch;patch=1 \
+"
+
 EXTRA_OECONF = "\
   --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
   --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \
@@ -75,6 +80,7 @@ PACKAGES =+ "\
   ${PN}-input-methods \
   ${PN}-sysactions \
   ${PN}-utils \
+  ${PN}-menu \
 "
 
 RRECOMMENDS_${PN} = "\
@@ -84,6 +90,7 @@ RRECOMMENDS_${PN} = "\
   ${PN}-other \
   ${PN}-input-methods \
   ${PN}-sysactions \
+  ${PN}-menu \
 "
 
 PACKAGE_ARCH_${PN}-config-default = "all"
@@ -101,6 +108,7 @@ PACKAGE_ARCH_${PN}-icons = "all"
 PACKAGE_ARCH_${PN}-other = "all"
 PACKAGE_ARCH_${PN}-input-methods = "all"
 PACKAGE_ARCH_${PN}-sysactions = "all"
+PACKAGE_ARCH_${PN}-menu = "all"
 
 FILES_${PN} = "\
   ${bindir}/* \
@@ -135,6 +143,7 @@ FILES_${PN}-other = "${datadir}/enlightenment/data/other"
 FILES_${PN}-input-methods = "${datadir}/enlightenment/data/input_methods"
 FILES_${PN}-sysactions = "${sysconfdir}/enlightenment/sysactions.conf"
 FILES_${PN}-utils = "${libdir}/enlightenment/utils/*"
+FILES_${PN}-menu = "${sysconfdir}/xdg/menus/applications.menu"
 
 RRECOMMENDS_${PN}-config-default = "${PN}-theme-default"
 RRECOMMENDS_${PN}-config-illume = "${PN}-theme-illume"
@@ -160,7 +169,8 @@ FILES_${PN}-doc += "\
   ${datadir}/enlightenment/doc \
 "
 
-CONFFILES_${PN} = "${sysconfdir}/xdg/menus/applications.menu"
+CONFFILES_${PN}-menu = "${sysconfdir}/xdg/menus/applications.menu"
+CONFFILES_${PN}-sysactions = "/etc/enlightenment/sysactions.conf"
 
 ALTERNATIVE_PATH = "${bindir}/enlightenment_start.oe"
 ALTERNATIVE_NAME = "x-window-manager"
diff --git a/recipes/e17/elmdentica_svn.bb b/recipes/e17/elmdentica_svn.bb
new file mode 100644
index 0000000000..5988d904ed
--- /dev/null
+++ b/recipes/e17/elmdentica_svn.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "A indenti.ca client for E"
+DEPENDS = "glib-2.0 gconf libxml2 curl elementary sqlite3-native"
+LICENSE = "GPLv3+"
+SECTION = "e/apps"
+HOMEPAGE = "http://elmdentica.googlecode.com"
+AUTHOR = "seabra"
+PV = "0.7.0+svnr${SRCPV}"
+PR = "r0"
+ 
+ 
+SRC_URI = "svn://elmdentica.googlecode.com/svn;module=trunk;proto=http"
+ 
+S = "${WORKDIR}/trunk"
+ 
+inherit autotools pkgconfig
diff --git a/recipes/e17/eve_svn.bb b/recipes/e17/eve_svn.bb
new file mode 100644
index 0000000000..d1a0e4775a
--- /dev/null
+++ b/recipes/e17/eve_svn.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = " Enlightenment webbrowser"
+LICENSE = "GPL"
+DEPENDS = "webkit-efl evas ecore edje"
+PV = "0.0.1+svnr${SRCPV}"
+PR = "r3"
+
+LDFLAGS += "-lstdc++"
+
+inherit e
+
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/PROTO;module=eve;proto=http \
+"
+
+S = "${WORKDIR}/eve"
+
+RDEPENDS_${PN} = "${PN}-themes"
+
+