summaryrefslogtreecommitdiffstats
path: root/meta-efl/recipes-efl
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-03-03 23:53:43 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-04-20 10:43:30 +0200
commit6c9ef2d6fec8a5bee6b17e6ab824e953fd016acc (patch)
tree8675e13dc4353b44cb486e8434ecd4e0adf16f61 /meta-efl/recipes-efl
parent72a0b544bdb129eed2f310fb8a72614d1ee5f080 (diff)
downloadmeta-openembedded-6c9ef2d6fec8a5bee6b17e6ab824e953fd016acc.tar.gz
e-wm: upgrade to 0.18.4 and drop old 0.17.5
* fix building e17 modules with elementary-1.9 * remove 0.17 version, because that one isn't going to be tested enough Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl/recipes-efl')
-rw-r--r--meta-efl/recipes-efl/e17/e-wm/0001-remove-another-elm-1.8-requirement.patch25
-rw-r--r--meta-efl/recipes-efl/e17/e-wm_0.17.5.bb26
-rw-r--r--meta-efl/recipes-efl/e17/e-wm_0.18.4.bb (renamed from meta-efl/recipes-efl/e17/e-wm_0.18.3.bb)5
3 files changed, 28 insertions, 28 deletions
diff --git a/meta-efl/recipes-efl/e17/e-wm/0001-remove-another-elm-1.8-requirement.patch b/meta-efl/recipes-efl/e17/e-wm/0001-remove-another-elm-1.8-requirement.patch
new file mode 100644
index 000000000..f4f034a8c
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/e-wm/0001-remove-another-elm-1.8-requirement.patch
@@ -0,0 +1,25 @@
1From dd1406e40700df60a055db24d7358480b1fbc5bf Mon Sep 17 00:00:00 2001
2From: Mike Blumenkrantz <zmike@samsung.com>
3Date: Mon, 3 Mar 2014 17:38:55 -0500
4Subject: [PATCH] remove another elm 1.8 requirement
5
6Upstream-Status: backport dd1406e40700df60a055db24d7358480b1fbc5bf
7---
8 configure.ac | 1 -
9 1 file changed, 1 deletion(-)
10
11diff --git a/configure.ac b/configure.ac
12index 999df79..26f6775 100644
13--- a/configure.ac
14+++ b/configure.ac
15@@ -579,7 +579,6 @@ eina >= ${efl_version} \
16 eldbus >= ${efl_version} \
17 eio >= ${efl_version} \
18 elementary >= ${elm_version} \
19-elementary < 1.8.99 \
20 emotion >= ${efl_version} \
21 $udisks_mount \
22 $eeze_mount \
23--
241.9.0
25
diff --git a/meta-efl/recipes-efl/e17/e-wm_0.17.5.bb b/meta-efl/recipes-efl/e17/e-wm_0.17.5.bb
deleted file mode 100644
index d374680fb..000000000
--- a/meta-efl/recipes-efl/e17/e-wm_0.17.5.bb
+++ /dev/null
@@ -1,26 +0,0 @@
1require ${BPN}.inc
2
3SRCNAME = "enlightenment"
4
5S = "${WORKDIR}/${SRCNAME}-${PV}"
6
7SRC_URI = "\
8 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
9 file://enlightenment_start.oe \
10 file://applications.menu \
11"
12
13SRC_URI[md5sum] = "5aefb55df0b1a0a0ae0cf9d0610cf7c7"
14SRC_URI[sha256sum] = "25d4967277cf27d4efb474a9b8eceb1200aa813a51c248b61cc23f69291bff0f"
15
16do_install_append() {
17 install -d ${D}/${datadir}/applications/
18 install -m 644 ${S}/src/modules/fileman/module.desktop ${D}/${datadir}/applications/efm.desktop
19 sed "s#Type=Link#Type=Application#g" -i ${D}/${datadir}/applications/efm.desktop
20 echo "Exec=enlightenment_remote -efm-open-dir" >> ${D}/${datadir}/applications/efm.desktop
21 echo "Terminal=false" >> ${D}/${datadir}/applications/efm.desktop
22 echo "Categories=Application;" >> ${D}/${datadir}/applications/efm.desktop
23 echo "StartupNotify=true" >> ${D}/${datadir}/applications/efm.desktop
24 install -d ${D}/${datadir}/icons/
25 install -m 644 ${S}/data/themes/img/O/icon_icon_theme.png ${D}/${datadir}/icons/e-module-fileman.png
26}
diff --git a/meta-efl/recipes-efl/e17/e-wm_0.18.3.bb b/meta-efl/recipes-efl/e17/e-wm_0.18.4.bb
index ae21cc14e..0122cadbe 100644
--- a/meta-efl/recipes-efl/e17/e-wm_0.18.3.bb
+++ b/meta-efl/recipes-efl/e17/e-wm_0.18.4.bb
@@ -6,12 +6,13 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
6 6
7SRC_URI = "\ 7SRC_URI = "\
8 ${E_RELEASES}/apps/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ 8 ${E_RELEASES}/apps/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \
9 file://0001-remove-another-elm-1.8-requirement.patch \
9 file://enlightenment_start.oe \ 10 file://enlightenment_start.oe \
10 file://applications.menu \ 11 file://applications.menu \
11" 12"
12 13
13SRC_URI[md5sum] = "9f6e6c296b88b038ac05415006c678fd" 14SRC_URI[md5sum] = "d3534c765d562524c63852f2f40932c3"
14SRC_URI[sha256sum] = "17d207246bf10dec5a5fa854da5763e0e6dd61decde3474ff5fedffbb9dc8629" 15SRC_URI[sha256sum] = "273afe860b65e1e39323bab80ab51e44845bcddcd25063b47eadab1c925a77c9"
15 16
16do_configure_prepend() { 17do_configure_prepend() {
17 sed '/^ *EFL_PKG_CHECK_VAR/ s/systemduserunitdir/systemdsystemunitdir/g' -i ${S}/configure.ac 18 sed '/^ *EFL_PKG_CHECK_VAR/ s/systemduserunitdir/systemdsystemunitdir/g' -i ${S}/configure.ac