upgrade cairo to 1.8.2; add patch to fix its libtool issue

2008-11-11 20:15:17 +08:00 · 2008-11-11 20:15:17 +08:00 · d12f673a23
parent ba601403fe
commit d12f673a23
3 changed files with 24 additions and 0 deletions
--- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
@ -5,3 +5,4 @@

 PREFERRED_VERSION_atk ?= "1.24.0"
 PREFERRED_VERSION_pixman ?= "0.12.0"
+PREFERRED_VERSION_cairo ?= "1.8.2"
--- a/meta/packages/cairo/cairo-1.8.2/hardcoded_libtool.patch
+++ b/meta/packages/cairo/cairo-1.8.2/hardcoded_libtool.patch
@ -0,0 +1,17 @@
+Index: cairo-1.8.2/build/aclocal.dolt.m4
+===================================================================
+--- cairo-1.8.2.orig/build/aclocal.dolt.m4
+++ cairo-1.8.2/build/aclocal.dolt.m4
+@@ -163,7 +163,11 @@ done
+ if $modeok && $tagok ; then
+     . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}"
+ else
+-    exec ${top_builddir_slash}libtool "$[]@"
+__DOLTLIBTOOL__EOF__
+
+echo '    exec ${top_builddir_slash}'${host_alias}-libtool' "$[]@"' >> doltlibtool
+
+    cat << '__DOLTLIBTOOL__EOF__' >> doltlibtool
+ fi
+ __DOLTLIBTOOL__EOF__
+ 
--- a/meta/packages/cairo/cairo_1.8.2.bb
+++ b/meta/packages/cairo/cairo_1.8.2.bb
@ -0,0 +1,6 @@
+require cairo.inc
+
+PR = "r1"
+
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
+           file://hardcoded_libtool.patch;patch=1"