freetype2 & fontconfig changes, last one does not build yet

lib32-fontconfig/30-urw-aliases.patch

@@ -0,0 +1,13 @@
+--- a/conf.d/30-urw-aliases.conf	2009-08-06 16:23:57.000000000 +0100
++++ b/conf.d/30-urw-aliases.conf	2009-08-06 16:25:07.000000000 +0100
+@@ -29,6 +29,10 @@
+ 	  <family>Zapf Dingbats</family>
+ 	  <accept><family>Dingbats</family></accept>
+ 	</alias>
++	<alias binding="same">
++	  <family>ZapfDingbats</family>
++	  <accept><family>Dingbats</family></accept>
++	</alias>
+ 	<match target="pattern">
+ 	  <test name="family">
+ 	    <string>Symbol</string>

lib32-fontconfig/PKGBUILD

@@ -3,21 +3,41 @@
 # maintainer (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
 # maintainer (x86_64): Anke Boersma <abveritas[at]chakra-project[dot]org>
 
-_pkgsourcename=fontconfig
-pkgname=lib32-$_pkgsourcename
+_pkgbasename=fontconfig
+pkgname=lib32-$_pkgbasename
 pkgver=2.8.0
-pkgrel=1
-pkgdesc="A library for configuring and customizing font access"
+pkgrel=2
+pkgdesc="A library for configuring and customizing font access (32-bit)"
+arch=(x86_64)
 url="http://www.fontconfig.org/release/"
 license=('custom')
-arch=(x86_64)
-groups=('lib32')
-depends=('lib32-expat>=2.0' 'lib32-freetype2')
-source=(http://www.chakra-project.org/repo/platform/i686/$_pkgsourcename-$pkgver-$pkgrel-i686.pkg.tar.xz)
-md5sums=('6cb9a6234b53138ded09c9bb6402a8de')
+depends=('lib32-expat>=2.0.1' 'lib32-freetype2>=2.3.11' $_pkgbasename)
+makedepends=(gcc-multilib)
+options=('!libtool')
+source=(http://www.fontconfig.org/release/${_pkgbasename}-${pkgver}.tar.gz
+        30-urw-aliases.patch)
+md5sums=('77e15a92006ddc2adbb06f840d591c0e'
+         '51bc6cb633b50f3c28793361738aac5b')
 
 build() {
-	cd $srcdir
-	mkdir -p $pkgdir/opt/lib32/usr/lib
-	cp -dp usr/lib/*.so* $pkgdir/opt/lib32/usr/lib
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  cd "${srcdir}/${_pkgbasename}-${pkgver}"
+  patch -Np1 -i "${srcdir}/30-urw-aliases.patch"
+  # enable Position Independent Code for prelinking
+  export CFLAGS="${CFLAGS} -fPIC"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib32
+  make
+}
+
+package() {
+  cd "${srcdir}/${_pkgbasename}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+  
+  rm -rf "${pkgdir}"/usr/{include,share,bin} "$pkgdir"/{etc,var}
+  mkdir -p "$pkgdir/usr/share/licenses"
+  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
 }

lib32-freetype2/PKGBUILD

@@ -3,21 +3,41 @@
 # maintainer (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
 # maintainer (x86_64): Anke Boersma <abveritas[at]chakra-project[dot]org>
 
-_pkgsourcename=freetype2
-pkgname=lib32-$_pkgsourcename
+_pkgbasename=freetype2
+pkgname=lib32-$_pkgbasename
 pkgver=2.4.3
-pkgrel=1
-pkgdesc="TrueType font rendering library"
-url="http://freetype.sourceforge.net"
+pkgrel=2
+pkgdesc="TrueType font rendering library (32-bit)"
+arch=(x86_64)
 license=('GPL')
-arch=('x86_64')
-groups=('lib32')
-depends=('lib32-zlib')
-source=(http://www.chakra-project.org/repo/core/i686/$_pkgsourcename-$pkgver-$pkgrel-i686.pkg.tar.xz)
+url="http://freetype.sourceforge.net"
+depends=('lib32-zlib' $_pkgbasename)
+makedepends=(gcc-multilib)
+options=('!libtool')
+source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
+        freetype-2.3.0-enable-spr.patch
+        freetype-2.2.1-enable-valid.patch)
+md5sums=('75ac7082bde7b3805dc5d6bc806fa045'
+         '816dc8619a6904a7385769433c0a8653'
+         '214119610444c9b02766ccee5e220680')
 
 build() {
-	cd $srcdir
-	mkdir -p $pkgdir/opt/lib32/usr/lib
-	cp -dp usr/lib/*.so* $pkgdir/opt/lib32/usr/lib
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  cd "${srcdir}/freetype-${pkgver}"
+  patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch"
+  patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch"
+
+  ./configure --prefix=/usr --libdir=/usr/lib32
+  make
+}
+
+package() {
+  cd "${srcdir}/freetype-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  rm -rf "${pkgdir}"/usr/{include,share,bin}
 }
-md5sums=('5e74ac994c5e9fe24902ef18bc1a61ce')

lib32-freetype2/freetype-2.2.1-enable-valid.patch

@@ -0,0 +1,20 @@
+--- freetype-2.2.1/modules.cfg.orig	2006-07-07 21:01:09.000000000 -0400
++++ freetype-2.2.1/modules.cfg	2006-07-07 21:01:54.000000000 -0400
+@@ -110,7 +110,7 @@
+ AUX_MODULES += cache
+ 
+ # TrueType GX/AAT table validation.  Needs ftgxval.c below.
+-# AUX_MODULES += gxvalid
++AUX_MODULES += gxvalid
+ 
+ # Support for streams compressed with gzip (files with suffix .gz).
+ #
+@@ -124,7 +124,7 @@
+ 
+ # OpenType table validation.  Needs ftotval.c below.
+ #
+-# AUX_MODULES += otvalid
++AUX_MODULES += otvalid
+ 
+ # Auxiliary PostScript driver component to share common code.
+ #

lib32-freetype2/freetype-2.3.0-enable-spr.patch

@@ -0,0 +1,11 @@
+--- freetype-2.3.0/include/freetype/config/ftoption.h.spf	2007-01-18 14:27:34.000000000 -0500
++++ freetype-2.3.0/include/freetype/config/ftoption.h	2007-01-18 14:27:48.000000000 -0500
+@@ -92,7 +92,7 @@
+   /* This is done to allow FreeType clients to run unmodified, forcing     */
+   /* them to display normal gray-level anti-aliased glyphs.                */
+   /*                                                                       */
+-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+ 
+ 
+   /*************************************************************************/