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

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

5 files changed, 60 insertions, 12 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/Manifest b/app-office/dia/Manifest
index 7573a561f61c..a2fa8e7fe0e4 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -2,19 +2,30 @@
 Hash: SHA256
 
 AUX dia-0.97.0-gnome-doc.patch 1961 SHA256 5a0161a8da6991c65eb85cda4fbb00e65d897a13ab17ca2d1924167d316fa7a6 SHA512 5200051f19d4a199f8c4e17e5f23c16ad4c13a9531b843be0a4d491aa8884efd4d90e6850c1cd1488e80b344ff18e5dc2b2ad7e57cb7417b6c574ad1e8d6f186 WHIRLPOOL d60ea1f01be0a5823c5de654476528cba55fd3587dbf8abbf681e6de939033b3c70b7fc9ffe034b33cdd3344fc2cebe821eca12a635b766ed38169d268e7f910
+AUX dia-0.97.2-freetype251.patch 992 SHA256 499c5db2ad69b24b214d57172a80d5876ac816449adbe0862b16e4bc8f8c52d5 SHA512 d772c4282814b86f945337f4e515e94d1ab48a95924980c13881d7ce441265ecc2793d6e872c0fc5d64ed98e75a4c011754ba1a8ccb13486bdfd04d9e71b6573 WHIRLPOOL 243cf957b830917fd411893e5ba0a6d29e5683122a45af15bf51ce8969d3637602718eaef7012fd39cf25884d95ee1e13c53cffb6ae6d9aba8f96bda36417587
 AUX dia-0.97.2-glib-2.31.patch 1553 SHA256 23fedf222d154e7b3565e419e5ba40f12366b47772de49342e6eb2862271f3f4 SHA512 d47f87f73185781136f8c55ba67a326d32408c511e18b6b82afb6e069d380bedfa689c8bd4ef426aa577f008394a651ad570e66344db3733be6677dea2683d24 WHIRLPOOL a7a9b7bd7cbb31edd89e2158ef69b2185dc62c30d315369c1369a6073b5083c7953ddeb2eb9779dae7bca7aaef9c3bc8328ef1ae40b49d88ac8832500a808ef2
 AUX dia-0.97.2-glib2.36.patch 3747 SHA256 8dd54b2c04faa53fd4a1740ee16c610c45bf5c0d4eb0370a538728bfdf05e3fe SHA512 bf7e987e8aab9645fa290424a3d3c0d6ff924d107630952b01284593550598125f66def7cf6bffc2dd626fdc6a7a1ae0de42af5efecae9e9981ed62b004fec8d WHIRLPOOL 7831e881f63f6d1895808901784f0d97dd45db6798f7cc8970240320732d3fe9ebf4b959a5b1d172f5139903a622d3c2e401578fcab92f267fcdf3caa8a54b9a
 AUX dia-0.97.2-implicit-declaration.patch 857 SHA256 4bd8958bb5e8a80b99905fb205d90917ce3ed43f826b1ef185fe98f24de0fbaa SHA512 3d48e779219d2d55befd3ac23e9a382d8cbd7d02377254176e8982df0123f2c420ab543c1d13f887d39a0ea4be47ccb4686b9e2b9e0ebebdbb0d27faa9a6d234 WHIRLPOOL d6e7628afeeda290cee9bd59fb6e760e1f2fc9348cffe09264022d7516f2dcbdcbce493e3ff016918b620fea792a4c275c9009f19387e2cc2e2d8ad189bb69b2
 AUX dia-0.97.2-underlinking.patch 1024 SHA256 3b5cbe564c9a48453e4300b89fa24de7454268b388a56036afe187c56e46c951 SHA512 d45eb49c39227e9f11ce999083de0a83c60bfac2a5db2403e4bf083c275efdef6bd1adca678712253ec53f7b3d22a5c23f6f886839c32e6cb07a93c001f45e2e WHIRLPOOL 90ea84704a2a3f14730d54044075cae6339c5f21d1fff00567f0c9834bdeae187c83f4eedc7ae7839f0cccecc2caca7ca133968e914ab79333c3005e431c70a5
 DIST dia-0.97.2.tar.xz 5507004 SHA256 a761478fb98697f71b00d3041d7c267f3db4b94fe33ac07c689cb89c4fe5eae1 SHA512 493510d038213a50141998e2af29ddcc5e98495c287417dcb6a0880b4e16cad8f1b47d0948e0a5727d88d5640664e8b28d4af3f219dd0343069aaa9895d945ba WHIRLPOOL 600f7f7d8c5707a4b0174fce6db1bdbb48b77ba6390b6c659708f4e10d0e5b33f265e1edfb6dc8e982e39a8d7a72d2645d747b4043ea79544a6812325a8e8f33
