EFL cvs update to 20080518, remove patches that have been applied upstream

diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 0edb4ef..c411149 100644 (file)
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -1,4 +1,3 @@
-EFL_SRCDATE = "${@time.strftime('%Y%m%d', time.gmtime())}"
 SRCREV_pn-assassin ?= "${AUTOREV}"
 SRCREV_pn-dfu-util ?= "${AUTOREV}"
 SRCREV_pn-dfu-util-native ?= "${AUTOREV}"

diff --git a/packages/efl1/edbus_cvs.bb b/packages/efl1/edbus_cvs.bb
index be9b643..812da03 100644 (file)
--- a/packages/efl1/edbus_cvs.bb
+++ b/packages/efl1/edbus_cvs.bb
@@ -6,9 +6,10 @@ PR = "r5"
 
 inherit efl
 
-SRC_URI = "${E_CVS};module=e17/libs/e_dbus \
-           http://people.openmoko.org/stefan/e_nm-big-hack.patch;patch=1;pnum=1;mindate=20080330 \
-                       "
+SRC_URI = "\
+  ${E_CVS};module=e17/libs/e_dbus \
+  http://people.openmoko.org/stefan/e_nm-big-hack.patch;patch=1;pnum=1;mindate=20080330;maxdate=20080501 \
+"
 S = "${WORKDIR}/e_dbus"
 
 EXTRA_OECONF = "--enable-build-test-gui"

diff --git a/packages/efl1/epsilon/.mtn2git_empty b/packages/efl1/epsilon/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/efl1/epsilon/fix_alignment_error.patch b/packages/efl1/epsilon/fix_alignment_error.patch
deleted file mode 100644 (file)
index 7a635bc..0000000
--- a/packages/efl1/epsilon/fix_alignment_error.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: epsilon/src/lib/exiftags/canon.c
-===================================================================
---- epsilon.orig/src/lib/exiftags/canon.c      2007-12-03 17:45:27.000000000 -0300
-+++ epsilon/src/lib/exiftags/canon.c   2007-12-03 17:46:59.000000000 -0300
-@@ -52,7 +52,7 @@
- struct ccstm {
-       int32_t val;
-       struct descrip *table;
--      const char descr[];
-+      const char *descr;
- };
- 
- 

diff --git a/packages/efl1/epsilon_cvs.bb b/packages/efl1/epsilon_cvs.bb
index e5e422a..906a60c 100644 (file)
--- a/packages/efl1/epsilon_cvs.bb
+++ b/packages/efl1/epsilon_cvs.bb
@@ -8,8 +8,6 @@ PR = "r0"
 
 inherit efl
 
-SRC_URI += "file://fix_alignment_error.patch;patch=1"
-
 # a gstreamer thumbnailer would be nice now that we have emotion using gstreamer as well
 EXTRA_OECONF = "--disable-xine"