Fix build with freetype-2.5 (#519154)

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 47 insertions, 4 deletions

diff --git a/sys-apps/tuxonice-userui/ChangeLog b/sys-apps/tuxonice-userui/ChangeLog
index 3c49e5be6b4c..66212f1aa52a 100644
--- a/sys-apps/tuxonice-userui/ChangeLog
+++ b/sys-apps/tuxonice-userui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/tuxonice-userui
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/ChangeLog,v 1.37 2014/12/30 17:48:27 floppym Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/ChangeLog,v 1.38 2015/05/15 10:45:03 pacho Exp $
+
+  15 May 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/tuxonice-userui-1.1-freetype-2.5.patch, tuxonice-userui-1.1-r2.ebuild:
+  Fix build with freetype-2.5 (#519154)
 
   30 Dec 2014; Mike Gilbert <floppym@gentoo.org> tuxonice-userui-1.1-r2.ebuild:
   From Arfrever: Update dependencies (bug #526844).
diff --git a/sys-apps/tuxonice-userui/files/tuxonice-userui-1.1-freetype-2.5.patch b/sys-apps/tuxonice-userui/files/tuxonice-userui-1.1-freetype-2.5.patch
new file mode 100644
index 000000000000..f86f99a650fd
--- /dev/null
+++ b/sys-apps/tuxonice-userui/files/tuxonice-userui-1.1-freetype-2.5.patch
@@ -0,0 +1,38 @@
+From ed1b73cf2f073f39200be79c633deb292cb8d4af Mon Sep 17 00:00:00 2001
+From: Damjan Georgievski <gdamjan@gmail.com>
+Date: Mon, 6 Jan 2014 03:06:18 +0100
+Subject: [PATCH] fix #includes for recent freetype versions
+
+---
+ fbsplash/ttf.c | 3 +--
+ fbsplash/ttf.h | 3 +--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/fbsplash/ttf.c b/fbsplash/ttf.c
+index 384f400..1dd841c 100644
+--- a/fbsplash/ttf.c
++++ b/fbsplash/ttf.c
+@@ -27,8 +27,7 @@
+ #include <assert.h>
+ 
+ #include <ft2build.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/ttnameid.h>
++#include FT_FREETYPE_H
+ 
+ #include "splash.h"
+ 
+diff --git a/fbsplash/ttf.h b/fbsplash/ttf.h
+index 034bb9e..6a4da9d 100644
+--- a/fbsplash/ttf.h
++++ b/fbsplash/ttf.h
+@@ -1,8 +1,7 @@
+ #ifndef _TTF_H
+ #define _TTF_H
+ #include <ft2build.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/ttnameid.h>
++#include FT_FREETYPE_H
+ 
+ #define CACHED_METRICS  0x10
+ #define CACHED_BITMAP   0x01
diff --git a/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild b/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild
index e7ceb571db7a..9f90d56b7ee2 100644
--- a/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild
+++ b/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild,v 1.6 2014/12/30 17:48:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild,v 1.7 2015/05/15 10:45:03 pacho Exp $
 
 EAPI="5"
 
@@ -31,6 +31,7 @@ S="${WORKDIR}/${PN}"
 src_prepare() {
 	local d=${WORKDIR}/debian/patches
 	EPATCH_SOURCE=${d} epatch $(<"${d}"/series)
+	epatch "${FILESDIR}"/${P}-freetype-2.5.patch
 	sed -i -e 's/make/$(MAKE)/' Makefile || die
 	sed -i -e 's/ -O3//' Makefile fbsplash/Makefile usplash/Makefile || die
 }