From ca77ab425dd0489f77695b11435d855f1b7e4686 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 28 Jun 2014 08:18:37 +0200
Subject: [PATCH] libXfont: fix build with fontsproto-2.1.3.

---
 .../patches/fix-for-fontsproto213.patch       | 70 +++++++++++++++++++
 srcpkgs/libXfont/template                     |  3 +
 2 files changed, 73 insertions(+)
 create mode 100644 srcpkgs/libXfont/patches/fix-for-fontsproto213.patch

diff --git a/srcpkgs/libXfont/patches/fix-for-fontsproto213.patch b/srcpkgs/libXfont/patches/fix-for-fontsproto213.patch
new file mode 100644
index 00000000000..3a1e953394c
--- /dev/null
+++ b/srcpkgs/libXfont/patches/fix-for-fontsproto213.patch
@@ -0,0 +1,70 @@
+diff --git a/src/util/patcache.c b/src/util/patcache.c
+index 9c05fa1..2101015 100644
+--- src/util/patcache.c
++++ src/util/patcache.c
+@@ -50,7 +50,7 @@ typedef unsigned char	EntryPtr;
+ typedef struct _FontPatternCacheEntry {
+     struct _FontPatternCacheEntry   *next, **prev;
+     short			    patlen;
+-    char			    *pattern;
++    const char			    *pattern;
+     int				    hash;
+     FontPtr			    pFont;	/* associated font */
+ } FontPatternCacheEntryRec, *FontPatternCacheEntryPtr;
+@@ -74,7 +74,7 @@ EmptyFontPatternCache (FontPatternCachePtr cache)
+ 	cache->entries[i].next = &cache->entries[i+1];
+ 	cache->entries[i].prev = 0;
+ 	cache->entries[i].pFont = 0;
+-	free (cache->entries[i].pattern);
++	free ((void *) cache->entries[i].pattern);
+ 	cache->entries[i].pattern = 0;
+ 	cache->entries[i].patlen = 0;
+     }
+@@ -107,7 +107,7 @@ FreeFontPatternCache (FontPatternCachePtr cache)
+     int	    i;
+ 
+     for (i = 0; i < NENTRIES; i++)
+-	free (cache->entries[i].pattern);
++	free ((void *) cache->entries[i].pattern);
+     free (cache);
+ }
+ 
+@@ -128,7 +128,7 @@ Hash (const char *string, int len)
+ /* add entry */
+ void
+ CacheFontPattern (FontPatternCachePtr cache,
+-		  char *pattern,
++		  const char *pattern,
+ 		  int patlen,
+ 		  FontPtr pFont)
+ {
+@@ -154,7 +154,7 @@ CacheFontPattern (FontPatternCachePtr cache,
+ 	if (e->next)
+ 	    e->next->prev = e->prev;
+ 	*e->prev = e->next;
+-	free (e->pattern);
++	free ((void *) e->pattern);
+     }
+     /* set pattern */
+     memcpy (newpat, pattern, patlen);
+@@ -174,7 +174,7 @@ CacheFontPattern (FontPatternCachePtr cache,
+ /* find matching entry */
+ FontPtr
+ FindCachedFontPattern (FontPatternCachePtr cache,
+-		       char *pattern,
++		       const char *pattern,
+ 		       int patlen)
+ {
+     int				hash;
+@@ -211,7 +211,7 @@ RemoveCachedFontPattern (FontPatternCachePtr cache,
+ 	    *e->prev = e->next;
+ 	    e->next = cache->free;
+ 	    cache->free = e;
+-	    free (e->pattern);
++	    free ((void *) e->pattern);
+ 	    e->pattern = 0;
+ 	}
+     }
+--
+cgit v0.9.0.2-2-gbebe
+
diff --git a/srcpkgs/libXfont/template b/srcpkgs/libXfont/template
index 3d36d99714a..4dc266e8782 100644
--- a/srcpkgs/libXfont/template
+++ b/srcpkgs/libXfont/template
@@ -13,6 +13,9 @@ license="MIT"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 checksum=5568d4febf790fb250fb8d4ecf1f389a428eb545a79fb2abe9c82f652d14d005
 
+pre_configure() {
+	sed -e 's,fontsproto < 2.1.3,fontsproto <= 2.1.3,g' -i configure
+}
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
 }