Hello community, here is the log from the commit of package mkfontscale for openSUSE:Factory checked in at 2015-03-05 15:28:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkfontscale (Old) and /work/SRC/openSUSE:Factory/.mkfontscale.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mkfontscale" Changes: -------- --- /work/SRC/openSUSE:Factory/mkfontscale/mkfontscale.changes 2015-02-06 10:19:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mkfontscale.new/mkfontscale.changes 2015-03-05 15:28:30.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Mar 3 11:20:54 UTC 2015 - pgaj...@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 + +------------------------------------------------------------------- New: ---- u_mkfontscale-fix-handling-of-Type1-fonts-without-FamilyName-and-o.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkfontscale.spec ++++++ --- /var/tmp/diff_new_pack.CWzTVc/_old 2015-03-05 15:28:31.000000000 +0100 +++ /var/tmp/diff_new_pack.CWzTVc/_new 2015-03-05 15:28:31.000000000 +0100 @@ -24,6 +24,7 @@ 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 @@ %prep %setup -q +%patch0 -p1 %build %configure ++++++ u_mkfontscale-fix-handling-of-Type1-fonts-without-FamilyName-and-o.patch ++++++ >From 0c66831aa4326a5314d381a5c922e4e5a62b82f8 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch <sndir...@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 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
