diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2015-05-15 10:31:31 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2015-05-15 10:31:31 +0000 |
| commit | 4af724ed5e9d257ec3a456060202b479ecf18a07 (patch) | |
| tree | b1ae42e1438c512e8a3c5c8ba54a80c8fab7876d /dev-python/soya | |
| parent | Add REQUIERED_USE for tools -> tcl, bug #549308 (diff) | |
| download | gentoo-2-4af724ed5e9d257ec3a456060202b479ecf18a07.tar.gz gentoo-2-4af724ed5e9d257ec3a456060202b479ecf18a07.tar.bz2 gentoo-2-4af724ed5e9d257ec3a456060202b479ecf18a07.zip | |
Fix build with freetype-2.5 (#533516)
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'dev-python/soya')
| -rw-r--r-- | dev-python/soya/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/soya/files/soya-0.14-freetype-2.5.patch | 16 | ||||
| -rw-r--r-- | dev-python/soya/soya-0.14-r1.ebuild | 5 |
3 files changed, 24 insertions, 3 deletions
diff --git a/dev-python/soya/ChangeLog b/dev-python/soya/ChangeLog index 6a4fe4c9f866..10af8efeea9e 100644 --- a/dev-python/soya/ChangeLog +++ b/dev-python/soya/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/soya # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/ChangeLog,v 1.37 2015/04/08 08:05:20 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/ChangeLog,v 1.38 2015/05/15 10:31:31 pacho Exp $ + + 15 May 2015; Pacho Ramos <pacho@gentoo.org> + +files/soya-0.14-freetype-2.5.patch, soya-0.14-r1.ebuild: + Fix build with freetype-2.5 (#533516) 08 Apr 2015; Michał Górny <mgorny@gentoo.org> soya-0.14-r1.ebuild: Drop old Python implementations diff --git a/dev-python/soya/files/soya-0.14-freetype-2.5.patch b/dev-python/soya/files/soya-0.14-freetype-2.5.patch new file mode 100644 index 000000000000..a4d568033109 --- /dev/null +++ b/dev-python/soya/files/soya-0.14-freetype-2.5.patch @@ -0,0 +1,16 @@ +diff -ru soya.old/include_freetype.h soya/include_freetype.h +--- soya.old/include_freetype.h 2014-06-01 23:27:17.970830047 +0900 ++++ soya/include_freetype.h 2014-06-01 23:27:35.320864678 +0900 +@@ -21,8 +21,8 @@ + + #include <ft2build.h> + #include FT_FREETYPE_H // this is not do-able in Pyrex +-#include <freetype/freetype.h> +-#include <freetype/ftoutln.h> +-#include <freetype/ftimage.h> +-#include <freetype/ftglyph.h> ++#include <freetype.h> ++#include <ftoutln.h> ++#include <ftimage.h> ++#include <ftglyph.h> + diff --git a/dev-python/soya/soya-0.14-r1.ebuild b/dev-python/soya/soya-0.14-r1.ebuild index cf7374eaba39..f41923999906 100644 --- a/dev-python/soya/soya-0.14-r1.ebuild +++ b/dev-python/soya/soya-0.14-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/soya-0.14-r1.ebuild,v 1.4 2015/04/08 08:05:20 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/soya-0.14-r1.ebuild,v 1.5 2015/05/15 10:31:31 pacho Exp $ EAPI="5" PYTHON_COMPAT=( python2_7 ) @@ -29,7 +29,7 @@ DEPEND="=dev-games/ode-0.11.1 media-fonts/freefonts >=media-libs/cal3d-0.10 media-libs/freeglut - >=media-libs/freetype-2.1.5 + >=media-libs/freetype-2.5 >=media-libs/glew-1.3.3 >=media-libs/libsdl-1.2.8[opengl] media-libs/openal @@ -41,6 +41,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}/${P}-glu.patch" "${FILESDIR}/${PN}-pillow.patch" + "${FILESDIR}/${P}-freetype-2.5.patch" ) python_compile() { |