diff options
| author |   Ben de Groot <yngwin@gentoo.org> | 2013-04-05 15:22:16 +0000 |
|---|---|---|
| committer | Ben de Groot <yngwin@gentoo.org> | 2013-04-05 15:22:16 +0000 |
| commit | 2bc58f4a65ac87433ab305af2fd206d2b8bf3fc3 (patch) | |
| tree | ff10199668fd6aec5857a628fb2ee8687866a18a /media-libs/freetype | |
| parent | Stable for amd64 wrt bug #464414 (diff) | |
| download | gentoo-2-2bc58f4a65ac87433ab305af2fd206d2b8bf3fc3.tar.gz gentoo-2-2bc58f4a65ac87433ab305af2fd206d2b8bf3fc3.tar.bz2 gentoo-2-2bc58f4a65ac87433ab305af2fd206d2b8bf3fc3.zip | |
Add upstream patch to fix locale breakage (bug #454804). Punt unnecessary epunt_cxx.
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 0x2B2474AD43CE296E!)
Diffstat (limited to 'media-libs/freetype')
| -rw-r--r-- | media-libs/freetype/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/freetype/files/freetype-2.4.11-locale.patch | 34 | ||||
| -rw-r--r-- | media-libs/freetype/freetype-2.4.11.ebuild | 5 |
3 files changed, 42 insertions, 4 deletions
diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog index 5a1f7fdb6e48..73809797884f 100644 --- a/media-libs/freetype/ChangeLog +++ b/media-libs/freetype/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/freetype # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.366 2013/03/18 19:52:14 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.367 2013/04/05 15:22:16 yngwin Exp $ + + 05 Apr 2013; Ben de Groot <yngwin@gentoo.org> + +files/freetype-2.4.11-locale.patch, freetype-2.4.11.ebuild: + Add upstream patch to fix locale breakage (bug #454804). Punt unnecessary + epunt_cxx. 18 Mar 2013; Michał Górny <mgorny@gentoo.org> freetype-2.4.11-r2.ebuild: Replace hacks with proper calls to multilib_for_best_abi. diff --git a/media-libs/freetype/files/freetype-2.4.11-locale.patch b/media-libs/freetype/files/freetype-2.4.11-locale.patch new file mode 100644 index 000000000000..74aac2e2a591 --- /dev/null +++ b/media-libs/freetype/files/freetype-2.4.11-locale.patch @@ -0,0 +1,34 @@ +diff -burN freetype-2.4.11.orig/ChangeLog freetype-2.4.11/ChangeLog +--- freetype-2.4.11.orig/ChangeLog 2012-12-20 14:55:55.000000000 +0800 ++++ freetype-2.4.11/ChangeLog 2013-04-05 23:06:35.637842972 +0800 +@@ -1,3 +1,9 @@ ++2013-02-01 Werner Lemberg <wl@gnu.org> ++ ++ Fix Savannah bug #38227. ++ ++ * builds/unix/freetype-config.in: Set LC_ALL. ++ + 2012-12-20 Werner Lemberg <wl@gnu.org> + + * Version 2.4.11 released. +diff -burN freetype-2.4.11.orig/builds/unix/freetype-config.in freetype-2.4.11/builds/unix/freetype-config.in +--- freetype-2.4.11.orig/builds/unix/freetype-config.in 2011-01-06 02:25:28.000000000 +0800 ++++ freetype-2.4.11/builds/unix/freetype-config.in 2013-04-05 23:08:15.701816900 +0800 +@@ -1,6 +1,6 @@ + #! /bin/sh + # +-# Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 by ++# Copyright 2000-2005, 2008, 2009, 2013 by + # David Turner, Robert Wilhelm, and Werner Lemberg. + # + # This file is part of the FreeType project, and may only be used, modified, +@@ -9,6 +9,9 @@ + # indicate that you have read the license and understand and accept it + # fully. + ++LC_ALL=C ++export LC_ALL ++ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + exec_prefix_set=no diff --git a/media-libs/freetype/freetype-2.4.11.ebuild b/media-libs/freetype/freetype-2.4.11.ebuild index 56b3bb051399..d527a357cd7d 100644 --- a/media-libs/freetype/freetype-2.4.11.ebuild +++ b/media-libs/freetype/freetype-2.4.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.11.ebuild,v 1.15 2013/02/18 01:04:52 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.11.ebuild,v 1.16 2013/04/05 15:22:16 yngwin Exp $ EAPI="4" @@ -67,8 +67,8 @@ src_prepare() { fi epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch - epatch "${FILESDIR}"/${P}-auto-hinter_compile_fix.patch # 453956 + epatch "${FILESDIR}"/${P}-locale.patch # 454804 if use utils; then cd "${WORKDIR}/ft2demos-${PV}" @@ -80,7 +80,6 @@ src_prepare() { fi elibtoolize - epunt_cxx } src_configure() { |