Fixed compilation with >=freetype-2.5.1 (bug #493604)

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

4 files changed, 43 insertions, 6 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index 0e717d03ea6b..51480385d83a 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/dia
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.162 2014/02/22 21:01:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.163 2014/03/11 11:22:46 polynomial-c Exp $
+
+  11 Mar 2014; Lars Wendler <polynomial-c@gentoo.org> dia-0.97.2-r1.ebuild,
+  dia-0.97.2-r2.ebuild, +files/dia-0.97.2-freetype251.patch:
+  Fixed compilation with >=freetype-2.5.1 (bug #493604).
 
   22 Feb 2014; Pacho Ramos <pacho@gentoo.org> dia-0.97.2-r2.ebuild:
   Fix wrong commit, bug 502160
diff --git a/app-office/dia/dia-0.97.2-r1.ebuild b/app-office/dia/dia-0.97.2-r1.ebuild
index 6e440f0ab116..37be4b6d4c35 100644
--- a/app-office/dia/dia-0.97.2-r1.ebuild
+++ b/app-office/dia/dia-0.97.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.2-r1.ebuild,v 1.11 2012/10/28 15:22:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.2-r1.ebuild,v 1.12 2014/03/11 11:22:46 polynomial-c Exp $
 
 EAPI=4
 
@@ -70,6 +70,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159831
 	epatch "${FILESDIR}"/${PN}-0.97.2-glib-2.31.patch #401331
 	epatch "${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685
+	epatch "${FILESDIR}"/${PN}-0.97.2-freetype251.patch #493604
 
 	if use python; then
 		python_convert_shebangs -r 2 .
diff --git a/app-office/dia/dia-0.97.2-r2.ebuild b/app-office/dia/dia-0.97.2-r2.ebuild
index 1daff237a60d..151ee1c4d166 100644
--- a/app-office/dia/dia-0.97.2-r2.ebuild
+++ b/app-office/dia/dia-0.97.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.2-r2.ebuild,v 1.7 2014/02/22 21:01:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.2-r2.ebuild,v 1.8 2014/03/11 11:22:46 polynomial-c Exp $
 
 EAPI=5
 GCONF_DEBUG=yes
@@ -55,6 +55,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685
 	epatch "${FILESDIR}"/${PN}-0.97.2-implicit-declaration.patch #468166
 	epatch "${FILESDIR}"/${PN}-0.97.2-glib2.36.patch #469040
+	epatch "${FILESDIR}"/${PN}-0.97.2-freetype251.patch #493604
 
 	if use python; then
 		python_fix_shebang .
@@ -82,8 +83,8 @@ src_configure() {
 	# --enable-gnome only adds support for deprecated stuff, bug #442294
 	# https://bugzilla.redhat.com/show_bug.cgi?id=996759
 	gnome2_src_configure \
-		--exec-prefix=${EPREFIX}/usr \
-		--docdir=${EPREFIX}/usr/share/doc/${PF} \
+		--exec-prefix="${EPREFIX}/usr" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--disable-gnome \
 		--disable-libemf \
 		$(use_enable doc db2html) \
diff --git a/app-office/dia/files/dia-0.97.2-freetype251.patch b/app-office/dia/files/dia-0.97.2-freetype251.patch
new file mode 100644
index 000000000000..a5c500344d11
--- /dev/null
+++ b/app-office/dia/files/dia-0.97.2-freetype251.patch
@@ -0,0 +1,31 @@
+From 922db161c4cae5ac39203a1b24b194e209231055 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Mon, 16 Dec 2013 22:30:40 +0000
+Subject: plugin: Use the Freetype developer's proposed way if #include'ing their headers.
+
+Allows us to build against Freetype 2.5.1 (without breaking older
+versions).
+
+https://bugzilla.gnome.org/show_bug.cgi?id=720573
+
+Signed-off-by: Hans Breuer <hans@breuer.org>
+(cherry picked from commit 0b863adcad031c70601e375d72dae64fdd967752)
+---
+diff --git a/plug-ins/postscript/diapsft2renderer.c b/plug-ins/postscript/diapsft2renderer.c
+index 06675f8..09f6edb 100644
+--- a/plug-ins/postscript/diapsft2renderer.c
++++ b/plug-ins/postscript/diapsft2renderer.c
+@@ -29,8 +29,9 @@
+ #include <pango/pangoft2.h>
+ #include <pango/pango-engine.h>
+ /* I'd really rather avoid this */
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
++#include <ft2build.h>
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
+ 
+ #define DPI 300
+ 
+--
+cgit v0.9.2