summaryrefslogtreecommitdiffstats
path: root/meta-efl
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2015-01-06 14:18:24 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2015-01-08 12:20:15 +0100
commitad43d599ed7531b565863fd0e28c81245c551757 (patch)
treebb7a54389b22e43a565185fe3cf07384d8dc5375 /meta-efl
parent87eb53a17ea241c577a4c09fb0655dc44bfbb564 (diff)
downloadmeta-openembedded-ad43d599ed7531b565863fd0e28c81245c551757.tar.gz
e-wm: upgrade to 0.19.2
* announcement: https://phab.enlightenment.org/phame/live/3/post/e19_2_release/ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl')
-rw-r--r--meta-efl/recipes-efl/e17/e-wm.inc2
-rw-r--r--meta-efl/recipes-efl/e17/e-wm/0001-configure.ac-add-foreign.patch29
-rw-r--r--meta-efl/recipes-efl/e17/e-wm_0.19.2.bb (renamed from meta-efl/recipes-efl/e17/e-wm_0.19.1.bb)5
-rw-r--r--meta-efl/recipes-efl/e17/e-wm_git.bb9
4 files changed, 7 insertions, 38 deletions
diff --git a/meta-efl/recipes-efl/e17/e-wm.inc b/meta-efl/recipes-efl/e17/e-wm.inc
index 5e3f2939f..45637f366 100644
--- a/meta-efl/recipes-efl/e17/e-wm.inc
+++ b/meta-efl/recipes-efl/e17/e-wm.inc
@@ -4,7 +4,7 @@ LICENSE = "MIT & BSD"
4LIC_FILES_CHKSUM = "file://COPYING;md5=76de290eb3fdda12121830191c152a7d" 4LIC_FILES_CHKSUM = "file://COPYING;md5=76de290eb3fdda12121830191c152a7d"
5SRCNAME = "e" 5SRCNAME = "e"
6 6
7inherit e update-alternatives gettext 7inherit e update-alternatives gettext pkgconfig
8S = "${WORKDIR}/${SRCNAME}" 8S = "${WORKDIR}/${SRCNAME}"
9 9
10PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ 10PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
diff --git a/meta-efl/recipes-efl/e17/e-wm/0001-configure.ac-add-foreign.patch b/meta-efl/recipes-efl/e17/e-wm/0001-configure.ac-add-foreign.patch
deleted file mode 100644
index 14899d514..000000000
--- a/meta-efl/recipes-efl/e17/e-wm/0001-configure.ac-add-foreign.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 8526270c418a5dc3d737a8eaff315209433f69d2 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 25 Aug 2014 16:06:03 +0200
4Subject: [PATCH] configure.ac: add foreign
5
6* fixes:
7 | configure.ac:312: error: required file './ABOUT-NLS' not found
8
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10---
11 configure.ac | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/configure.ac b/configure.ac
15index 62c0f6d..49b290b 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -34,7 +34,7 @@ AH_BOTTOM([
19 #endif /* EFL_CONFIG_H__ */
20 ])
21
22-AM_INIT_AUTOMAKE([1.11 dist-bzip2 -Wno-portability])
23+AM_INIT_AUTOMAKE([1.11 dist-bzip2 -Wno-portability foreign])
24 AM_SILENT_RULES([yes])
25
26 AC_USE_SYSTEM_EXTENSIONS
27--
282.0.4
29
diff --git a/meta-efl/recipes-efl/e17/e-wm_0.19.1.bb b/meta-efl/recipes-efl/e17/e-wm_0.19.2.bb
index 4c9830fc3..ac33406a4 100644
--- a/meta-efl/recipes-efl/e17/e-wm_0.19.1.bb
+++ b/meta-efl/recipes-efl/e17/e-wm_0.19.2.bb
@@ -11,10 +11,9 @@ DEFAULT_PREFERENCE = "-1"
11 11
12SRC_URI = "\ 12SRC_URI = "\
13 ${E_RELEASES}/apps/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ 13 ${E_RELEASES}/apps/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \
14 file://0001-configure.ac-add-foreign.patch \
15 file://enlightenment_start.oe \ 14 file://enlightenment_start.oe \
16 file://applications.menu \ 15 file://applications.menu \
17" 16"
18 17
19SRC_URI[md5sum] = "2c5a110496a867253f31cf7ed1a2143a" 18SRC_URI[md5sum] = "ca76c640c2a54f89f069176258151334"
20SRC_URI[sha256sum] = "3430d94c3def706de3b421ee48d92f2a475224f2f86111442a5d2d90c2363116" 19SRC_URI[sha256sum] = "9063d3de704a5700468a558f6707f402fe239c0807bc38ed29aaf7c62db1cd02"
diff --git a/meta-efl/recipes-efl/e17/e-wm_git.bb b/meta-efl/recipes-efl/e17/e-wm_git.bb
index 4bf1b9693..18738781b 100644
--- a/meta-efl/recipes-efl/e17/e-wm_git.bb
+++ b/meta-efl/recipes-efl/e17/e-wm_git.bb
@@ -1,14 +1,13 @@
1require ${BPN}.inc 1require ${BPN}.inc
2 2
3PV = "0.18.999+0.19-alpha2+git${SRCPV}" 3PV = "0.19.2+git${SRCPV}"
4DEFAULT_PREFERENCE = "-1" 4DEFAULT_PREFERENCE = "-2"
5 5
6SRC_URI = " \ 6SRC_URI = " \
7 git://git.enlightenment.org/core/enlightenment.git \ 7 git://git.enlightenment.org/core/enlightenment.git;branch=enlightenment-0.19 \
8 file://0001-configure.ac-add-foreign.patch \
9 file://enlightenment_start.oe \ 8 file://enlightenment_start.oe \
10 file://applications.menu \ 9 file://applications.menu \
11" 10"
12S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
13 12
14SRCREV = "525b963133d7168226b8e07ba26730212a8b7e82" 13SRCREV = "be0d07877e561edd7242368797a90c36c4e77ee4"