diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2013-01-31 15:25:21 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2013-01-31 15:25:21 +0000 |
| commit | 0382786c87949e1bf76f69538ae38674c5cca72d (patch) | |
| tree | 19db64e77112bafd4afb7f7224eaff8f22238375 /games-engines | |
| parent | Version bump to 0.70.3 to support mirall-1.2.0. Punt older. (diff) | |
| download | gentoo-2-0382786c87949e1bf76f69538ae38674c5cca72d.tar.gz gentoo-2-0382786c87949e1bf76f69538ae38674c5cca72d.tar.bz2 gentoo-2-0382786c87949e1bf76f69538ae38674c5cca72d.zip | |
finally fix EE locale issue wrt #437488
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'games-engines')
| -rw-r--r-- | games-engines/scummvm/ChangeLog | 6 | ||||
| -rw-r--r-- | games-engines/scummvm/files/scummvm-1.5.0-EE.patch | 11 |
2 files changed, 16 insertions, 1 deletions
diff --git a/games-engines/scummvm/ChangeLog b/games-engines/scummvm/ChangeLog index 90af65b525b2..032fb7c04374 100644 --- a/games-engines/scummvm/ChangeLog +++ b/games-engines/scummvm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-engines/scummvm # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.125 2013/01/28 01:48:14 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.126 2013/01/31 15:25:21 hasufell Exp $ + + 31 Jan 2013; Julian Ospald <hasufell@gentoo.org> + files/scummvm-1.5.0-EE.patch: + finally fix EE locale issue wrt #437488 28 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org> scummvm-1.5.0.ebuild: EAPI=5 diff --git a/games-engines/scummvm/files/scummvm-1.5.0-EE.patch b/games-engines/scummvm/files/scummvm-1.5.0-EE.patch index 47332df16dee..7c4605196ca4 100644 --- a/games-engines/scummvm/files/scummvm-1.5.0-EE.patch +++ b/games-engines/scummvm/files/scummvm-1.5.0-EE.patch @@ -22,6 +22,17 @@ diff -ru scummvm-1.5.0.orig/config.guess scummvm-1.5.0/config.guess diff -ru scummvm-1.5.0.orig/configure scummvm-1.5.0/configure --- scummvm-1.5.0.orig/configure 2012-10-07 21:21:27.856337073 -0400 +++ scummvm-1.5.0/configure 2012-10-07 21:26:08.689750153 -0400 +@@ -3464,8 +3464,8 @@ + if test -z "$_freetypeconfig"; then + _freetype2=no + else +- FREETYPE2_LIBS=`$_freetypeconfig --prefix="$_freetypepath" --libs` +- FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$_freetypepath" --cflags` ++ FREETYPE2_LIBS=`pkg-config --libs freetype2 2>/dev/null || $_freetypeconfig --prefix="$_freetypepath" --libs` ++ FREETYPE2_CFLAGS=`pkg-config --cflags freetype2 2>/dev/null || $_freetypeconfig --prefix="$_freetypepath" --cflags` + + if test "$_freetype2" = "auto"; then + _freetype2=no @@ -3897,7 +3897,7 @@ fi |