add patch to fix FTBFS due to freetype changes

This commit is contained in:
Dennis Gilmore 2014-04-12 10:24:51 -05:00
parent 653b39a2fb
commit 98015b75f1
2 changed files with 28 additions and 1 deletions

View File

@ -0,0 +1,22 @@
Dscription: Fix build failure with freetype 2.5.1
Author: Juhani Numminen <juhaninumminen0@gmail.com>
Bug-Debian: http://bugs.debian.org/733385
--- a/src/xftglyphs.c
+++ b/src/xftglyphs.c
@@ -21,10 +21,11 @@
*/
#include "xftint.h"
-#include <freetype/ftoutln.h>
-#include <freetype/ftlcdfil.h>
+#include <ft2build.h>
+#include FT_OUTLINE_H
+#include FT_LCD_FILTER_H
-#include <freetype/ftsynth.h>
+#include FT_SYNTHESIS_H
/*
* Validate the memory info for a font

View File

@ -1,12 +1,13 @@
Summary: X.Org X11 libXft runtime library
Name: libXft
Version: 2.3.1
Release: 5%{?dist}
Release: 6%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.x.org
Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
Patch0: fix-freetype-includes.patch
BuildRequires: xorg-x11-util-macros
BuildRequires: autoconf automake libtool
@ -29,6 +30,7 @@ X.Org X11 libXft development package
%prep
%setup -q
%patch0 -p1
%build
autoreconf -v --install --force
@ -73,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/Xft.3*
%changelog
* Sat Apr 12 2014 Dennis Gilmore <dennis @ausil.us> - 2.3.1-6
- add patch to fix FTBFS due to freetype changes
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild