[vlgothic-fonts] Work around unnecessary leading whitespace in the pattern. (#966785)
by Akira TAGOH
commit 7a717d0d86f89dc3433a828b142c0d1d7ed58095
Author: Akira TAGOH <tagoh(a)redhat.com>
Date: Fri May 24 17:47:53 2013 +0900
Work around unnecessary leading whitespace in the pattern. (#966785)
vlgothic-fonts-fontconfig-gothic.conf | 6 +++---
vlgothic-fonts-fontconfig-pgothic.conf | 4 ++--
vlgothic-fonts.spec | 5 ++++-
3 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/vlgothic-fonts-fontconfig-gothic.conf b/vlgothic-fonts-fontconfig-gothic.conf
index df99f1e..75f6629 100644
--- a/vlgothic-fonts-fontconfig-gothic.conf
+++ b/vlgothic-fonts-fontconfig-gothic.conf
@@ -20,7 +20,7 @@
<test name="lang" compare="contains">
<string>ja</string>
</test>
- <test name="family">
+ <test name="family" ignore-blanks="true">
<string>monospace</string>
</test>
<edit name="family" mode="prepend">
@@ -32,7 +32,7 @@
<test name="lang" compare="contains">
<string>ja</string>
</test>
- <test name="family">
+ <test name="family" ignore-blanks="true">
<string>sans-serif</string>
</test>
<edit name="family" mode="prepend">
@@ -41,7 +41,7 @@
</match>
<!-- disabling hinting rule -->
<match target="font">
- <test name="family">
+ <test name="family" ignore-blanks="true">
<string>VL Gothic</string>
</test>
<edit name="hinting" mode="assign">
diff --git a/vlgothic-fonts-fontconfig-pgothic.conf b/vlgothic-fonts-fontconfig-pgothic.conf
index 3bd2536..29cf1fc 100644
--- a/vlgothic-fonts-fontconfig-pgothic.conf
+++ b/vlgothic-fonts-fontconfig-pgothic.conf
@@ -13,7 +13,7 @@
<test name="lang" compare="contains">
<string>ja</string>
</test>
- <test name="family">
+ <test name="family" ignore-blanks="true">
<string>sans-serif</string>
</test>
<edit name="family" mode="prepend">
@@ -22,7 +22,7 @@
</match>
<!-- disabling hinting rule -->
<match target="font">
- <test name="family">
+ <test name="family" ignore-blanks="true">
<string>VL PGothic</string>
</test>
<edit name="hinting" mode="assign">
diff --git a/vlgothic-fonts.spec b/vlgothic-fonts.spec
index 27db8bb..34b735b 100644
--- a/vlgothic-fonts.spec
+++ b/vlgothic-fonts.spec
@@ -11,7 +11,7 @@ but some have also been improved by the project.
Name: %{fontname}-fonts
Version: 20130510
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Japanese TrueType font
License: mplus and BSD
@@ -76,6 +76,9 @@ done
%changelog
+* Fri May 24 2013 Akira TAGOH <tagoh(a)redhat.com> - 20130510-2
+- Work around unnecessary leading whitespace in the pattern. (#966785)
+
* Mon May 13 2013 Akira TAGOH <tagoh(a)redhat.com> - 20130510-1
- New upstream release (#956040)
11 years
[xorg-x11-font-utils] mkfontscale 1.1.0
by Peter Hutterer
commit cbd5234539ac4c92745ad2bb30a200805ce0a079
Author: Peter Hutterer <peter.hutterer(a)who-t.net>
Date: Wed May 22 07:33:22 2013 +1000
mkfontscale 1.1.0
- mkfontdir 1.0.7
- bdftopcf 1.0.4
- Document mkfontscale's -u/-U in the man page (#948841)
.gitignore | 3 ++
mkfontscale-examine-all-encodings.patch | 11 +++++----
mkfontscale-man-page-additions.patch | 38 +++++++++++++++++++++++++++++++
sources | 6 ++--
xorg-x11-font-utils.spec | 16 +++++++++---
5 files changed, 62 insertions(+), 12 deletions(-)
---
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 <peter.hutterer(a)who-t.net>
+Date: Tue, 21 May 2013 15:50:19 +1000
+Subject: [PATCH mkfontscale] Document -u/-U options in man page
+
+Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+---
+ 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 <peter.hutterer(a)redhat.com> 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 <peter.hutterer(a)redhat.com> 1:7.5-13
- Fix opendir error message during font install, missing encodingsdir/large
was missing (#928305)
11 years
[Bug 860249] Review Request: adobe-source-code-pro-fonts - A set of mono-spaced OpenType fonts designed for coding environments
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=860249
Matt Rose <mattrose(a)folkwolf.net> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |mattrose(a)folkwolf.net
--- Comment #43 from Matt Rose <mattrose(a)folkwolf.net> ---
(In reply to Tobias Florek from comment #42)
> sorry for not doing this earlier. i was busy the last months. i expect to be
> busy for this week as well. hopefully i'll get to it next week.
>
> thanks for the pointer to github. i'll raise them as github tickets.
I've become impatient ( a personal failing ) to get this package into fedora
sooner rather than later. I sent an email to Tobias, but I haven't got a
response yet, so I'm going to try and get a sponsor myself for this package,
and if Tobias ever wants to pick it up, I'd be perfectly willing to have him as
a co-maintainer.
I'll also check github and see if the repo-font-audit issues have been raised
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=N2bvbR0AJ5&a=cc_unsubscribe
11 years
