pango: fixed build for pangocairo's stuff. Bumped to release 2.

diff --git a/pango/.footprint b/pango/.footprint
index 11df2a91e077764f472a9a6442d4b9fba19ff06f..b22d604e3520c82ec1f44893a4010ff4c1215496 100644 (file)
--- a/pango/.footprint
+++ b/pango/.footprint
@@ -35,6 +35,7 @@ drwxr-xr-x    root/root       usr/include/pango-1.0/pango/
 -rw-r--r--     root/root       usr/include/pango-1.0/pango/pango-types.h
 -rw-r--r--     root/root       usr/include/pango-1.0/pango/pango-utils.h
 -rw-r--r--     root/root       usr/include/pango-1.0/pango/pango.h
+-rw-r--r--     root/root       usr/include/pango-1.0/pango/pangocairo.h
 -rw-r--r--     root/root       usr/include/pango-1.0/pango/pangofc-decoder.h
 -rw-r--r--     root/root       usr/include/pango-1.0/pango/pangofc-font.h
 -rw-r--r--     root/root       usr/include/pango-1.0/pango/pangofc-fontmap.h
@@ -47,6 +48,10 @@ drwxr-xr-x   root/root       usr/lib/
 lrwxrwxrwx     root/root       usr/lib/libpango-1.0.so -> libpango-1.0.so.0.2400.5
 lrwxrwxrwx     root/root       usr/lib/libpango-1.0.so.0 -> libpango-1.0.so.0.2400.5
 -rwxr-xr-x     root/root       usr/lib/libpango-1.0.so.0.2400.5
+-rwxr-xr-x     root/root       usr/lib/libpangocairo-1.0.la
+lrwxrwxrwx     root/root       usr/lib/libpangocairo-1.0.so -> libpangocairo-1.0.so.0.2400.5
+lrwxrwxrwx     root/root       usr/lib/libpangocairo-1.0.so.0 -> libpangocairo-1.0.so.0.2400.5
+-rwxr-xr-x     root/root       usr/lib/libpangocairo-1.0.so.0.2400.5
 -rw-r--r--     root/root       usr/lib/libpangoft2-1.0.la
 lrwxrwxrwx     root/root       usr/lib/libpangoft2-1.0.so -> libpangoft2-1.0.so.0.2400.5
 lrwxrwxrwx     root/root       usr/lib/libpangoft2-1.0.so.0 -> libpangoft2-1.0.so.0.2400.5
@@ -88,6 +93,7 @@ drwxr-xr-x    root/root       usr/lib/pango/1.6.0/modules/
 -rwxr-xr-x     root/root       usr/lib/pango/1.6.0/modules/pango-tibetan-fc.so
 drwxr-xr-x     root/root       usr/lib/pkgconfig/
 -rw-r--r--     root/root       usr/lib/pkgconfig/pango.pc
+-rw-r--r--     root/root       usr/lib/pkgconfig/pangocairo.pc
 -rw-r--r--     root/root       usr/lib/pkgconfig/pangoft2.pc
 -rw-r--r--     root/root       usr/lib/pkgconfig/pangox.pc
 -rw-r--r--     root/root       usr/lib/pkgconfig/pangoxft.pc

diff --git a/pango/Pkgfile b/pango/Pkgfile
index cbaeada34774c6b1ea5f87d610b5077fe6a623cb..6f047b704cb47bb44d548808e44f332ac2df2c5c 100644 (file)
--- a/pango/Pkgfile
+++ b/pango/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: cairo glib xorg-libsm xorg-libxext xorg-libxft
 name=pango
 version=1.24.5
-release=1
+release=2
 source=(http://download.gnome.org/sources/$name/1.24/$name-$version.tar.bz2 \
         pango.modules)
 
@@ -27,10 +27,25 @@ build () {
 
   ./configure --build=$CHOST \
               --host=$CTARGET \
-              --prefix=/usr 
+              --prefix=/usr
 
-  find -type f -name 'Makefile*' \
-    -exec sed -e "s|-I/usr|-I$CLFS/usr|g" -i {} \;
+  echo "#define HAVE_CAIRO 1" >> config.h
+  echo "#define HAVE_CAIRO_FREETYPE 1" >> config.h
+  echo "#define HAVE_CAIRO_XLIB 1" >> config.h
+  echo "#define HAVE_X 1" >> config.h
+  echo "#define HAVE_XFT 1" >> config.h
+
+  sed -i $(find . -type f -name Makefile) \
+      -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|XFT_LIBS =.*|XFT_LIBS = $XFT_LIBS|" \
+      -e "s|XFT_CFLAGS =.*|XFT_CFLAGS = $XFT_CFLAGS|" \
+      -e "s|GLIB_LIBS =.*|GLIB_LIBS = $GLIB_LIBS|" \
+      -e "s|GLIB_CFLAGS =.*|GLIB_CFLAGS = $GLIB_CFLAGS|" \
+      -e "s|CAIRO_LIBS =.*|CAIRO_LIBS = $CAIRO_LIBS|" \
+      -e "s|CAIRO_CFLAGS =.*|CAIRO_CFLAGS = $CAIRO_CFLAGS|"
 
   make 
   make DESTDIR=$PKG install