rpms/xorg-x11-font-utils/devel mkfontscale-examine-all-encodings.patch, NONE, 1.1 xorg-x11-font-utils.spec, 1.35, 1.36

[Matej Cepl]

Author: mcepl

Update of /cvs/pkgs/rpms/xorg-x11-font-utils/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv732

Modified Files:
	xorg-x11-font-utils.spec 
Added Files:
	mkfontscale-examine-all-encodings.patch 
Log Message:
examine all platform=3 encodings (fixes #578460)

mkfontscale-examine-all-encodings.patch:
 mkfontscale.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mkfontscale-examine-all-encodings.patch ---
diff -up xorg-x11-font-utils-7.2/mkfontscale-1.0.7/mkfontscale.c.all-encodings xorg-x11-font-utils-7.2/mkfontscale-1.0.7/mkfontscale.c
--- xorg-x11-font-utils-7.2/mkfontscale-1.0.7/mkfontscale.c.all-encodings	2009-01-22 16:09:20.000000000 +0100
+++ xorg-x11-font-utils-7.2/mkfontscale-1.0.7/mkfontscale.c	2010-04-09 19:52:11.574373195 +0200
@@ -317,7 +317,7 @@ getName(FT_Face face, int nid)
     int i;
 
     if(getNameHelper(face, nid, 
-                     TT_PLATFORM_MICROSOFT, TT_MS_ID_UNICODE_CS, &name) ||
+                     TT_PLATFORM_MICROSOFT, -1, &name) ||
        getNameHelper(face, nid, 
                      TT_PLATFORM_APPLE_UNICODE, -1, &name)) {
         string = malloc(name.string_len / 2 + 1);


Index: xorg-x11-font-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-font-utils/devel/xorg-x11-font-utils.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- xorg-x11-font-utils.spec	10 Nov 2009 19:08:06 -0000	1.35
+++ xorg-x11-font-utils.spec	9 Apr 2010 17:54:53 -0000	1.36
@@ -19,6 +19,7 @@ Source4: ftp://ftp.x.org/pub/individual/
 
 Patch0: font-util-1.0.1-mapdir-use-datadir-fix.patch
 Patch1: font-util-1.0.1-autoconf-add-with-fontdir-option.patch
+Patch2: mkfontscale-examine-all-encodings.patch
 
 BuildRequires: pkgconfig(xfont) pkgconfig(x11)
 BuildRequires: libfontenc-devel >= 0.99.2-2
@@ -49,6 +50,7 @@ populated fonts.
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
 #patch0 -p0 -b .font-util-mapdir-use-datadir-fix
 #patch1 -p0 -b .autoconf-add-with-fontdir-option
+%patch2 -p1 -b .all-encodings
 
 %build
 # Build all apps