From df2610db0a97ad22fa831b3a9af95f8396ecc844 Mon Sep 17 00:00:00 2001
From: Giuseppe <jiveaxe@gmail.com>
Date: Wed, 30 Oct 2013 14:51:54 +0000
Subject: [PATCH] freetype2: added conflicts/replaces/provides lines and
 removed unused patches

---
 freetype2/PKGBUILD                          |  5 ++++-
 freetype2/freetype-2.2.1-enable-valid.patch | 20 --------------------
 freetype2/freetype-2.3.0-enable-spr.patch   | 11 -----------
 3 files changed, 4 insertions(+), 32 deletions(-)
 delete mode 100644 freetype2/freetype-2.2.1-enable-valid.patch
 delete mode 100644 freetype2/freetype-2.3.0-enable-spr.patch

diff --git a/freetype2/PKGBUILD b/freetype2/PKGBUILD
index 8399a527e..3f94abf1c 100644
--- a/freetype2/PKGBUILD
+++ b/freetype2/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=freetype2
 pkgver=2.4.11
-pkgrel=2
+pkgrel=3
 _ubuntu_diff_version=${pkgver}-0ubuntu1
 pkgdesc="TrueType font rendering library"
 arch=('x86_64')
@@ -17,6 +17,9 @@ source=("http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver
 
 md5sums=('b93435488942486c8d0ca22e8f768034'
          'd31b655036ff49d814fdad1ca981edf9')
+provides=('freetype2-ubuntu')
+conflicts=('freetype2-ubuntu')
+replaces=('freetype2-ubuntu')
 
 build() {
   cd "${srcdir}/freetype-${pkgver}"
diff --git a/freetype2/freetype-2.2.1-enable-valid.patch b/freetype2/freetype-2.2.1-enable-valid.patch
deleted file mode 100644
index c78b6b70f..000000000
--- a/freetype2/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/freetype2/freetype-2.3.0-enable-spr.patch b/freetype2/freetype-2.3.0-enable-spr.patch
deleted file mode 100644
index 8432e28a4..000000000
--- a/freetype2/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
- 
- 
-   /*************************************************************************/