summaryrefslogtreecommitdiff
path: root/recipes
diff options
context:
space:
mode:
authorKlaus Kurzmann <mok@fluxnetz.de>2009-11-22 21:11:52 +0100
committerKlaus Kurzmann <mok@fluxnetz.de>2009-11-22 21:11:52 +0100
commit646b1eb8132a5126462dc8a4846ec6d9adc11ca5 (patch)
treeb454ca55a33a35144d8e84fda699f8fb346def5b /recipes
parent819dadf4fd321ca09d1a72d478836ff96cb41e15 (diff)
e-wm_svn.bb: add patch for SHR to skip some modules from the first start wizard
patch is only applied when building the SHR distro Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>
Diffstat (limited to 'recipes')
-rw-r--r--recipes/e17/e-wm/wizard-module-skipping.patch63
-rw-r--r--recipes/e17/e-wm_svn.bb7
2 files changed, 69 insertions, 1 deletions
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..83dbd81dde 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 \