#
#
# patch "packages/efl1/imlib2_cvs.bb"
#  from [5c3c8c06ae6d9a4d18d10a066fc8973ec535e871]
#    to [c32847438359b0993cb9eadcf6f4b6019585f54c]
#
============================================================
--- packages/efl1/imlib2_cvs.bb	5c3c8c06ae6d9a4d18d10a066fc8973ec535e871
+++ packages/efl1/imlib2_cvs.bb	c32847438359b0993cb9eadcf6f4b6019585f54c
@@ -3,10 +3,14 @@ PV = "1.4.1.000+cvs${SRCDATE}"
 # can also depend on tiff34, ungif or gif, z, bz2, id3tag
 DEPENDS = "freetype libpng jpeg virtual/libx11 libxext"
 PV = "1.4.1.000+cvs${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
 inherit efl
 
+# The original patch was out of date in 20080420
+SRC_URI += "file://remove-local-includes.patch;patch=1;maxdate=20080420 \
+            file://remove-local-includes-20080421.patch;patch=1;mindate=20080420 "
+
 EXTRA_OECONF = "--with-x"
 
 # TODO: Use more fine granular version