summaryrefslogtreecommitdiffstats
path: root/meta-efl
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-05-23 09:52:28 +0200
committerKoen Kooi <koen@dominion.thruhere.net>2011-06-08 08:31:34 +0200
commitb37564b7355af71595ac48b96bcf7d2087e47c73 (patch)
tree4ea7b6fa68f1b85d4ca78e07d04147caa4231d40 /meta-efl
parent9e0a8f915fab095ccbee567dc4e713e3cc20a287 (diff)
downloadmeta-openembedded-b37564b7355af71595ac48b96bcf7d2087e47c73.tar.gz
e-base,e-wm: bump EFL_SRCREV and remove illume1 from e-wm
* illume1 and it's theme were removed in r59932, r59933, r59936, r59982 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl')
-rw-r--r--meta-efl/classes/e-base.bbclass2
-rw-r--r--meta-efl/recipes-efl/e17/e-wm/illume-disable-screensaver.patch13
-rw-r--r--meta-efl/recipes-efl/e17/e-wm/illume-flaunch-fix.patch15
-rw-r--r--meta-efl/recipes-efl/e17/e-wm_svn.bb17
4 files changed, 2 insertions, 45 deletions
diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass
index 26639f6a5..e87a96bf5 100644
--- a/meta-efl/classes/e-base.bbclass
+++ b/meta-efl/classes/e-base.bbclass
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.enlightenment.org"
2SRCNAME ?= "${BPN}" 2SRCNAME ?= "${BPN}"
3 3
4# usually tracks svn trunk HEAD 4# usually tracks svn trunk HEAD
5EFL_SRCREV ?= "59463" 5EFL_SRCREV ?= "59985"
6# revision when 1.0.0 was released, for recipes which don't need rebuild so often 6# revision when 1.0.0 was released, for recipes which don't need rebuild so often
7EFL_SRCREV_1.0.0 ?= "56356" 7EFL_SRCREV_1.0.0 ?= "56356"
8 8
diff --git a/meta-efl/recipes-efl/e17/e-wm/illume-disable-screensaver.patch b/meta-efl/recipes-efl/e17/e-wm/illume-disable-screensaver.patch
deleted file mode 100644
index 984895cf5..000000000
--- a/meta-efl/recipes-efl/e17/e-wm/illume-disable-screensaver.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: e/config/illume/e.src
2===================================================================
3--- e.orig/config/illume/e.src 2009-01-30 23:34:37.000000000 +0100
4+++ e/config/illume/e.src 2009-01-30 23:34:54.000000000 +0100
5@@ -665,7 +665,7 @@
6 value "display_res_height" int: 1;
7 value "display_res_hz" int: 0;
8 value "display_res_rotation" int: 0;
9- value "screensaver_enable" int: 1;
10+ value "screensaver_enable" int: 0;
11 value "screensaver_timeout" int: 30;
12 value "screensaver_interval" int: 5;
13 value "screensaver_blanking" int: 2;
diff --git a/meta-efl/recipes-efl/e17/e-wm/illume-flaunch-fix.patch b/meta-efl/recipes-efl/e17/e-wm/illume-flaunch-fix.patch
deleted file mode 100644
index 5aab3b5dc..000000000
--- a/meta-efl/recipes-efl/e17/e-wm/illume-flaunch-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1--- e/src/modules/illume/e_flaunch.c 2010-02-09 22:33:25.000000000 +0100
2+++ e/src/modules/illume/e_flaunch.c 2010-02-09 22:33:25.000000000 +0100
3@@ -97,10 +97,10 @@
4 int num = 0, max, count;
5
6 // FIXME: 3 should become config here
7- max = 10;
8+ max = 3;
9 // for now just look for any apps in "category" 'Bar' and add the first 3
10 // FIXME: category should be configurable...
11- bar_desktops = efreet_util_desktop_category_list("System");
12+ bar_desktops = efreet_util_desktop_category_list("Bar");
13 if (bar_desktops)
14 {
15 Efreet_Desktop *desktop;
diff --git a/meta-efl/recipes-efl/e17/e-wm_svn.bb b/meta-efl/recipes-efl/e17/e-wm_svn.bb
index baed2334b..b32634dd7 100644
--- a/meta-efl/recipes-efl/e17/e-wm_svn.bb
+++ b/meta-efl/recipes-efl/e17/e-wm_svn.bb
@@ -17,9 +17,7 @@ SRC_URI = "\
17" 17"
18 18
19SRC_URI_append_shr = " \ 19SRC_URI_append_shr = " \
20 file://illume-disable-screensaver.patch \
21 file://wizard-module-skipping.patch \ 20 file://wizard-module-skipping.patch \
22 file://illume-flaunch-fix.patch \
23" 21"
24 22
25EXTRA_OECONF = "\ 23EXTRA_OECONF = "\
@@ -69,14 +67,12 @@ RREPLACES_${PN} = "systray"
69 67
70PACKAGES =+ "\ 68PACKAGES =+ "\
71 ${PN}-config-default \ 69 ${PN}-config-default \
72 ${PN}-config-illume \
73 ${PN}-config-illume2 \ 70 ${PN}-config-illume2 \
74 ${PN}-config-minimalist \ 71 ${PN}-config-minimalist \
75 ${PN}-config-netbook \ 72 ${PN}-config-netbook \
76 ${PN}-config-scaleable \ 73 ${PN}-config-scaleable \
77 ${PN}-config-standard \ 74 ${PN}-config-standard \
78 ${PN}-theme-default \ 75 ${PN}-theme-default \
79 ${PN}-theme-illume \
80 ${PN}-background-dark-gradient \ 76 ${PN}-background-dark-gradient \
81 ${PN}-background-light-gradient \ 77 ${PN}-background-light-gradient \
82 ${PN}-images \ 78 ${PN}-images \
@@ -104,14 +100,12 @@ RRECOMMENDS_${PN} = "\
104" 100"
105 101
106PACKAGE_ARCH_${PN}-config-default = "all" 102PACKAGE_ARCH_${PN}-config-default = "all"
107PACKAGE_ARCH_${PN}-config-illume = "all"
108PACKAGE_ARCH_${PN}-config-illume2 = "all" 103PACKAGE_ARCH_${PN}-config-illume2 = "all"
109PACKAGE_ARCH_${PN}-config-minimalist = "all" 104PACKAGE_ARCH_${PN}-config-minimalist = "all"
110PACKAGE_ARCH_${PN}-config-netbook = "all" 105PACKAGE_ARCH_${PN}-config-netbook = "all"
111PACKAGE_ARCH_${PN}-config-scaleable = "all" 106PACKAGE_ARCH_${PN}-config-scaleable = "all"
112PACKAGE_ARCH_${PN}-config-standard = "all" 107PACKAGE_ARCH_${PN}-config-standard = "all"
113PACKAGE_ARCH_${PN}-theme-default = "all" 108PACKAGE_ARCH_${PN}-theme-default = "all"
114PACKAGE_ARCH_${PN}-theme-illume = "all"
115PACKAGE_ARCH_${PN}-background-dark-gradient = "all" 109PACKAGE_ARCH_${PN}-background-dark-gradient = "all"
116PACKAGE_ARCH_${PN}-background-light-gradient = "all" 110PACKAGE_ARCH_${PN}-background-light-gradient = "all"
117PACKAGE_ARCH_${PN}-images = "all" 111PACKAGE_ARCH_${PN}-images = "all"
@@ -142,14 +136,12 @@ FILES_${PN} = "\
142" 136"
143 137
144FILES_${PN}-config-default = "${datadir}/enlightenment/data/config/default" 138FILES_${PN}-config-default = "${datadir}/enlightenment/data/config/default"
145FILES_${PN}-config-illume = "${datadir}/enlightenment/data/config/illume" 139FILES_${PN}-config-illume2 = "${datadir}/enlightenment/data/config/illume"
146FILES_${PN}-config-illume2 = "${datadir}/enlightenment/data/config/illume-home"
147FILES_${PN}-config-minimalist = "${datadir}/enlightenment/data/config/minimalist" 140FILES_${PN}-config-minimalist = "${datadir}/enlightenment/data/config/minimalist"
148FILES_${PN}-config-netbook = "${datadir}/enlightenment/data/config/netbook" 141FILES_${PN}-config-netbook = "${datadir}/enlightenment/data/config/netbook"
149FILES_${PN}-config-scaleable = "${datadir}/enlightenment/data/config/scaleable" 142FILES_${PN}-config-scaleable = "${datadir}/enlightenment/data/config/scaleable"
150FILES_${PN}-config-standard = "${datadir}/enlightenment/data/config/standard" 143FILES_${PN}-config-standard = "${datadir}/enlightenment/data/config/standard"
151FILES_${PN}-theme-default = "${datadir}/enlightenment/data/themes/default.edj" 144FILES_${PN}-theme-default = "${datadir}/enlightenment/data/themes/default.edj"
152FILES_${PN}-theme-illume = "${datadir}/enlightenment/data/themes/illume.edj"
153FILES_${PN}-theme-default = "${datadir}/enlightenment/data/themes/default.edj" 145FILES_${PN}-theme-default = "${datadir}/enlightenment/data/themes/default.edj"
154FILES_${PN}-background-dark-gradient = "${datadir}/enlightenment/data/backgrounds/Dark_Gradient.edj" 146FILES_${PN}-background-dark-gradient = "${datadir}/enlightenment/data/backgrounds/Dark_Gradient.edj"
155FILES_${PN}-background-light-gradient = "${datadir}/enlightenment/data/backgrounds/Light_Gradient.edj" 147FILES_${PN}-background-light-gradient = "${datadir}/enlightenment/data/backgrounds/Light_Gradient.edj"
@@ -181,14 +173,7 @@ FILES_illume-keyboard-default-terminal = "\
181" 173"
182 174
183RRECOMMENDS_${PN}-config-default = "${PN}-theme-default" 175RRECOMMENDS_${PN}-config-default = "${PN}-theme-default"
184RRECOMMENDS_${PN}-config-illume = "\
185 ${PN}-theme-illume \
186 illume-keyboard-default-alpha \
187 illume-keyboard-default-numeric \
188 illume-keyboard-default-terminal \
189"
190RRECOMMENDS_${PN}-config-illume2 = "\ 176RRECOMMENDS_${PN}-config-illume2 = "\
191 ${PN}-theme-illume \
192 illume-keyboard-default-alpha \ 177 illume-keyboard-default-alpha \
193 illume-keyboard-default-numeric \ 178 illume-keyboard-default-numeric \
194 illume-keyboard-default-terminal \ 179 illume-keyboard-default-terminal \