-EBUILD dia-0.97.2-r1.ebuild 2747 SHA256 bb7de361bcdd12850e2e041d91c3d106bbb85b49565736030b8aefc74659e339 SHA512 1dd596e9f246dd5e9dc7895be5e2f253cfe12cf9951ad2f6a022ed5cc4e0df5606c0050d3ade1ce8e4f8c676b3c968383a7f6336f59aa947fa5deae7ff440d7f WHIRLPOOL f5c636b24b9f8624fb7964dc28134022eca1c54e9aac3fb7ffa2ab0842c0ed9fcdb41994c920c0816afe11e49a77ed4be47e3b2f60452967eaeed275c97a0a6f
-EBUILD dia-0.97.2-r2.ebuild 2887 SHA256 0c34ab578d050798e41716de9522b906796c8d8aa9fb15d74e45ddf0b81156c4 SHA512 e8f9a7deceaf576d2072dae36dca336ac401d069cd416c587f9164bb283eadbfe0b2c543f68a00e686cd2f2f999bc936170b323f0ce8c3cef407367b177cc372 WHIRLPOOL 6d1426dc79cb6ff4a389b0a1bdb0cddf113ecd599a6ebed2f9c7a4b8ed01167a78b17bac8bf970b3ab08c8a5801804371effc4f056d793b0d9ac41cf8edbb4ea
-MISC ChangeLog 21435 SHA256 47e25d1d8bfc708715a411b01d685beb9d894c5777b57676b1d5ff5412af7ca5 SHA512 d3b948c53f8f20deccb419fe3d7fe7bd2a1ec24ece5c6af16c1af1c02282557f92bb126d76e3e659510865f40effd5109a311fa4e659f405828384dd26b0f3fc WHIRLPOOL 36011cbaad7ab1ee094785634180333470f4e2ccc6e06012d733a1303706a3e7291d0d6d0d202f0f4435ca6df473a26eaefeb46bc2b00a6968b73813a1fb3f2e
+EBUILD dia-0.97.2-r1.ebuild 2813 SHA256 827429dd7f830d78e6ece4b4024e6c8b68d9b3dd9e93857679831f6793ccb33a SHA512 a11686353759b6bd6924e219a554aace057b1f6faba5fb59c2067045af5b27e48c9c8d497cd2877980e26a0a9b601986dd29125c9e3b7a7b737b71bfdb285bf4 WHIRLPOOL 5b94c99fed72c84c8ef5163a10bab2c6347a02e5eff75190089e6c3d9cd9ed1c24aa5f74199f1121b1ea415b91de81f824915c26021e7f38bfb39de32a261745
+EBUILD dia-0.97.2-r2.ebuild 2959 SHA256 17de43e2aa4c306191455f294bae95c6e58a1b0f99d76c9ab3321253414ce720 SHA512 afb47212f9d75440c95a598ddf60cd82a0565c4cec6b49af6fd27f286a765034ceeaea0200db3c77efded75c9d89ccc7165f5e73ac91da5310338c9a19df138d WHIRLPOOL 53c1d8a83f68afe8f9c51ab0588aa564c7faec53f3a3393cb52f4ab548052f1df62a9e77b0e36a331c25ec1ec2d04bcf387d8b21a7317c13947d142d9c3458ee
+MISC ChangeLog 21637 SHA256 ed41a4f965ecacfc74c13352b4b37d845ca30bd968064cf87828712b0c27d5d0 SHA512 ccee381ef8a17b887acd7b52b51bf65492d82a6f6372f515951a90392cca5001c0c5b3a76f16f33a5666604de730787ba1a14d63cceb3b10634c5e442bca4385 WHIRLPOOL c2757798c2a14c01e1152feda47907cbd6ae76615c5499702916858427d13f132aa4adb4eaa7c44b21ee72ca4ca796227fa0ddf3ee926e97e8c8aacd952862c2
 MISC metadata.xml 578 SHA256 9f701216a4674db9adcda07b71c272954d60cbb8764e09052db999436287766c SHA512 bc6988cb36508fde98810d60e99975bb626bf5f1d938bc289e010a2268da5a044c674bd0b626609358bd98c2e23ea91c1ca678e6ab181645fe4de1d610e0325f WHIRLPOOL d8827938a36ccf7fb2cbde3d0e9134c111e8bf9ab7640942e212964a6be51ff66da905017393ebcfb1a507e9c12be6425f323115d32f2bc6bbc93546a28ba26a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMJEEMACgkQCaWpQKGI+9T/NwCcDMIlIKnUD0EhQ+iZRI017drW
-atAAmwdAFU2tD5ztS3ijqXVM2JglErr6
-=ya2E
+iQIcBAEBCAAGBQJTHvIHAAoJEPiazRVxLXTFe+wP/iYMVZLPbOrTRBjcEn7UgAIe
+bzX27bpCB6RwwiPLw7ySKxl/G13eAgGp4Tbk+cJQelZKpJM2QLBc/iy9Dvlbv1T/
+ts83+0hka7RetpbIL4uBglcbH410y1Y9m1DmTDkPjC7sSz5RnVF/Lk0MWg8pwfGS
+t8se+2rsrF4RNZmW71B1sHRTWKd52hlx4uDma5zzkuGYBZXd83FgKuK40Vu/gAzz
+iLfomdNPMdH79j5uD1Z2yPh/X5KWLytBP1qwaIcUkJoI13W+gHmttZW7MLTo6mxx
+fCcnbrdw4MDio+Qkn8gGJILYprxyGDQ3F1SLJ9W3TfkeSku69i+NF/lQ/1gIdgqM
+ivBGNbqY5x6MUn/5i0o0oait4AELwZ9aDmpRdouBq8bdyhfE+MsIxYfJuVpGng7a
+fx79+W1mpw+nb3C9zRmo9iCqic66MNeJAPIDnu6wdDS59qPtq2iDd2Ml7vPnbmPB
+Pf8nVIndQdDxZRHIfV81I3kTjECPppydcW2AZHLPRODR+fdP7I3EewpVYnN9iILF
+3M6BmaE1EoL2eBRQR9NUvXK8XWwYpj5vUm3WF/PCjJ03lBmRgYMVS1q+vtUiCJvb
+rbo3lMrNq7AXuMVlw2orUQrv9t2pMMuojdJMRT2JfMeUn9F0cEUYUn55N0P1du68
+PQxzvJDYRKF6T/5RDefn
+=APdS
 -----END PGP SIGNATURE-----
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