From 9da9b9dcdc09de4c981a84b05145b4c881eae365 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@fedoraproject.org>
Date: Thu, 22 Oct 2009 20:07:58 +0000
Subject: [PATCH] - Update to 2.3.11. - Add freetype-2.3.11-more-demos.patch -
 New demo programs ftmemchk, ftpatchk, and fttimer CVS:    
 ----------------------------------------------------------------------

---
 .cvsignore                       |  6 +++---
 freetype-2.3.11-more-demos.patch | 18 ++++++++++++++++++
 freetype.spec                    | 15 +++++++++++++--
 sources                          |  6 +++---
 4 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 freetype-2.3.11-more-demos.patch

diff --git a/.cvsignore b/.cvsignore
index 1139a56..5e2b691 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
-freetype-doc-2.3.10.tar.bz2
-ft2demos-2.3.10.tar.bz2
-freetype-2.3.10.tar.bz2
+freetype-doc-2.3.11.tar.bz2
+ft2demos-2.3.11.tar.bz2
+freetype-2.3.11.tar.bz2
diff --git a/freetype-2.3.11-more-demos.patch b/freetype-2.3.11-more-demos.patch
new file mode 100644
index 0000000..4b0046e
--- /dev/null
+++ b/freetype-2.3.11-more-demos.patch
@@ -0,0 +1,18 @@
+diff -up freetype-2.3.11/ft2demos-2.3.11/Makefile.more-demos freetype-2.3.11/ft2demos-2.3.11/Makefile
+--- freetype-2.3.11/ft2demos-2.3.11/Makefile.more-demos	2009-10-22 16:02:26.000000000 -0400
++++ freetype-2.3.11/ft2demos-2.3.11/Makefile	2009-10-22 16:02:32.000000000 -0400
+@@ -288,10 +288,10 @@ else
+   # Note that ttdebug only works if the FreeType's `truetype' driver has
+   # been compiled with TT_CONFIG_OPTION_BYTECODE_INTERPRETER defined.
+   #
+-  # EXES += ftchkwd
+-  # EXES += ftmemchk
+-  # EXES += ftpatchk
+-  # EXES += fttimer
++  EXES += ftchkwd
++  EXES += ftmemchk
++  EXES += ftpatchk
++  EXES += fttimer
+   # EXES += testname
+   # EXES += ttdebug
+ 
diff --git a/freetype.spec b/freetype.spec
index a063cda..aa5b608 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -8,7 +8,7 @@
 
 Summary: A free and portable font rendering engine
 Name: freetype
-Version: 2.3.10
+Version: 2.3.11
 Release: 1%{?dist}
 License: FTL or GPLv2+
 Group: System Environment/Libraries
@@ -24,6 +24,8 @@ Patch21:  freetype-2.3.0-enable-spr.patch
 
 # Enable otvalid and gxvalid modules
 Patch46:  freetype-2.2.1-enable-valid.patch
+# Enable additional demos
+Patch47:  freetype-2.3.11-more-demos.patch
 
 # Fix multilib conflicts
 Patch88:  freetype-multilib.patch
@@ -94,6 +96,7 @@ popd
 %endif
 
 %patch46  -p1 -b .enable-valid
+%patch47  -p1 -b .more-demos
 
 %patch88 -p1 -b .multilib
 %patch89 -p1 -b .memcpy
@@ -127,7 +130,7 @@ rm -rf $RPM_BUILD_ROOT
 %makeinstall gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale
 
 {
-  for ftdemo in ftbench ftchkwd ftdump ftlint ftmemchk ftvalid ; do
+  for ftdemo in ftbench ftchkwd ftmemchk ftpatchk fttimer ftdump ftlint ftmemchk ftvalid ; do
       builds/unix/libtool --mode=install install -m 755 ft2demos-%{version}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir}
   done
 }
@@ -196,6 +199,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_bindir}/ftbench
 %{_bindir}/ftchkwd
+%{_bindir}/ftmemchk
+%{_bindir}/ftpatchk
+%{_bindir}/fttimer
 %{_bindir}/ftdump
 %{_bindir}/ftlint
 %{_bindir}/ftmemchk
@@ -226,6 +232,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/tutorial
 
 %changelog
+* Thu Oct 22 2009 Behdad Esfahbod <behdad@redhat.com> 2.3.11-1
+- Update to 2.3.11.
+- Add freetype-2.3.11-more-demos.patch
+- New demo programs ftmemchk, ftpatchk, and fttimer
+
 * Thu Oct 08 2009 Behdad Esfahbod <behdad@redhat.com> 2.3.10-1
 - Drop freetype-2.3.9-aliasing.patch
 - Update to 2.3.10.
diff --git a/sources b/sources
index 317e40b..1092b82 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-9bdd83c5b6559bdfb68984f0b3d1dc8c  freetype-doc-2.3.10.tar.bz2
-e6d762885ecc8222774f5063a1605e45  ft2demos-2.3.10.tar.bz2
-b7a8a26cc137716a32b788664697d727  freetype-2.3.10.tar.bz2
+c9d75b659382aef80a8f86efcde08629  freetype-doc-2.3.11.tar.bz2
+7e3df8813fdbad22e996a5dfed7f7361  ft2demos-2.3.11.tar.bz2
+519c7cbf5cbd72ffa822c66844d3114c  freetype-2.3.11.tar.bz2