diff options
| author |   Hanno Böck <hanno@gentoo.org> | 2010-11-30 23:41:38 +0000 |
|---|---|---|
| committer | Hanno Böck <hanno@gentoo.org> | 2010-11-30 23:41:38 +0000 |
| commit | 92174bbae3f8a80117b8a282bcf3bd60aae08918 (patch) | |
| tree | 83c7f3b8f7186e7db1d2c5579371043aadd41b6b /media-gfx | |
| parent | sparc stable (bug 258485) (diff) | |
| download | gentoo-2-92174bbae3f8a80117b8a282bcf3bd60aae08918.tar.gz gentoo-2-92174bbae3f8a80117b8a282bcf3bd60aae08918.tar.bz2 gentoo-2-92174bbae3f8a80117b8a282bcf3bd60aae08918.zip | |
fontforge python 2.7 fix
(Portage version: 2.1.9.25/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/fontforge/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/fontforge/files/fontforge-py27.diff | 11 | ||||
| -rw-r--r-- | media-gfx/fontforge/fontforge-20100501.ebuild | 3 |
3 files changed, 18 insertions, 2 deletions
diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog index 6cc9772b24d8..1b047a34139a 100644 --- a/media-gfx/fontforge/ChangeLog +++ b/media-gfx/fontforge/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/fontforge # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.133 2010/10/14 19:23:52 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.134 2010/11/30 23:41:38 hanno Exp $ + + 30 Nov 2010; Hanno Boeck <hanno@gentoo.org> +files/fontforge-py27.diff, + fontforge-20100501.ebuild: + Add upstream patch for python 2.7. 14 Oct 2010; Brent Baude <ranger@gentoo.org> fontforge-20100501.ebuild: stable ppc, bug 338340 diff --git a/media-gfx/fontforge/files/fontforge-py27.diff b/media-gfx/fontforge/files/fontforge-py27.diff new file mode 100644 index 000000000000..24f98e13cb30 --- /dev/null +++ b/media-gfx/fontforge/files/fontforge-py27.diff @@ -0,0 +1,11 @@ +--- fontforge/ffpython.h 2010/02/04 17:42:36 1.8 ++++ fontforge/ffpython.h 2010/09/12 08:30:00 1.9 +@@ -62,7 +62,7 @@ + #define PyMODINIT_FUNC void + #endif + +-#if PY_MAJOR_VERSION < 2 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 5) ++#if PY_MAJOR_VERSION < 2 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 7) + #define PyBytesObject PyStringObject + #define PyBytes_Type PyString_Type + diff --git a/media-gfx/fontforge/fontforge-20100501.ebuild b/media-gfx/fontforge/fontforge-20100501.ebuild index 00a6cebc64f7..059be8a65574 100644 --- a/media-gfx/fontforge/fontforge-20100501.ebuild +++ b/media-gfx/fontforge/fontforge-20100501.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20100501.ebuild,v 1.7 2010/10/14 19:23:52 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20100501.ebuild,v 1.8 2010/11/30 23:41:38 hanno Exp $ # Some notes for maintainers this package: # 1. README-unix: freetype headers are required to make use of truetype debugger @@ -59,6 +59,7 @@ src_unpack() { src_prepare() { epatch "${FILESDIR}"/fontforge-desktop.patch + epatch "${FILESDIR}"/fontforge-py27.diff if use doc; then cd "${WORKDIR}"/html/ |