cairo: updated to 1.8.10 and cleaned up

diff --git a/cairo/.footprint b/cairo/.footprint
index 90f32a2128089ad42e548ecd02f10ba45f17bf23..868ff9634bf2d67bc2d036a768de4442f475895d 100644 (file)
--- a/cairo/.footprint
+++ b/cairo/.footprint
@@ -14,9 +14,9 @@ drwxr-xr-x    root/root       usr/include/cairo/
 drwxr-xr-x     root/root       usr/lib/
 -rw-r--r--     root/root       usr/lib/libcairo.a
 -rwxr-xr-x     root/root       usr/lib/libcairo.la
-lrwxrwxrwx     root/root       usr/lib/libcairo.so -> libcairo.so.2.10800.8
-lrwxrwxrwx     root/root       usr/lib/libcairo.so.2 -> libcairo.so.2.10800.8
--rwxr-xr-x     root/root       usr/lib/libcairo.so.2.10800.8
+lrwxrwxrwx     root/root       usr/lib/libcairo.so -> libcairo.so.2.10800.10
+lrwxrwxrwx     root/root       usr/lib/libcairo.so.2 -> libcairo.so.2.10800.10
+-rwxr-xr-x     root/root       usr/lib/libcairo.so.2.10800.10
 drwxr-xr-x     root/root       usr/lib/pkgconfig/
 -rw-r--r--     root/root       usr/lib/pkgconfig/cairo-ft.pc
 -rw-r--r--     root/root       usr/lib/pkgconfig/cairo-pdf.pc

diff --git a/cairo/.md5sum b/cairo/.md5sum
index a4d8157f586254d84a42516ba9689af49710181c..232b71e8a578e3b914d12b648efe62fafebf6553 100644 (file)
--- a/cairo/.md5sum
+++ b/cairo/.md5sum
@@ -1 +1 @@
-d3e1a1035ae563812d4dd44a74fb0dd0  cairo-1.8.8.tar.gz
+b60a82f405f9400bbfdcf850b1728d25  cairo-1.8.10.tar.gz

diff --git a/cairo/Pkgfile b/cairo/Pkgfile
index 3f16f680318d2c75ff60e2ab1a1313fb98927f10..fba4066c7b499e6ccab580b2deed2d1053b6488e 100644 (file)
--- a/cairo/Pkgfile
+++ b/cairo/Pkgfile
@@ -5,8 +5,8 @@
 # Depends on: fontconfig libpng xorg-libxrender xorg-libpixman
 
 name=cairo
-version=1.8.8
-release=2
+version=1.8.10
+release=1
 source=(http://cairographics.org/releases/$name-$version.tar.gz)
 
 build() {
@@ -26,6 +26,8 @@ build() {
   export FONTCONFIG_CFLAGS="$DEFAULT_CFLAGS"
   export FREETYPE_LIBS="$DEFAULT_LIBS -lfreetype -lz"
   export FREETYPE_CFLAGS="$DEFAULT_CFLAGS -I$CLFS/usr/include/freetype2"
+  export CAIRO_LIBS="$PNG_LIBS $xlib_LIBS $xlib_xrender_LIBS $pixman_LIBS $FONTCONFIG_LIBS $FREETYPE_LIBS"
+  export CAIRO_CFLAGS="$PNG_CFLAGS $xlib_CFLAGS $xlib_xrender_CFLAGS $pixman_CFLAGS $FONTCONFIG_CFLAGS $FREETYPE_CFLAGS"
 
   sed 's|use_png=no|use_png=yes|' -i configure
 
@@ -35,7 +37,24 @@ build() {
               --enable-xlib=yes \
               --enable-xlib-xrender=yes \
               --enable-png=yes \
-              --enable-ft=yes   
+              --enable-ft=yes
+
+  sed -i $(find . -type f -name Makefile) \
+      -e "s|png_LIBS =.*|png_LIBS = $png_LIBS|" \
+      -e "s|png_CFLAGS =.*|png_CFLAGS = $png_CFLAGS|" \
+      -e "s|xlib_LIBS =.*|xlib_LIBS = $xlib_LIBS|" \
+      -e "s|xlib_CFLAGS =.*|xlib_CFLAGS = $xlib_CFLAGS|" \
+      -e "s|xlib_xrender_LIBS =.*|xlib_xrender_LIBS = $xlib_xrender_LIBS|" \
+      -e "s|xlib_xrender_CFLAGS =.*|xlib_xrender_CFLAGS = $xlib_xrender_CFLAGS|" \
+      -e "s|pixman_LIBS =.*|pixman_LIBS = $pixman_LIBS|" \
+      -e "s|pixman_CFLAGS =.*|pixman_CFLAGS = $pixman_CFLAGS|" \
+      -e "s|FONTCONFIG_LIBS =.*|FONTCONFIG_LIBS = $FONTCONFIG_LIBS|" \
+      -e "s|FONTCONFIG_CFLAGS =.*|FONTCONFIG_CFLAGS = $FONTCONFIG_CFLAGS|" \
+      -e "s|FREETYPE_LIBS =.*|FREETYPE_LIBS = $FREETYPE_LIBS|" \
+      -e "s|FREETYPE_CFLAGS =.*|FREETYPE_CFLAGS = $FREETYPE_CFLAGS|" \
+      -e "s|CAIRO_LIBS =.*|CAIRO_LIBS = $CAIRO_LIBS|" \
+      -e "s|CAIRO_CFLAGS =.*|CAIRO_CFLAGS = $CAIRO_CFLAGS|"
+
   make
   make DESTDIR=$PKG install
   rm -rf $PKG/usr/share