diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2014-03-17 13:06:21 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2014-03-17 13:06:21 +0000 |
| commit | 51a2c67898cd39c0a89c7a0c47d8db8842da64a6 (patch) | |
| tree | 64327f1cd665e1c9488086730c6e2636db53891a | |
| parent | Version bump (diff) | |
| download | gentoo-2-51a2c67898cd39c0a89c7a0c47d8db8842da64a6.tar.gz gentoo-2-51a2c67898cd39c0a89c7a0c47d8db8842da64a6.tar.bz2 gentoo-2-51a2c67898cd39c0a89c7a0c47d8db8842da64a6.zip | |
Added compatibility fix for >=media-libs/freetype-2.5.1 (bug #504888)
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
| -rw-r--r-- | media-libs/lasi/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/lasi/files/lasi-1.1.1-freetype251.patch | 63 | ||||
| -rw-r--r-- | media-libs/lasi/lasi-1.1.1.ebuild | 3 |
3 files changed, 70 insertions, 2 deletions
diff --git a/media-libs/lasi/ChangeLog b/media-libs/lasi/ChangeLog index b72ee6657e2a..5b5e8f2e6813 100644 --- a/media-libs/lasi/ChangeLog +++ b/media-libs/lasi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/lasi # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/lasi/ChangeLog,v 1.35 2014/02/02 16:51:44 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/lasi/ChangeLog,v 1.36 2014/03/17 13:06:21 polynomial-c Exp $ + + 17 Mar 2014; Lars Wendler <polynomial-c@gentoo.org> lasi-1.1.1.ebuild, + +files/lasi-1.1.1-freetype251.patch: + Added compatibility fix for >=media-libs/freetype-2.5.1 (bug #504888). 02 Feb 2014; Sergey Popov <pinkbyte@gentoo.org> lasi-1.1.1.ebuild: Add ~mips, wrt bug #499866 diff --git a/media-libs/lasi/files/lasi-1.1.1-freetype251.patch b/media-libs/lasi/files/lasi-1.1.1-freetype251.patch new file mode 100644 index 000000000000..515b159208ff --- /dev/null +++ b/media-libs/lasi/files/lasi-1.1.1-freetype251.patch @@ -0,0 +1,63 @@ +Add compatibility for >=freetype-2.5.1 + +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> + +--- libLASi-1.1.1/include/LASi.h ++++ libLASi-1.1.1/include/LASi.h +@@ -11,7 +11,8 @@ + #include <sstream> + #include <map> + #include <pango/pango.h> +-#include <freetype/ftglyph.h> ++#include <ft2build.h> ++#include FT_GLYPH_H + + class FreetypeGlyphMgr; + class ContextMgr; +--- libLASi-1.1.1/src/drawGlyph.cpp ++++ libLASi-1.1.1/src/drawGlyph.cpp +@@ -6,7 +6,8 @@ + */ + + #include <ostream> +-#include <freetype/ftoutln.h> ++#include <ft2build.h> ++#include FT_OUTLINE_H + #include <algorithm> + #include <LASi.h> + #include <config.h> +--- libLASi-1.1.1/src/glyphMgr.cpp ++++ libLASi-1.1.1/src/glyphMgr.cpp +@@ -10,8 +10,7 @@ + + #include <ft2build.h> + #include FT_FREETYPE_H +- +-#include <freetype/ftglyph.h> ++#include FT_GLYPH_H + + #include <cassert> + #include "util.h" +--- libLASi-1.1.1/src/glyphMgr.h ++++ libLASi-1.1.1/src/glyphMgr.h +@@ -15,8 +15,8 @@ + + #include <ft2build.h> + #include FT_FREETYPE_H ++#include FT_GLYPH_H + +-#include <freetype/ftglyph.h> + + /** Manage FT_Glyph by insuring that FT_Glyph is handled correctly. + */ +--- libLASi-1.1.1/src/util.h ++++ libLASi-1.1.1/src/util.h +@@ -18,7 +18,7 @@ + + #include <ft2build.h> + #include FT_FREETYPE_H +-#include <freetype/ftglyph.h> ++#include FT_GLYPH_H + + std::ostream& operator<<(std::ostream&, const FT_Library); + std::ostream& operator<<(std::ostream&, const FT_Face); diff --git a/media-libs/lasi/lasi-1.1.1.ebuild b/media-libs/lasi/lasi-1.1.1.ebuild index 53c0c61fccb2..fcc0d94e31d0 100644 --- a/media-libs/lasi/lasi-1.1.1.ebuild +++ b/media-libs/lasi/lasi-1.1.1.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/media-libs/lasi/lasi-1.1.1.ebuild,v 1.13 2014/02/02 16:51:44 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/lasi/lasi-1.1.1.ebuild,v 1.14 2014/03/17 13:06:21 polynomial-c Exp $ EAPI=4 @@ -30,6 +30,7 @@ S=${WORKDIR}/${MY_P} PATCHES=( "${FILESDIR}"/${PN}-1.1.0-cmake.patch "${FILESDIR}"/${PN}-1.1.0-pkgconfig.patch + "${FILESDIR}"/${PN}-1.1.1-freetype251.patch ) src_prepare() { |