diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-08-16 09:48:17 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2011-08-18 10:15:28 +0200 |
commit | 30fb538629c6a307b0e574028a11ae196e8a791f (patch) | |
tree | 925f5a404b8bfbd5388bce26cf7479cfe5832921 /meta-efl | |
parent | 1f806520f152cbda2bc4aa7cbfde0dbfea7dc9b7 (diff) | |
download | meta-openembedded-30fb538629c6a307b0e574028a11ae196e8a791f.tar.gz |
e-wm: remove SHR specific patch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl')
-rw-r--r-- | meta-efl/recipes-efl/e17/e-wm/wizard-module-skipping.patch | 63 | ||||
-rw-r--r-- | meta-efl/recipes-efl/e17/e-wm_svn.bb | 4 |
2 files changed, 0 insertions, 67 deletions
diff --git a/meta-efl/recipes-efl/e17/e-wm/wizard-module-skipping.patch b/meta-efl/recipes-efl/e17/e-wm/wizard-module-skipping.patch deleted file mode 100644 index d124325b3..000000000 --- a/meta-efl/recipes-efl/e17/e-wm/wizard-module-skipping.patch +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | Index: e/src/modules/wizard/Makefile.am | ||
2 | =================================================================== | ||
3 | --- e/src/modules/wizard/Makefile.am (revision 43860) | ||
4 | +++ e/src/modules/wizard/Makefile.am (working copy) | ||
5 | @@ -6,7 +6,7 @@ | ||
6 | files_DATA = \ | ||
7 | e-module-$(MODULE).edj module.desktop | ||
8 | |||
9 | -EXTRA_DIST = $(files_DATA) page_040.c page_050.c page_060.c | ||
10 | +EXTRA_DIST = $(files_DATA) page_030.c page_040.c page_050.c page_060.c page_070.c page_080.c | ||
11 | |||
12 | # the module .so file | ||
13 | INCLUDES = -I. \ | ||
14 | @@ -21,9 +21,6 @@ | ||
15 | page_000.la \ | ||
16 | page_010.la \ | ||
17 | page_020.la \ | ||
18 | - page_030.la \ | ||
19 | - page_070.la \ | ||
20 | - page_080.la \ | ||
21 | page_200.la | ||
22 | |||
23 | ### disabled because profile selector really does the job. code here just for | ||
24 | @@ -60,10 +57,10 @@ | ||
25 | page_020_la_DEPENDENCIES = $(top_builddir)/config.h | ||
26 | |||
27 | #Choose Menus | ||
28 | -page_030_la_SOURCES = page_030.c | ||
29 | -page_030_la_LIBADD = @e_libs@ @dlopen_libs@ | ||
30 | -page_030_la_LDFLAGS = -module -avoid-version | ||
31 | -page_030_la_DEPENDENCIES = $(top_builddir)/config.h | ||
32 | +#page_030_la_SOURCES = page_030.c | ||
33 | +#page_030_la_LIBADD = @e_libs@ @dlopen_libs@ | ||
34 | +#page_030_la_LDFLAGS = -module -avoid-version | ||
35 | +#page_030_la_DEPENDENCIES = $(top_builddir)/config.h | ||
36 | |||
37 | #page_040_la_SOURCES = page_040.c | ||
38 | #page_040_la_LIBADD = @e_libs@ @dlopen_libs@ | ||
39 | @@ -81,16 +78,16 @@ | ||
40 | #page_060_la_DEPENDENCIES = $(top_builddir)/config.h | ||
41 | |||
42 | #Choose appliactions | ||
43 | -page_070_la_SOURCES = page_070.c | ||
44 | -page_070_la_LIBADD = @e_libs@ @dlopen_libs@ | ||
45 | -page_070_la_LDFLAGS = -module -avoid-version | ||
46 | -page_070_la_DEPENDENCIES = $(top_builddir)/config.h | ||
47 | +#page_070_la_SOURCES = page_070.c | ||
48 | +#page_070_la_LIBADD = @e_libs@ @dlopen_libs@ | ||
49 | +#page_070_la_LDFLAGS = -module -avoid-version | ||
50 | +#page_070_la_DEPENDENCIES = $(top_builddir)/config.h | ||
51 | |||
52 | #Choose quick launch | ||
53 | -page_080_la_SOURCES = page_080.c | ||
54 | -page_080_la_LIBADD = @e_libs@ @dlopen_libs@ | ||
55 | -page_080_la_LDFLAGS = -module -avoid-version | ||
56 | -page_080_la_DEPENDENCIES = $(top_builddir)/config.h | ||
57 | +#page_080_la_SOURCES = page_080.c | ||
58 | +#page_080_la_LIBADD = @e_libs@ @dlopen_libs@ | ||
59 | +#page_080_la_LDFLAGS = -module -avoid-version | ||
60 | +#page_080_la_DEPENDENCIES = $(top_builddir)/config.h | ||
61 | |||
62 | page_200_la_SOURCES = page_200.c | ||
63 | page_200_la_LIBADD = @e_libs@ @dlopen_libs@ | ||
diff --git a/meta-efl/recipes-efl/e17/e-wm_svn.bb b/meta-efl/recipes-efl/e17/e-wm_svn.bb index 9272aab59..38257b564 100644 --- a/meta-efl/recipes-efl/e17/e-wm_svn.bb +++ b/meta-efl/recipes-efl/e17/e-wm_svn.bb | |||
@@ -16,10 +16,6 @@ SRC_URI = "\ | |||
16 | file://applications.menu \ | 16 | file://applications.menu \ |
17 | " | 17 | " |
18 | 18 | ||
19 | SRC_URI_append_shr = " \ | ||
20 | file://wizard-module-skipping.patch \ | ||
21 | " | ||
22 | |||
23 | EXTRA_OECONF = "\ | 19 | EXTRA_OECONF = "\ |
24 | --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ | 20 | --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ |
25 | --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \ | 21 | --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \ |