- Update to version 1.1.3:
* autogen.sh: use quoted string variables * mkfontscale: Avoid a buffer underrun * autogen: add default patch prefix * autogen.sh: use exec instead of waiting for configure to finish * fix handling of Type1 fonts without /FamilyName and/or /FullName OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/mkfontscale?expand=0&rev=11
This commit is contained in:
parent
d8a92ac06a
commit
1aff5c19ae
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8c6d5228af885477b9aec60ca6f172578e7d2de42234357af62fb00439453f20
|
||||
size 141728
|
3
mkfontscale-1.1.3.tar.bz2
Normal file
3
mkfontscale-1.1.3.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1e98df69ee5f4542d711e140e1d93e2c3f2775407ccbb7849110d52b91782a6a
|
||||
size 144386
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 7 11:52:26 UTC 2018 - sndirsch@suse.com
|
||||
|
||||
- Update to version 1.1.3:
|
||||
* autogen.sh: use quoted string variables
|
||||
* mkfontscale: Avoid a buffer underrun
|
||||
* autogen: add default patch prefix
|
||||
* autogen.sh: use exec instead of waiting for configure to finish
|
||||
* fix handling of Type1 fonts without /FamilyName and/or /FullName
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 3 11:20:54 UTC 2015 - pgajdos@suse.com
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package mkfontscale
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,14 +17,13 @@
|
||||
|
||||
|
||||
Name: mkfontscale
|
||||
Version: 1.1.2
|
||||
Version: 1.1.3
|
||||
Release: 0
|
||||
Summary: Utility to create index of scalable font files for X
|
||||
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)
|
||||
@ -41,7 +40,6 @@ legacy X11 font system.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%configure
|
||||
|
@ -1,37 +0,0 @@
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user