[libXfont] Fix FTBFS against new fontproto

[Adam Jackson]

commit 345841236e087ecd8b70f14c9e88da2daf3e4287
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Jun 9 10:33:58 2014 -0400

    Fix FTBFS against new fontproto

 libXfont-1.4.7-fontproto-compat.patch |   21 +++++++++++++++++++++
 libXfont.spec                         |    5 +++++
 2 files changed, 26 insertions(+), 0 deletions(-)
---
diff --git a/libXfont-1.4.7-fontproto-compat.patch b/libXfont-1.4.7-fontproto-compat.patch
new file mode 100644
index 0000000..0196b72
--- /dev/null
+++ b/libXfont-1.4.7-fontproto-compat.patch
@@ -0,0 +1,21 @@
+diff -up libXfont-1.4.7/src/util/patcache.c.jx libXfont-1.4.7/src/util/patcache.c
+--- libXfont-1.4.7/src/util/patcache.c.jx	2014-01-07 11:25:08.000000000 -0500
++++ libXfont-1.4.7/src/util/patcache.c	2014-06-09 10:32:13.387099003 -0400
+@@ -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)
+ {
+@@ -174,7 +174,7 @@ CacheFontPattern (FontPatternCachePtr ca
+ /* find matching entry */
+ FontPtr
+ FindCachedFontPattern (FontPatternCachePtr cache,
+-		       char *pattern,
++		       const char *pattern,
+ 		       int patlen)
+ {
+     int				hash;
diff --git a/libXfont.spec b/libXfont.spec
index 13264e2..7fad280 100644
--- a/libXfont.spec
+++ b/libXfont.spec
@@ -8,6 +8,7 @@ URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: http://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+Patch0: libXfont-1.4.7-fontproto-compat.patch
 
 BuildRequires: autoconf automake libtool
 BuildRequires: pkgconfig(fontsproto)
@@ -30,6 +31,7 @@ X.Org X11 libXfont development package
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 autoreconf -v --install --force
@@ -80,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
+* Mon Jun 09 2014 Adam Jackson <ajax at redhat.com> 1.4.7-2
+- Fix FTBFS against new fontproto
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild