From b37564b7355af71595ac48b96bcf7d2087e47c73 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 23 May 2011 09:52:28 +0200 Subject: 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 --- meta-efl/classes/e-base.bbclass | 2 +- .../e17/e-wm/illume-disable-screensaver.patch | 13 ------------- meta-efl/recipes-efl/e17/e-wm/illume-flaunch-fix.patch | 15 --------------- meta-efl/recipes-efl/e17/e-wm_svn.bb | 17 +---------------- 4 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 meta-efl/recipes-efl/e17/e-wm/illume-disable-screensaver.patch delete mode 100644 meta-efl/recipes-efl/e17/e-wm/illume-flaunch-fix.patch (limited to 'meta-efl') diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass index 26639f6a51..e87a96bf56 100644 --- a/meta-efl/classes/e-base.bbclass +++ b/meta-efl/classes/e-base.bbclass @@ -2,7 +2,7 @@ HOMEPAGE = "http://www.enlightenment.org" SRCNAME ?= "${BPN}" # usually tracks svn trunk HEAD -EFL_SRCREV ?= "59463" +EFL_SRCREV ?= "59985" # revision when 1.0.0 was released, for recipes which don't need rebuild so often EFL_SRCREV_1.0.0 ?= "56356" 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 984895cf59..0000000000 --- a/meta-efl/recipes-efl/e17/e-wm/illume-disable-screensaver.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: e/config/illume/e.src -=================================================================== ---- e.orig/config/illume/e.src 2009-01-30 23:34:37.000000000 +0100 -+++ e/config/illume/e.src 2009-01-30 23:34:54.000000000 +0100 -@@ -665,7 +665,7 @@ - value "display_res_height" int: 1; - value "display_res_hz" int: 0; - value "display_res_rotation" int: 0; -- value "screensaver_enable" int: 1; -+ value "screensaver_enable" int: 0; - value "screensaver_timeout" int: 30; - value "screensaver_interval" int: 5; - 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 5aab3b5dc0..0000000000 --- a/meta-efl/recipes-efl/e17/e-wm/illume-flaunch-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- e/src/modules/illume/e_flaunch.c 2010-02-09 22:33:25.000000000 +0100 -+++ e/src/modules/illume/e_flaunch.c 2010-02-09 22:33:25.000000000 +0100 -@@ -97,10 +97,10 @@ - int num = 0, max, count; - - // FIXME: 3 should become config here -- max = 10; -+ max = 3; - // for now just look for any apps in "category" 'Bar' and add the first 3 - // FIXME: category should be configurable... -- bar_desktops = efreet_util_desktop_category_list("System"); -+ bar_desktops = efreet_util_desktop_category_list("Bar"); - if (bar_desktops) - { - 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 baed2334bc..b32634dd7a 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 = "\ " SRC_URI_append_shr = " \ - file://illume-disable-screensaver.patch \ file://wizard-module-skipping.patch \ - file://illume-flaunch-fix.patch \ " EXTRA_OECONF = "\ @@ -69,14 +67,12 @@ RREPLACES_${PN} = "systray" PACKAGES =+ "\ ${PN}-config-default \ - ${PN}-config-illume \ ${PN}-config-illume2 \ ${PN}-config-minimalist \ ${PN}-config-netbook \ ${PN}-config-scaleable \ ${PN}-config-standard \ ${PN}-theme-default \ - ${PN}-theme-illume \ ${PN}-background-dark-gradient \ ${PN}-background-light-gradient \ ${PN}-images \ @@ -104,14 +100,12 @@ 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" PACKAGE_ARCH_${PN}-config-standard = "all" PACKAGE_ARCH_${PN}-theme-default = "all" -PACKAGE_ARCH_${PN}-theme-illume = "all" PACKAGE_ARCH_${PN}-background-dark-gradient = "all" PACKAGE_ARCH_${PN}-background-light-gradient = "all" PACKAGE_ARCH_${PN}-images = "all" @@ -142,14 +136,12 @@ FILES_${PN} = "\ " 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-illume2 = "${datadir}/enlightenment/data/config/illume" 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" FILES_${PN}-config-standard = "${datadir}/enlightenment/data/config/standard" FILES_${PN}-theme-default = "${datadir}/enlightenment/data/themes/default.edj" -FILES_${PN}-theme-illume = "${datadir}/enlightenment/data/themes/illume.edj" FILES_${PN}-theme-default = "${datadir}/enlightenment/data/themes/default.edj" FILES_${PN}-background-dark-gradient = "${datadir}/enlightenment/data/backgrounds/Dark_Gradient.edj" FILES_${PN}-background-light-gradient = "${datadir}/enlightenment/data/backgrounds/Light_Gradient.edj" @@ -181,14 +173,7 @@ FILES_illume-keyboard-default-terminal = "\ " RRECOMMENDS_${PN}-config-default = "${PN}-theme-default" -RRECOMMENDS_${PN}-config-illume = "\ - ${PN}-theme-illume \ - illume-keyboard-default-alpha \ - 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 \ -- cgit 1.2.3-korg