summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2013-12-16 13:40:00 +0000
committerLars Wendler <polynomial-c@gentoo.org>2013-12-16 13:40:00 +0000
commit0fff014cb56de11e6702c172bea3ac7795d3448e (patch)
tree5a9b4bc73bd67f98d9bc88aeb8fa8645daf289e4 /dev-dotnet/libgdiplus
parentVersion bump. (diff)
downloadgentoo-2-0fff014cb56de11e6702c172bea3ac7795d3448e.tar.gz
gentoo-2-0fff014cb56de11e6702c172bea3ac7795d3448e.tar.bz2
gentoo-2-0fff014cb56de11e6702c172bea3ac7795d3448e.zip
Fixed compilation with >=media-libs/freetype-2.5.1 (bug #493660)
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'dev-dotnet/libgdiplus')
-rw-r--r--dev-dotnet/libgdiplus/ChangeLog6
-rw-r--r--dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-freetype251.patch12
-rw-r--r--dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild5
3 files changed, 20 insertions, 3 deletions
diff --git a/dev-dotnet/libgdiplus/ChangeLog b/dev-dotnet/libgdiplus/ChangeLog
index 4be5062183e9..83a4c39843d6 100644
--- a/dev-dotnet/libgdiplus/ChangeLog
+++ b/dev-dotnet/libgdiplus/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-dotnet/libgdiplus
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.146 2013/11/14 16:29:52 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.147 2013/12/16 13:40:00 polynomial-c Exp $
+
+ 16 Dec 2013; Lars Wendler <polynomial-c@gentoo.org>
+ libgdiplus-2.10.9-r1.ebuild, +files/libgdiplus-2.10.9-freetype251.patch:
+ Fixed compilation with >=media-libs/freetype-2.5.1 (bug #493660).
14 Nov 2013; Michael Palimaka <kensington@gentoo.org>
libgdiplus-2.10.9-r1.ebuild:
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-freetype251.patch b/dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-freetype251.patch
new file mode 100644
index 000000000000..b4faa06d6415
--- /dev/null
+++ b/dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-freetype251.patch
@@ -0,0 +1,12 @@
+--- libgdiplus-2.10.9/src/gdiplus-private.h
++++ libgdiplus-2.10.9/src/gdiplus-private.h
+@@ -30,7 +30,8 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <glib.h>
+-#include <freetype/tttables.h>
++#include <ft2build.h>
++#include FT_TRUETYPE_TABLES_H
+ #include <pthread.h>
+ #include <unistd.h>
+
diff --git a/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild
index 35912e6907da..415d09773349 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild,v 1.3 2013/11/14 16:29:52 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild,v 1.4 2013/12/16 13:40:00 polynomial-c Exp $
EAPI="5"
@@ -35,7 +35,8 @@ RESTRICT="test"
PATCHES=("${FILESDIR}/${P}-gold.patch"
"${FILESDIR}/${PN}-2.10.1-libpng15.patch"
- "${FILESDIR}/${PN}-2.10.9-giflib-quantizebuffer.patch")
+ "${FILESDIR}/${PN}-2.10.9-giflib-quantizebuffer.patch"
+ "${FILESDIR}/${PN}-2.10.9-freetype251.patch")
src_prepare() {
base_src_prepare