diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2014-03-21 20:53:01 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2014-03-21 20:53:01 +0000 |
| commit | 746998167c701d5038571daf4864c4c51a21894c (patch) | |
| tree | 443899aef8e4b5f276afacc0ed70584447784e01 /media-libs | |
| parent | Bump to EAPI 5. (diff) | |
| download | gentoo-2-746998167c701d5038571daf4864c4c51a21894c.tar.gz gentoo-2-746998167c701d5038571daf4864c4c51a21894c.tar.bz2 gentoo-2-746998167c701d5038571daf4864c4c51a21894c.zip | |
Fixed compilation with >=freetype-2.5.1 (bug #504556)
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/coin/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/coin/coin-3.1.3-r2.ebuild | 5 | ||||
| -rw-r--r-- | media-libs/coin/files/coin-3.1.3-freetype251.patch | 28 |
3 files changed, 37 insertions, 4 deletions
diff --git a/media-libs/coin/ChangeLog b/media-libs/coin/ChangeLog index 0d13c9af6e88..52cf5c01859e 100644 --- a/media-libs/coin/ChangeLog +++ b/media-libs/coin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/coin -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/ChangeLog,v 1.48 2013/08/09 13:42:58 axs Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/ChangeLog,v 1.49 2014/03/21 20:53:01 polynomial-c Exp $ + + 21 Mar 2014; Lars Wendler <polynomial-c@gentoo.org> coin-3.1.3-r2.ebuild, + +files/coin-3.1.3-freetype251.patch: + Fixed compilation with >=freetype-2.5.1 (bug #504556). 09 Aug 2013; Ian Stakenvicius <axs@gentoo.org> coin-3.1.0.ebuild, coin-3.1.3-r1.ebuild, coin-3.1.3-r2.ebuild: diff --git a/media-libs/coin/coin-3.1.3-r2.ebuild b/media-libs/coin/coin-3.1.3-r2.ebuild index 2da506b768b6..95c3fd0de7c4 100644 --- a/media-libs/coin/coin-3.1.3-r2.ebuild +++ b/media-libs/coin/coin-3.1.3-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-3.1.3-r2.ebuild,v 1.6 2013/08/09 13:42:58 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-3.1.3-r2.ebuild,v 1.7 2014/03/21 20:53:01 polynomial-c Exp $ EAPI=5 @@ -45,6 +45,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.1.0-javascript.patch "${FILESDIR}"/${P}-pkgconfig-partial.patch "${FILESDIR}"/${P}-gcc-4.7.patch + "${FILESDIR}"/${P}-freetype251.patch ) DOCS=( diff --git a/media-libs/coin/files/coin-3.1.3-freetype251.patch b/media-libs/coin/files/coin-3.1.3-freetype251.patch new file mode 100644 index 000000000000..44e8eefb1f63 --- /dev/null +++ b/media-libs/coin/files/coin-3.1.3-freetype251.patch @@ -0,0 +1,28 @@ +--- Coin-3.1.3/src/glue/freetype.cpp ++++ Coin-3.1.3/src/glue/freetype.cpp +@@ -52,9 +52,9 @@ + #ifdef HAVE_FREETYPE /* In case we're _not_ doing runtime linking. */ + #define FREETYPEGLUE_ASSUME_FREETYPE 1 + #include <ft2build.h> +-#include <freetype/freetype.h> +-#include <freetype/ftglyph.h> +-#include <freetype/ftoutln.h> ++#include FT_FREETYPE_H ++#include FT_GLYPH_H ++#include FT_OUTLINE_H + #endif /* FREETYPEGLUE_ASSUME_FREETYPE */ + + #include <Inventor/C/basic.h> +--- Coin-3.1.3/src/glue/freetype.h ++++ Coin-3.1.3/src/glue/freetype.h +@@ -87,8 +87,8 @@ + + #ifdef HAVE_FREETYPE + #include <ft2build.h> +-#include <freetype/freetype.h> +-#include <freetype/ftglyph.h> ++#include FT_FREETYPE_H ++#include FT_GLYPH_H + #else /* HAVE_FREETYPE */ + + #include <Inventor/C/basic.h> |