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

diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
index ce542fec4a6f1fa2c3842a81f160da2960a1d0a0..53b898e3e75913b52b321998e43919014e89fb71 100644 (file)
--- 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"

diff --git a/meta/packages/cairo/cairo-1.8.2/hardcoded_libtool.patch b/meta/packages/cairo/cairo-1.8.2/hardcoded_libtool.patch
new file mode 100644 (file)
index 0000000..afdf2c8
--- /dev/null
+++ 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__
+ 

diff --git a/meta/packages/cairo/cairo_1.8.2.bb b/meta/packages/cairo/cairo_1.8.2.bb
new file mode 100644 (file)
index 0000000..fd8a99b
--- /dev/null
+++ 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"