aboutsummaryrefslogtreecommitdiffstats
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
parent87eb53a17ea241c577a4c09fb0655dc44bfbb564 (diff)
downloadmeta-openembedded-contrib-ad43d599ed7531b565863fd0e28c81245c551757.tar.gz
meta-openembedded-contrib-ad43d599ed7531b565863fd0e28c81245c551757.tar.bz2
meta-openembedded-contrib-ad43d599ed7531b565863fd0e28c81245c551757.zip
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>
-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 5e3f2939f6..45637f366e 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"
LIC_FILES_CHKSUM = "file://COPYING;md5=76de290eb3fdda12121830191c152a7d"
SRCNAME = "e"
-inherit e update-alternatives gettext
+inherit e update-alternatives gettext pkgconfig
S = "${WORKDIR}/${SRCNAME}"
PACKAGECONFIG ??= "${@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 14899d5147..0000000000
--- a/meta-efl/recipes-efl/e17/e-wm/0001-configure.ac-add-foreign.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8526270c418a5dc3d737a8eaff315209433f69d2 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Mon, 25 Aug 2014 16:06:03 +0200
-Subject: [PATCH] configure.ac: add foreign
-
-* fixes:
- | configure.ac:312: error: required file './ABOUT-NLS' not found
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 62c0f6d..49b290b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -34,7 +34,7 @@ AH_BOTTOM([
- #endif /* EFL_CONFIG_H__ */
- ])
-
--AM_INIT_AUTOMAKE([1.11 dist-bzip2 -Wno-portability])
-+AM_INIT_AUTOMAKE([1.11 dist-bzip2 -Wno-portability foreign])
- AM_SILENT_RULES([yes])
-
- AC_USE_SYSTEM_EXTENSIONS
---
-2.0.4
-
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 4c9830fc36..ac33406a47 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"
SRC_URI = "\
${E_RELEASES}/apps/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \
- file://0001-configure.ac-add-foreign.patch \
file://enlightenment_start.oe \
file://applications.menu \
"
-SRC_URI[md5sum] = "2c5a110496a867253f31cf7ed1a2143a"
-SRC_URI[sha256sum] = "3430d94c3def706de3b421ee48d92f2a475224f2f86111442a5d2d90c2363116"
+SRC_URI[md5sum] = "ca76c640c2a54f89f069176258151334"
+SRC_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 4bf1b96936..18738781bd 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 @@
require ${BPN}.inc
-PV = "0.18.999+0.19-alpha2+git${SRCPV}"
-DEFAULT_PREFERENCE = "-1"
+PV = "0.19.2+git${SRCPV}"
+DEFAULT_PREFERENCE = "-2"
SRC_URI = " \
- git://git.enlightenment.org/core/enlightenment.git \
- file://0001-configure.ac-add-foreign.patch \
+ git://git.enlightenment.org/core/enlightenment.git;branch=enlightenment-0.19 \
file://enlightenment_start.oe \
file://applications.menu \
"
S = "${WORKDIR}/git"
-SRCREV = "525b963133d7168226b8e07ba26730212a8b7e82"
+SRCREV = "be0d07877e561edd7242368797a90c36c4e77ee4"