X-Git-Url: http://gitweb/?a=blobdiff_plain;f=pango%2FPkgfile;h=e5c82ddc23f87cf9f592de91befaa84fddfdf3ed;hb=021b09a88088ef036945348a9901923bea28c446;hp=aa87ad39362eeab06c1c00ae00c458fa6fc7c567;hpb=4ee102075b2d932c925f5b5ac613431611906897;p=attic%2Fports%2Fopt-cross.git

diff --git a/pango/Pkgfile b/pango/Pkgfile
index aa87ad3..e5c82dd 100644
--- a/pango/Pkgfile
+++ b/pango/Pkgfile
@@ -4,14 +4,16 @@
 # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
 # Depends on: cairo glib xorg-libsm xorg-libxext xorg-libxft
 name=pango
-version=1.26.2
+version=1.24.5
 release=1
 source=(http://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.bz2 \
-        pango.modules pango-1.26.2_cairo.patch)
+        pango.modules pangocairo.patch)
 
 build () {
   cd $name-$version
 
+  patch -p0 -i $SRC/pangocairo.patch
+
   export DEFAULT_LIBS="-L$CLFS/usr/lib"
   export DEFAULT_CFLAGS="-I$CLFS/usr/include"
   export FONTCONFIG_LIBS="$DEFAULT_LIBS -lfontconfig"
@@ -22,16 +24,15 @@ build () {
   export XFT_CFLAGS="$DEFAULT_CFLAGS"
   export GLIB_LIBS="$DEFAULT_LIBS -lglib-2.0 -lgthread-2.0 -pthread -lrt -lgmodule-2.0 -Wl,--export-dynamic -lgio-2.0 -lgobject-2.0"
   export GLIB_CFLAGS="$DEFAULT_CFLAGS -I$CLFS/usr/include/glib-2.0 -I$CLFS/usr/lib/glib-2.0/include" 
-  export CAIRO_LIBS="$DEFAULT_LIBS -lcairo"
-  export CAIRO_CFLAGS="$DEFAULT_CFLAGS -I$CLFS/usr/include/cairo"
-
-  patch -p0 -i $SRC/pango-1.26.2_cairo.patch
+  export CAIRO_LIBS="$DEFAULT_LIBS -lcairo -lpng12"
+  export CAIRO_CFLAGS="$DEFAULT_CFLAGS -I$CLFS/usr/include/cairo -I$CLFS/usr/include/libpng12"
 
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr
 
   echo "#define HAVE_CAIRO 1" >> config.h
+  echo "#define HAVE_CAIRO_PNG 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