[qt3] add new freetype 2.5.1 include paths, fixes FTBFS

[Kevin Kofler]

commit 8c3c0492efd8d904961414703c5daeab2e39c87b
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sun Feb 23 04:56:17 2014 +0100

    add new freetype 2.5.1 include paths, fixes FTBFS
    
    Add new freetype 2.5.1 include paths to the search path (in addition to the
    old paths), fixes FTBFS (patch by Hrvoje Senjan from OBS KDE:KDE3).

 ...ee-3.3.8b-extend-freetype-includes-search.patch |   16 ++++++++++++++++
 qt3.spec                                           |    5 +++++
 2 files changed, 21 insertions(+), 0 deletions(-)
---
diff --git a/qt-x11-free-3.3.8b-extend-freetype-includes-search.patch b/qt-x11-free-3.3.8b-extend-freetype-includes-search.patch
new file mode 100644
index 0000000..a4b1e62
--- /dev/null
+++ b/qt-x11-free-3.3.8b-extend-freetype-includes-search.patch
@@ -0,0 +1,16 @@
+diff -Naur qt-x11-free-3.3.8b/config.tests/x11/xfreetype.test qt-x11-free-3.3.8b.new/config.tests/x11/xfreetype.test
+--- qt-x11-free-3.3.8b/config.tests/x11/xfreetype.test	2008-01-15 20:09:15.000000000 +0100
++++ qt-x11-free-3.3.8b.new/config.tests/x11/xfreetype.test	2013-12-12 13:02:43.482468660 +0100
+@@ -116,10 +116,10 @@
+ # check for freetype2 headers
+ FREETYPE2_INCDIR=
+ if [ "$XFT" = "yes" ]; then
+-    INC="freetype2/freetype/freetype.h"
++    INC="freetype.h"
+     XDIRS=`sed -n -e '/^QMAKE_INCDIR_X11[	]*=/ { s/[^=]*=[	 ]*//; s/-I/ /g; p; }' $XCONFIG`
+     LDIRS=`sed -n -e '/^QMAKE_INCDIR[	]*=/ { s/[^=]*=[	 ]*//; s/-I/ /g; p; }' $XCONFIG`
+-    INCDIRS="$IN_INCDIRS $XDIRS $LDIRS /usr/include /include"
++    INCDIRS="$IN_INCDIRS $XDIRS $LDIRS /usr/include/freetype2 /usr/include/freetype2/freetype /usr/include/freetype /usr/include /include"
+     F=
+     for INCDIR in $INCDIRS; do
+ 	if [ -f $INCDIR/$INC ]; then
diff --git a/qt3.spec b/qt3.spec
index 6ff2015..5f81e0d 100644
--- a/qt3.spec
+++ b/qt3.spec
@@ -63,6 +63,9 @@ Patch45: qt-x11-free-3.3.8b-system-zlib-header.patch
 Patch46: qt-3.3.8-libpng15.patch
 # work around -Werror=format-security false positives (#1037297)
 Patch47: qt-x11-free-3.3.8b-#1037297.patch
+# add new freetype 2.5.1 include paths to the search path (in addition to the
+# old paths), fixes FTBFS (patch by Hrvoje Senjan from OBS KDE:KDE3)
+Patch48: qt-x11-free-3.3.8b-extend-freetype-includes-search.patch
 
 # immodule patches
 Patch50: qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2
@@ -312,6 +315,7 @@ sed -i.KDE3_PLUGIN_PATH \
 %patch46 -p0 -b .libpng15
 %endif
 %patch47 -p1 -b .#1037297
+%patch48 -p1 -b .freetype-includes
 
 # immodule patches
 %if %{immodule}
@@ -636,6 +640,7 @@ rm -rf %{buildroot}
 * Sun Feb 23 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.3.8b-57
 - add ppc64le support to qt.sh and qt.csh (#1068898)
 - fix ppc64 support in qt.csh
+- add new freetype 2.5.1 include paths, fixes FTBFS (patch by Hrvoje Senjan)
 
 * Tue Jan 14 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.3.8b-56
 - work around -Werror=format-security false positives (#1037297)