diff --git a/.gitignore b/.gitignore index 41496f1..10ab0df 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ mkfontscale-1.0.8.tar.bz2 mkfontdir-1.0.6.tar.bz2 font-util-1.2.0.tar.bz2 /font-util-1.3.0.tar.bz2 +/mkfontscale-1.1.0.tar.bz2 +/mkfontdir-1.0.7.tar.bz2 +/bdftopcf-1.0.4.tar.bz2 diff --git a/mkfontscale-examine-all-encodings.patch b/mkfontscale-examine-all-encodings.patch index 2004746..1913915 100644 --- a/mkfontscale-examine-all-encodings.patch +++ b/mkfontscale-examine-all-encodings.patch @@ -1,12 +1,13 @@ -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 ---- mkfontscale-1.0.7/mkfontscale.c.all-encodings 2009-01-22 16:09:20.000000000 +0100 -+++ mkfontscale-1.0.7/mkfontscale.c 2010-04-09 19:52:11.574373195 +0200 +diff --git a/mkfontscale.c b/mkfontscale.c +index a67f283..96e19a3 100644 +--- a/mkfontscale.c ++++ b/mkfontscale.c @@ -317,7 +317,7 @@ getName(FT_Face face, int nid) int i; - if(getNameHelper(face, nid, + if(getNameHelper(face, nid, - TT_PLATFORM_MICROSOFT, TT_MS_ID_UNICODE_CS, &name) || + TT_PLATFORM_MICROSOFT, -1, &name) || - getNameHelper(face, nid, + getNameHelper(face, nid, TT_PLATFORM_APPLE_UNICODE, -1, &name)) { string = malloc(name.string_len / 2 + 1); diff --git a/mkfontscale-man-page-additions.patch b/mkfontscale-man-page-additions.patch new file mode 100644 index 0000000..295f43c --- /dev/null +++ b/mkfontscale-man-page-additions.patch @@ -0,0 +1,38 @@ +From 19e2cb7c6a3ec2c5b1bc0d24866fa685eef0ee13 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Tue, 21 May 2013 15:50:19 +1000 +Subject: [PATCH mkfontscale] Document -u/-U options in man page + +Signed-off-by: Peter Hutterer +Reviewed-by: Alan Coopersmith +--- + man/mkfontscale.man | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/man/mkfontscale.man b/man/mkfontscale.man +index 4ed3d7d..4aa88ab 100644 +--- a/man/mkfontscale.man ++++ b/man/mkfontscale.man +@@ -36,6 +36,8 @@ mkfontscale \- create an index of scalable font files for X + .B \-n + .I prefix + ] [ ++.B \-u | \-U ++] [ + .B \-\- + ] [ + .I directory +@@ -126,6 +128,10 @@ options. + do not scan for fonts, do not write font directory files. This option + is useful when generating encoding directories only. + .TP ++.B \-u, \-U ++disable (\fI-u\fP) or enable (\fI-U\fP) indexing of ISO 10646:1 font ++encodings (default: enabled). ++.TP + .B \-\- + end of options. + .SH SEE ALSO +-- +1.8.1.4 + diff --git a/sources b/sources index 1697411..fc0bb69 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ b0ebd86029571239b9d7b0c61191b591 fonttosfnt-1.0.3.tar.bz2 -dc342dd8858416254bb5f71a9ddce589 mkfontdir-1.0.6.tar.bz2 -4a7a4a848c43c42f7d499b60666434a4 bdftopcf-1.0.3.tar.bz2 -5210c9385c6cc4a00ce829d8dc9c819b mkfontscale-1.0.8.tar.bz2 +18c429148c96c2079edda922a2b67632 mkfontdir-1.0.7.tar.bz2 +96a648a332160a7482885800f7a506fa bdftopcf-1.0.4.tar.bz2 +414fcb053418fb1418e3a39f4a37e0f7 mkfontscale-1.1.0.tar.bz2 ddfc8a89d597651408369d940d03d06b font-util-1.3.0.tar.bz2 diff --git a/xorg-x11-font-utils.spec b/xorg-x11-font-utils.spec index 0956825..b7f1c3d 100644 --- a/xorg-x11-font-utils.spec +++ b/xorg-x11-font-utils.spec @@ -1,25 +1,26 @@ %define pkgname font-utils -%define mkfontscale 1.0.8 +%define mkfontscale 1.1.0 Summary: X.Org X11 font utilities Name: xorg-x11-%{pkgname} # IMPORTANT: If package ever gets renamed to something else, remove the Epoch line! Epoch: 1 Version: 7.5 -Release: 13%{?dist} +Release: 14%{?dist} License: MIT Group: User Interface/X URL: http://www.x.org -Source0: ftp://ftp.x.org/pub/individual/app/bdftopcf-1.0.3.tar.bz2 +Source0: ftp://ftp.x.org/pub/individual/app/bdftopcf-1.0.4.tar.bz2 Source1: ftp://ftp.x.org/pub/individual/app/fonttosfnt-1.0.3.tar.bz2 -Source2: ftp://ftp.x.org/pub/individual/app/mkfontdir-1.0.6.tar.bz2 +Source2: ftp://ftp.x.org/pub/individual/app/mkfontdir-1.0.7.tar.bz2 Source3: ftp://ftp.x.org/pub/individual/app/mkfontscale-%{mkfontscale}.tar.bz2 Source4: ftp://ftp.x.org/pub/individual/font/font-util-1.3.0.tar.bz2 # helper script used in %post for xorg-x11-fonts Source5: xorg-x11-fonts-update-dirs Patch2: mkfontscale-examine-all-encodings.patch +Patch3: mkfontscale-man-page-additions.patch BuildRequires: pkgconfig(xfont) pkgconfig(x11) BuildRequires: libfontenc-devel >= 0.99.2-2 @@ -44,6 +45,7 @@ and generation. oldpwd=$(pwd) cd mkfontscale-%{mkfontscale} %patch2 -p1 -b .all-encodings +%patch3 -p1 cd ${oldpwd} %build @@ -107,6 +109,12 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/ucs2any.1* %changelog +* Wed May 22 2013 Peter Hutterer 1:7.5-14 +- mkfontscale 1.1.0 +- mkfontdir 1.0.7 +- bdftopcf 1.0.4 +- Document mkfontscale's -u/-U in the man page (#948841) + * Mon Apr 08 2013 Peter Hutterer 1:7.5-13 - Fix opendir error message during font install, missing encodingsdir/large was missing (#928305)