examine all platform=3 encodings (fixes #578460)

This commit is contained in:
Matej Cepl 2010-04-09 17:54:53 +00:00
parent 89871be61b
commit 323fc4931b
2 changed files with 14 additions and 0 deletions

View File

@ -0,0 +1,12 @@
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);

View File

@ -19,6 +19,7 @@ Source4: ftp://ftp.x.org/pub/individual/font/font-util-1.1.0.tar.bz2
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