diff options
author | Julian Ospald <hasufell@gentoo.org> | 2014-04-28 23:09:15 +0000 |
---|---|---|
committer | Julian Ospald <hasufell@gentoo.org> | 2014-04-28 23:09:15 +0000 |
commit | d434c16527e788343b97b7fd8fc066ca1f7bf25d (patch) | |
tree | 220dfb73e9f97ce5910edef5610c07ebbf385269 /games-engines | |
parent | Version bump (diff) | |
download | gentoo-2-d434c16527e788343b97b7fd8fc066ca1f7bf25d.tar.gz gentoo-2-d434c16527e788343b97b7fd8fc066ca1f7bf25d.tar.bz2 gentoo-2-d434c16527e788343b97b7fd8fc066ca1f7bf25d.zip |
fix more freetype related breakage
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
Diffstat (limited to 'games-engines')
-rw-r--r-- | games-engines/renpy/ChangeLog | 6 | ||||
-rw-r--r-- | games-engines/renpy/files/renpy-6.15.7-freetype.patch | 29 | ||||
-rw-r--r-- | games-engines/renpy/renpy-6.15.7.ebuild | 7 |
3 files changed, 38 insertions, 4 deletions
diff --git a/games-engines/renpy/ChangeLog b/games-engines/renpy/ChangeLog index 141dc1367657..d8a1c8b43d8e 100644 --- a/games-engines/renpy/ChangeLog +++ b/games-engines/renpy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-engines/renpy # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/ChangeLog,v 1.37 2014/04/28 22:44:50 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/ChangeLog,v 1.38 2014/04/28 23:09:15 hasufell Exp $ + + 28 Apr 2014; Julian Ospald <hasufell@gentoo.org> renpy-6.15.7.ebuild, + +files/renpy-6.15.7-freetype.patch: + fix more freetype related breakage 28 Apr 2014; Julian Ospald <hasufell@gentoo.org> files/renpy-6.14.1-freetype.patch: diff --git a/games-engines/renpy/files/renpy-6.15.7-freetype.patch b/games-engines/renpy/files/renpy-6.15.7-freetype.patch new file mode 100644 index 000000000000..7865f0c11a45 --- /dev/null +++ b/games-engines/renpy/files/renpy-6.15.7-freetype.patch @@ -0,0 +1,29 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Mon Apr 28 22:31:52 UTC 2014 +Subject: fix build + +--- renpy-6.14.1-source/module/setup.py ++++ renpy-6.14.1-source/module/setup.py +@@ -24,8 +24,9 @@ + include("zlib.h") + include("png.h") + include("SDL.h", directory="SDL") +-include("ft2build.h") +-include("freetype/freetype.h", directory="freetype2") ++include("ft2build.h") or include("ft2build.h", directory="freetype2") ++include("freetype/freetype.h", directory="freetype2") or include("freetype.h", directory="freetype2") ++include("freetype/ftotval.h", directory="freetype2") or include("ftotval.h", directory="freetype2") + include("libavutil/avstring.h") + include("libavformat/avformat.h") + include("libavcodec/avcodec.h") +--- renpy-6.15.7-source/module/ttgsubtable.h ++++ renpy-6.15.7-source/module/ttgsubtable.h +@@ -3,7 +3,7 @@ + + #include <stdint.h> + #include <ft2build.h> +-#include <freetype/ftotval.h> ++#include FT_OPENTYPE_VALIDATE_H + + typedef struct + { diff --git a/games-engines/renpy/renpy-6.15.7.ebuild b/games-engines/renpy/renpy-6.15.7.ebuild index 86d396970306..39415a009b42 100644 --- a/games-engines/renpy/renpy-6.15.7.ebuild +++ b/games-engines/renpy/renpy-6.15.7.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/games-engines/renpy/renpy-6.15.7.ebuild,v 1.4 2013/10/30 19:23:30 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/renpy-6.15.7.ebuild,v 1.5 2014/04/28 23:09:15 hasufell Exp $ EAPI=5 PYTHON_COMPAT=( python2_6 python2_7 ) @@ -42,7 +42,8 @@ pkg_setup() { python_prepare_all() { # wooosh! this should fix multiple abi - epatch "${FILESDIR}"/${P}-multiple-abi.patch + epatch "${FILESDIR}"/${P}-multiple-abi.patch \ + "${FILESDIR}"/${P}-freetype.patch einfo "Deleting precompiled python files" find . -name '*.py[co]' -print -delete || die |