summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/include/sane-srcrevs.inc2
-rw-r--r--recipes/efl1/epsilon/add.ecore.to.depends.patch20
-rw-r--r--recipes/efl1/epsilon_svn.bb3
3 files changed, 2 insertions, 23 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index f1bdf8c5f8..6408c0d769 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -334,7 +334,7 @@ SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52"
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCREV ?= "46073"
+EFL_SRCREV ?= "46111"
SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
SRCREV_pn-edb ?= "${EFL_SRCREV}"
SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
diff --git a/recipes/efl1/epsilon/add.ecore.to.depends.patch b/recipes/efl1/epsilon/add.ecore.to.depends.patch
deleted file mode 100644
index 1e0b99bc3b..0000000000
--- a/recipes/efl1/epsilon/add.ecore.to.depends.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -uNr epsilon.orig/configure.ac epsilon/configure.ac
---- epsilon.orig/configure.ac 2010-02-11 13:17:14.000000000 +0100
-+++ epsilon/configure.ac 2010-02-11 13:16:53.000000000 +0100
-@@ -31,6 +31,7 @@
- ecore-evas >= 0.9.9
- ecore-file >= 0.9.9
- ecore-ipc >= 0.9.9
-+ ecore-data >= 0.9.9
- ]
- )
-
-@@ -78,7 +79,7 @@
- fi
- AM_CONDITIONAL(HAVE_XINE, test $xine = "xine")
-
--requirements="evas ecore-evas ecore-file ecore-ipc edje"
-+requirements="evas ecore-evas ecore-file ecore-ipc ecore-data edje"
- AC_SUBST(requirements)
-
- #####################################################################
diff --git a/recipes/efl1/epsilon_svn.bb b/recipes/efl1/epsilon_svn.bb
index 6f6b842104..991c35e8ab 100644
--- a/recipes/efl1/epsilon_svn.bb
+++ b/recipes/efl1/epsilon_svn.bb
@@ -8,8 +8,7 @@ PR = "r4"
inherit efl
-SRC_URI = "svn://svn.enlightenment.org/svn/e/OLD;module=${SRCNAME};proto=http \
- file://add.ecore.to.depends.patch;patch=1"
+SRC_URI = "svn://svn.enlightenment.org/svn/e/OLD;module=${SRCNAME};proto=http"
# a gstreamer thumbnailer would be nice now that we have emotion using gstreamer as well
EXTRA_OECONF = "--disable-xine"