[libgnomeprint22] Fix building with current freetype

[mkasik]

commit 40518571582ee3e4eb98d7dfb84fc5b63c9ee538
Author: Marek Kasik <mkasik at redhat.com>
Date:   Wed Jun 11 11:26:23 2014 +0200

    Fix building with current freetype
    
    Resolves: #1106017

 libgnomeprint22-2.18.8-freetype.patch |   36 +++++++++++++++++++++++++++++++++
 libgnomeprint22.spec                  |    8 ++++++-
 2 files changed, 43 insertions(+), 1 deletions(-)
---
diff --git a/libgnomeprint22-2.18.8-freetype.patch b/libgnomeprint22-2.18.8-freetype.patch
new file mode 100644
index 0000000..cf4dc09
--- /dev/null
+++ b/libgnomeprint22-2.18.8-freetype.patch
@@ -0,0 +1,36 @@
+--- libgnomeprint-2.18.8/libgnomeprint/gnome-font-face.c
++++ libgnomeprint-2.18.8/libgnomeprint/gnome-font-face.c
+@@ -36,7 +36,8 @@
+ #include <stdarg.h>
+ #include <locale.h>
+ 
+-#include <freetype/ftoutln.h>
++#include <ft2build.h>
++#include FT_OUTLINE_H
+ 
+ #include <libgnomeprint/gnome-print-private.h>
+ #include <libgnomeprint/gnome-font-private.h>
+--- libgnomeprint-2.18.8/libgnomeprint/gnome-print-gdi.c
++++ libgnomeprint-2.18.8/libgnomeprint/gnome-print-gdi.c
+@@ -36,7 +36,7 @@
+ #include <libgnomeprint/gp-gc-private.h>
+ 
+ #include <ft2build.h>
+-#include <freetype/freetype.h>
++#include FT_FREETYPE_H
+ 
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
+--- libgnomeprint-2.18.8/libgnomeprint/gnome-rfont.c
++++ libgnomeprint-2.18.8/libgnomeprint/gnome-rfont.c
+@@ -28,8 +28,8 @@
+ 
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftbbox.h>
++#include FT_GLYPH_H
++#include FT_BBOX_H
+ #include <libart_lgpl/art_misc.h>
+ #include <libart_lgpl/art_affine.h>
+ #include <libart_lgpl/art_vpath.h>
diff --git a/libgnomeprint22.spec b/libgnomeprint22.spec
index f047144..0de6bc0 100644
--- a/libgnomeprint22.spec
+++ b/libgnomeprint22.spec
@@ -3,7 +3,7 @@
 Summary: Printing library for GNOME
 Name:  libgnomeprint22
 Version: 2.18.8
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: LGPLv2+ and BSD
 # BSD applies to ttsubset code that was taken from STSF
 Group:          System Environment/Base
@@ -11,6 +11,7 @@ Source:  http://download.gnome.org/sources/libgnomeprint/2.18/libgnomeprint-%{ve
 URL:            http://www.gnome.org
 Patch0:  libgnomeprint22-stdio.patch
 Patch1:  libgnomeprint22-2.18.8-bison.patch
+Patch2:  libgnomeprint22-2.18.8-freetype.patch
 
 Requires: urw-fonts
 Requires: ghostscript
@@ -62,6 +63,7 @@ want to use the GNOME desktop environment.
 %setup -q -n libgnomeprint-%{version}
 %patch0 -p1 -b .stdio
 %patch1 -p1 -b .bison
+%patch2 -p1 -b .freetype
 
 # Convert to utf-8
 for file in NEWS; do
@@ -101,6 +103,10 @@ find $RPM_BUILD_ROOT -name *.la -exec rm {} \;
 %{_datadir}/gtk-doc/html/libgnomeprint
 
 %changelog
+* Wed Jun 11 2014 Marek Kasik <mkasik at redhat.com> - 2.18.8-11
+- Fix building with current freetype
+- Resolves: #1106017
+
 * Tue Jun 10 2014 Marek Kasik <mkasik at redhat.com> - 2.18.8-10
 - Fix building with the new bison
 - Resolves: #1106017