X-Git-Url: http://gitweb/?a=blobdiff_plain;ds=sidebyside;f=pango%2FPkgfile;h=e5c82ddc23f87cf9f592de91befaa84fddfdf3ed;hb=975fbc8096e8a03aaf8bb52cc49f8a964d3569d0;hp=45f555b5f8954e1cbbc065a5454551dc81a72d14;hpb=463a98b31a9da3f1b01254c62a74f1ec715d412c;p=attic%2Fports%2Fopt-cross.git

diff --git a/pango/Pkgfile b/pango/Pkgfile
index 45f555b..e5c82dd 100644
--- a/pango/Pkgfile
+++ b/pango/Pkgfile
@@ -1,17 +1,19 @@
 # Description: A library for layout and rendering of text
 # URL: http://www.gtk.org/
 # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
-# Arch Maintainer: CRUX-ARM System Team, crux-arm at mikeux dot dyndns dot org
+# 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.24.5
 release=1
-source=(http://download.gnome.org/sources/$name/1.24/$name-$version.tar.bz2 \
-        pango.modules)
+source=(http://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.bz2 \
+        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,15 +24,31 @@ 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"
+  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 
+              --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
+  echo "#define HAVE_XFT 1" >> config.h
 
-  find -type f -name 'Makefile*' \
-    -exec sed -e "s|-I/usr|-I$CLFS/usr|g" -i {} \;
+  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