diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-07-30 01:21:22 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-07-30 01:21:22 +0000 |
| commit | 8c4d78c74739c3d6638634c4938da9f76f8f43e3 (patch) | |
| tree | aebfcbc6e80e13626082fe57f3b6e314eef1c185 /dev-python/imaging | |
| parent | Non-maintainer commit. Update to use virtual/mysql wrt bug 508802 (diff) | |
| download | gentoo-2-8c4d78c74739c3d6638634c4938da9f76f8f43e3.tar.gz gentoo-2-8c4d78c74739c3d6638634c4938da9f76f8f43e3.tar.bz2 gentoo-2-8c4d78c74739c3d6638634c4938da9f76f8f43e3.zip | |
Fix from Chromium OS for building w/freetype-2.5.3 #508748 by Stefan Kalis.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'dev-python/imaging')
| -rw-r--r-- | dev-python/imaging/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-python/imaging/files/imaging-1.1.7-ft-header-include.patch | 20 | ||||
| -rw-r--r-- | dev-python/imaging/imaging-1.1.7-r4.ebuild | 5 |
3 files changed, 29 insertions, 4 deletions
diff --git a/dev-python/imaging/ChangeLog b/dev-python/imaging/ChangeLog index 893ad8460165..ab5651a63936 100644 --- a/dev-python/imaging/ChangeLog +++ b/dev-python/imaging/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/imaging -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.91 2013/09/05 18:46:38 mgorny Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.92 2014/07/30 01:21:21 vapier Exp $ + + 30 Jul 2014; Mike Frysinger <vapier@gentoo.org> + +files/imaging-1.1.7-ft-header-include.patch, imaging-1.1.7-r4.ebuild: + Fix from Chromium OS for building w/freetype-2.5.3 #508748 by Stefan Kalis. 05 Sep 2013; Michał Górny <mgorny@gentoo.org> imaging-1.1.7-r2.ebuild, imaging-1.1.7-r4.ebuild: diff --git a/dev-python/imaging/files/imaging-1.1.7-ft-header-include.patch b/dev-python/imaging/files/imaging-1.1.7-ft-header-include.patch new file mode 100644 index 000000000000..cdc068390387 --- /dev/null +++ b/dev-python/imaging/files/imaging-1.1.7-ft-header-include.patch @@ -0,0 +1,20 @@ +https://bugs.gentoo.org/508748 + +fix building w/freetype-2.5.3 + +patch by Jungshik Shin <jshin@chromium.org> + +--- Imaging-1.1.7/_imagingft.c ++++ Imaging-1.1.7/_imagingft.c +@@ -70,7 +70,11 @@ + const char* message; + } ft_errors[] = + ++#if defined(USE_FREETYPE_2_1) ++#include FT_ERRORS_H ++#else + #include <freetype/fterrors.h> ++#endif + + /* -------------------------------------------------------------------- */ + /* font objects */ diff --git a/dev-python/imaging/imaging-1.1.7-r4.ebuild b/dev-python/imaging/imaging-1.1.7-r4.ebuild index 59c6bbcd40e7..b3e8d5b517be 100644 --- a/dev-python/imaging/imaging-1.1.7-r4.ebuild +++ b/dev-python/imaging/imaging-1.1.7-r4.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/dev-python/imaging/imaging-1.1.7-r4.ebuild,v 1.3 2013/09/05 18:46:38 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r4.ebuild,v 1.4 2014/07/30 01:21:21 vapier Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) @@ -41,6 +41,7 @@ python_prepare_all() { "${FILESDIR}/${P}-sane.patch" "${FILESDIR}/${P}-giftrans.patch" "${FILESDIR}/${P}-missing-math.patch" + "${FILESDIR}/${P}-ft-header-include.patch" ) # Add shebangs. |