pool/mkfontscale
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 288836 from X11:XOrg

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/288836
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mkfontscale?expand=0&rev=8
This commit is contained in:
Dominique Leuenberger 2015-03-05 14:28:29 +00:00 committed by Git OBS Bridge
commit 6ea6526675
3 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mkfontscale.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Mar 3 11:20:54 UTC 2015 - pgajdos@suse.com
- fix segfault for Hershey fonts [bnc#918466]
- treat /FontName as family name when /FamilyName is missing
+ u_mkfontscale-fix-handling-of-Type1-fonts-without-FamilyName-and-o.patch
-------------------------------------------------------------------
Mon Feb 2 23:53:41 UTC 2015 - zaitor@opensuse.org

2
mkfontscale.spec
View File

@ -24,6 +24,7 @@ License: MIT
Group: System/X11/Utilities
Url: http://xorg.freedesktop.org/
Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
Patch0: u_mkfontscale-fix-handling-of-Type1-fonts-without-FamilyName-and-o.patch
BuildRequires: pkg-config
BuildRequires: zlib-devel
BuildRequires: pkgconfig(fontenc)
@ -40,6 +41,7 @@ legacy X11 font system.
%prep
%setup -q
%patch0 -p1
%build
%configure

37
u_mkfontscale-fix-handling-of-Type1-fonts-without-FamilyName-and-o.patch Normal file
View File

@ -0,0 +1,37 @@
From 0c66831aa4326a5314d381a5c922e4e5a62b82f8 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Wed, 4 Mar 2015 09:01:32 +0100
Subject: [PATCH 1/1] fix handling of Type1 fonts without /FamilyName and/or
/FullName
Patch-Mainline: To be upstreamed
References: bnc#918466
---
mkfontscale.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/mkfontscale.c b/mkfontscale.c
index da93e0c..e9b9488 100644
--- a/mkfontscale.c
+++ b/mkfontscale.c
@@ -579,11 +579,14 @@ makeXLFD(char *filename, FT_Face face, int isBitmap)
}
if(t1info) {
- if(!family)
+ if(!family && t1info->family_name)
family = strdup(t1info->family_name);
- if(!family)
+ if(!family && t1info->full_name)
family = strdup(t1info->full_name);
- if(!full_name)
+ /* Hershey fonts miss /FamilyName */
+ if(!family && face->family_name)
+ family = strdup(face->family_name);
+ if(!full_name && t1info->full_name)
full_name = strdup(t1info->full_name);
if(!foundry)
foundry = notice_foundry(t1info->notice);
--
2.3.0