From 76459453d4067db1560b683c283e05611c6f6819 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 2 Aug 2011 18:45:53 -0500
Subject: freetype2: Bump to latest. Replaces freetype2-static. Ref #774

---
 abs/core/freetype2/PKGBUILD    | 14 ++++++++------
 abs/core/freetype2/__changelog |  1 +
 2 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 abs/core/freetype2/__changelog

diff --git a/abs/core/freetype2/PKGBUILD b/abs/core/freetype2/PKGBUILD
index 8244313..8445cc4 100644
--- a/abs/core/freetype2/PKGBUILD
+++ b/abs/core/freetype2/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 94196 2010-10-05 08:06:59Z jgc $
+# $Id$
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=freetype2
-pkgver=2.4.3
+pkgver=2.4.6
 pkgrel=1
 pkgdesc="TrueType font rendering library"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 license=('GPL')
 url="http://freetype.sourceforge.net"
+replaces=('freetype2-static')
 depends=('zlib')
 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'
+md5sums=('5e6510613f612809d2d7862592b92ab7'
          '816dc8619a6904a7385769433c0a8653'
          '214119610444c9b02766ccee5e220680')
 
@@ -23,9 +24,10 @@ build() {
   patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch"
 
   ./configure --prefix=/usr
-  make || return 1
+  make
 }
+
 package() {
   cd "${srcdir}/freetype-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/abs/core/freetype2/__changelog b/abs/core/freetype2/__changelog
new file mode 100644
index 0000000..a1edbbd
--- /dev/null
+++ b/abs/core/freetype2/__changelog
@@ -0,0 +1 @@
+- added replaces=('freetype2-static') to PKGBUILD
-- 
cgit v0.12


From 41fce201fbb0d695844a69e84d5b8a7aa9df6445 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 2 Aug 2011 18:47:41 -0500
Subject: freetype2-static: Remove replaced by freetype2. Ref #774

---
 abs/core/freetype2-static/PKGBUILD                 | 32 ----------------------
 .../freetype-2.2.1-enable-valid.patch              | 20 --------------
 .../freetype-2.3.0-enable-spr.patch                | 11 --------
 3 files changed, 63 deletions(-)
 delete mode 100644 abs/core/freetype2-static/PKGBUILD
 delete mode 100644 abs/core/freetype2-static/freetype-2.2.1-enable-valid.patch
 delete mode 100644 abs/core/freetype2-static/freetype-2.3.0-enable-spr.patch

diff --git a/abs/core/freetype2-static/PKGBUILD b/abs/core/freetype2-static/PKGBUILD
deleted file mode 100644
index f974151..0000000
--- a/abs/core/freetype2-static/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 94196 2010-10-05 08:06:59Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=freetype2-static
-pkgver=2.4.3
-pkgrel=1
-pkgdesc="TrueType font rendering library"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://freetype.sourceforge.net"
-depends=('zlib')
-replaces=('freetype2')
-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}/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 --enable-static
-  make || return 1
-}
-package() {
-  cd "${srcdir}/freetype-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/abs/core/freetype2-static/freetype-2.2.1-enable-valid.patch b/abs/core/freetype2-static/freetype-2.2.1-enable-valid.patch
deleted file mode 100644
index c78b6b7..0000000
--- a/abs/core/freetype2-static/freetype-2.2.1-enable-valid.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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.
- #
diff --git a/abs/core/freetype2-static/freetype-2.3.0-enable-spr.patch b/abs/core/freetype2-static/freetype-2.3.0-enable-spr.patch
deleted file mode 100644
index 8432e28..0000000
--- a/abs/core/freetype2-static/freetype-2.3.0-enable-spr.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
- 
- 
-   /*************************************************************************/
-- 
cgit v0.12