Bug 1080516

Summary:	ttmkfdir ftbfs in rawhide due to freetype header move
Product:	[Fedora] Fedora	Reporter:	Brent Baude <bbaude>
Component:	ttmkfdir	Assignee:	Parag Nemade <pnemade>
Status:	CLOSED NEXTRELEASE	QA Contact:	Fedora Extras Quality Assurance <extras-qa>
Severity:	high	Docs Contact:
Priority:	unspecified
Version:	rawhide	CC:	i18n-bugs, pnemade, psatpute
Target Milestone:	---
Target Release:	---
Hardware:	All
OS:	Linux
Whiteboard:
Fixed In Version:	ttmkfdir-3.0.9-41.fc21	Doc Type:	Bug Fix
Doc Text:		Story Points:	---
Clone Of:		Environment:
Last Closed:	2014-03-26 05:39:45 UTC	Type:	Bug
Regression:	---	Mount Type:	---
Documentation:	---	CRM:
Verified Versions:		Category:	---
oVirt Team:	---	RHEL 7.3 requirements from Atomic Host:
Cloudforms Team:	---	Target Upstream Version:
Embargoed:
Bug Depends On:
Bug Blocks:	1051573

Description Brent Baude 2014-03-25 15:20:33 UTC

ttmkfdir ftbfs in rawhide due to freetype header move

Here's a patch for the rawhide spec:

diff --git a/ttmkfdir.spec b/ttmkfdir.spec
index 262c213..395c3d1 100644
--- a/ttmkfdir.spec
+++ b/ttmkfdir.spec
@@ -16,6 +16,7 @@ Patch6: ttmkfdir-3.0.9-segfaults.patch
 Patch7: ttmkfdir-3.0.9-encoding-dir.patch
 Patch8: ttmkfdir-3.0.9-font-scale.patch
 Patch9: ttmkfdir-3.0.9-bug434301.patch
+Patch99: freetype_header_fix.patch
 Source10: ttmkfdir.1
 # Only licensing attribution is in README, no version.
 License: LGPLv2+
@@ -45,6 +46,7 @@ by the font server.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch99 -p1
 
 %build
 make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"

And the actual patch:

diff -Nau ttmkfdir-3.0.9.orig/ttf.cpp ttmkfdir-3.0.9/ttf.cpp
--- ttmkfdir-3.0.9.orig/ttf.cpp	2014-03-25 10:12:53.350009854 -0500
+++ ttmkfdir-3.0.9/ttf.cpp	2014-03-25 10:14:43.790009861 -0500
@@ -3,7 +3,7 @@
 #include <cctype>
 #include <cstring>
 
-#include "freetype/tttables.h"
+#include "freetype2/tttables.h"
 #include "ttmkfdir.h"
 #include "ttf.h"
 #include "ttos2val.h"

Comment 1 Parag Nemade 2014-03-26 05:03:42 UTC

looks like the correct location for header is
#include "freetype2/freetype/tttables.h"

Comment 2 Parag Nemade 2014-03-26 05:39:45 UTC

ah! my bad. In rawhide its location is actually freetype2/tttables.h

Fixed in ttmkfdir-3.0.9-41.fc21