[gentoo-commits] gentoo-x86 commit in games-engines/scummvm/files: scummvm-1.5.0-EE.patch

[Julian Ospald (hasufell)]

hasufell    13/01/31 15:25:21

  Modified:             scummvm-1.5.0-EE.patch
  Log:
  finally fix EE locale issue wrt #437488
  
  (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

Revision  Changes    Path
1.2                  games-engines/scummvm/files/scummvm-1.5.0-EE.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/scummvm/files/scummvm-1.5.0-EE.patch?rev=1.2&view=markup
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
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

Index: scummvm-1.5.0-EE.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-engines/scummvm/files/scummvm-1.5.0-EE.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scummvm-1.5.0-EE.patch	9 Oct 2012 23:55:28 -0000	1.1
+++ scummvm-1.5.0-EE.patch	31 Jan 2013 15:25:21 -0000	1.2
@@ -22,6 +22,17 @@
 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