org.openmoko.dev: 262a1eb4ef461caa8e0fd85a487b2145d7c35614
oe at monotone.openmoko.org
oe at monotone.openmoko.org
Mon Apr 21 10:30:45 CEST 2008
revision: 262a1eb4ef461caa8e0fd85a487b2145d7c35614
date: 2008-04-21T07:34:27
author: julian_chu at openmoko.com
branch: org.openmoko.dev
changelog:
File configure.in of imlib2 was changed in 20080420
The line number was changed, therefore the original
patch didn't work after 20080420.
Add a new patch.
manifest:
format_version "1"
new_manifest [909d2c4c7353420fe61bc2364d583459f82320a2]
old_revision [54cbcdaa0ddc6f08dc77d1dcf92e5bd4aa7c5896]
add_file "packages/efl1/imlib2/remove-local-includes-20080421.patch"
content [6cb1af5e1d744afaed49d06493a112c10cf8210b]
patch "packages/efl1/imlib2_cvs.bb"
from [90324b9d8bfadfca430da3b72c2b1f9c7089ee52]
to [41b7537a6af77e700c6236af3c40b2b7a8d80604]
-------------- next part --------------
#
#
# add_file "packages/efl1/imlib2/remove-local-includes-20080421.patch"
# content [6cb1af5e1d744afaed49d06493a112c10cf8210b]
#
# patch "packages/efl1/imlib2_cvs.bb"
# from [90324b9d8bfadfca430da3b72c2b1f9c7089ee52]
# to [41b7537a6af77e700c6236af3c40b2b7a8d80604]
#
============================================================
--- packages/efl1/imlib2/remove-local-includes-20080421.patch 6cb1af5e1d744afaed49d06493a112c10cf8210b
+++ packages/efl1/imlib2/remove-local-includes-20080421.patch 6cb1af5e1d744afaed49d06493a112c10cf8210b
@@ -0,0 +1,15 @@
+Index: imlib2/configure.in
+===================================================================
+--- imlib2.orig/configure.in 2008-04-21 14:28:58.000000000 +0800
++++ imlib2/configure.in 2008-04-21 14:30:07.000000000 +0800
+@@ -191,9 +191,7 @@
+
+ if test "x$have_x" = "xyes"; then
+ AC_PATH_XTRA
+- x_dir=${x_dir:-/usr/X11R6}
+- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
++ x_libs="-lX11 -lXext"
+ AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
+ else
+ x_cflags=""
============================================================
--- packages/efl1/imlib2_cvs.bb 90324b9d8bfadfca430da3b72c2b1f9c7089ee52
+++ packages/efl1/imlib2_cvs.bb 41b7537a6af77e700c6236af3c40b2b7a8d80604
@@ -3,11 +3,13 @@ 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 = "r0"
+PR = "r0.01"
inherit efl
-SRC_URI += "file://remove-local-includes.patch;patch=1"
+# 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"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080421/78cbf030/attachment.htm
More information about the commitlog
mailing list