From: | "Julian Ospald (hasufell)" <hasufell@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in games-engines/scummvm/files: scummvm-1.5.0-EE.patch |
Date: | Thu, 31 Jan 2013 15:25:29 |
Message-Id: | 20130131152521.673732171E@flycatcher.gentoo.org |
1 | hasufell 13/01/31 15:25:21 |
2 | |
3 | Modified: scummvm-1.5.0-EE.patch |
4 | Log: |
5 | finally fix EE locale issue wrt #437488 |
6 | |
7 | (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
8 | |
9 | Revision Changes Path |
10 | 1.2 games-engines/scummvm/files/scummvm-1.5.0-EE.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/scummvm/files/scummvm-1.5.0-EE.patch?rev=1.2&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/scummvm/files/scummvm-1.5.0-EE.patch?rev=1.2&content-type=text/plain |
14 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/scummvm/files/scummvm-1.5.0-EE.patch?r1=1.1&r2=1.2 |
15 | |
16 | Index: scummvm-1.5.0-EE.patch |
17 | =================================================================== |
18 | RCS file: /var/cvsroot/gentoo-x86/games-engines/scummvm/files/scummvm-1.5.0-EE.patch,v |
19 | retrieving revision 1.1 |
20 | retrieving revision 1.2 |
21 | diff -u -r1.1 -r1.2 |
22 | --- scummvm-1.5.0-EE.patch 9 Oct 2012 23:55:28 -0000 1.1 |
23 | +++ scummvm-1.5.0-EE.patch 31 Jan 2013 15:25:21 -0000 1.2 |
24 | @@ -22,6 +22,17 @@ |
25 | diff -ru scummvm-1.5.0.orig/configure scummvm-1.5.0/configure |
26 | --- scummvm-1.5.0.orig/configure 2012-10-07 21:21:27.856337073 -0400 |
27 | +++ scummvm-1.5.0/configure 2012-10-07 21:26:08.689750153 -0400 |
28 | +@@ -3464,8 +3464,8 @@ |
29 | + if test -z "$_freetypeconfig"; then |
30 | + _freetype2=no |
31 | + else |
32 | +- FREETYPE2_LIBS=`$_freetypeconfig --prefix="$_freetypepath" --libs` |
33 | +- FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$_freetypepath" --cflags` |
34 | ++ FREETYPE2_LIBS=`pkg-config --libs freetype2 2>/dev/null || $_freetypeconfig --prefix="$_freetypepath" --libs` |
35 | ++ FREETYPE2_CFLAGS=`pkg-config --cflags freetype2 2>/dev/null || $_freetypeconfig --prefix="$_freetypepath" --cflags` |
36 | + |
37 | + if test "$_freetype2" = "auto"; then |
38 | + _freetype2=no |
39 | @@ -3897,7 +3897,7 @@ |
40 | fi |