- updated to 20161005 [bsc#1014793]:

* This release introduces a new icon set, new functionality for 
    custom icon selection graphics, support for GlyphOrderAndAliasDB 
    files, and support for Unicode 9.0.
  * It also fixes a number of small bugs relating to certain bitmap
    typefaces, stroke expansion, handling of CID ranges, and the 
    user interface.
- removed upstreamed patches:
  - propagate-creation-and-modification-times-to-ttf.patch
  - fontforge-eof-crash.patch

OBS-URL: https://build.opensuse.org/package/show/M17N/fontforge?expand=0&rev=62
This commit is contained in:
Petr Gajdos 2016-12-09 14:50:30 +00:00 committed by Git OBS Bridge
parent dd8e6dedab
commit 5b7621a270
6 changed files with 20 additions and 61 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9b20fa68a73812e70bca5658361ce7ce83ed8dac278279c8b2d88e9e9fdd9241
size 43390876

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2e990bd48d66142603363fe4aeb7ab2c6b7281ced63ab5b6a62c36316a951d91
size 42213169

View File

@ -1,16 +0,0 @@
Index: fontforge/parsettf.c
===================================================================
--- fontforge/parsettf.c.orig 2016-01-26 09:01:44.025472518 +0100
+++ fontforge/parsettf.c 2016-01-26 09:04:24.853470665 +0100
@@ -5185,7 +5185,10 @@
/* the index table is backwards from the way I want to use it */
gcbig = 0;
for ( i=0; i<gc; ++i ) {
- indexes[val = getushort(ttf)] = i;
+ val = getushort(ttf);
+ if ( val<0 ) /* Don't crash on EOF */
+ break;
+ indexes[val] = i;
if ( val>=258 ) ++gcbig;
}

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Fri Dec 9 14:15:44 UTC 2016 - pgajdos@suse.com
- updated to 20161005 [bsc#1014793]:
* This release introduces a new icon set, new functionality for
custom icon selection graphics, support for GlyphOrderAndAliasDB
files, and support for Unicode 9.0.
* It also fixes a number of small bugs relating to certain bitmap
typefaces, stroke expansion, handling of CID ranges, and the
user interface.
- removed upstreamed patches:
- propagate-creation-and-modification-times-to-ttf.patch
- fontforge-eof-crash.patch
-------------------------------------------------------------------
Tue Jan 26 08:10:44 UTC 2016 - pgajdos@suse.com

View File

@ -17,7 +17,7 @@
Name: fontforge
Version: 20150824
Version: 20161005
Release: 0
Summary: A Font Editor
License: GPL-3.0+
@ -27,13 +27,9 @@ Url: http://fontforge.org/
# see bug 926061, fontforge-*-repacked.tar.gz does not contain fontforge-*/win/gold/libX11-*.noarch.rpm
Source0: fontforge-%{version}-repacked.tar.gz
Source1: get-source.sh
# suse specific
Patch0: propagate-creation-and-modification-times-to-ttf.patch
# workardound for bug 930076, imho upstream should fix this
# https://github.com/fontforge/fontforge/issues/2270
Patch1: fontforge-version.patch
# https://github.com/fontforge/fontforge/pull/2613, bsc#963023
Patch2: fontforge-eof-crash.patch
Patch0: fontforge-version.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: cairo-devel
@ -99,9 +95,7 @@ to develop applications that use FontForge libraries.
%prep
%setup -q
%patch0 -p1
%patch1
%patch2
%patch0
sed -i 's/\r$//' doc/html/{Big5.txt,corpchar.txt}
# workaround for bug 930076; we just need the _version_of_the_release_! (see also fontforge-version.patch) ---
grep 'doversion(FONTFORGE_MODTIME_STR)' fontforgeexe/startnoui.c && \

View File

@ -1,33 +0,0 @@
From: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=774148
Description: propagate creation and modification times to TTF
Instead of using the current time as creation and modification
times when writing a TrueType Font file, we now propagate those
coming from the source. This enables TrueType Font to be built
reproducibly.
Index: fontforge-20150330/fontforge/tottf.c
===================================================================
--- fontforge-20150330.orig/fontforge/tottf.c
+++ fontforge-20150330/fontforge/tottf.c
@@ -2758,7 +2758,6 @@ void cvt_unix_to_1904( long long time, i
static void sethead(struct head *head,SplineFont *sf,struct alltabs *at,
enum fontformat format, int32 *bsizes) {
- time_t now;
int i, lr, rl, indic_rearrange, arabic;
ASM *sm;
struct ttflangname *useng;
@@ -2866,10 +2865,8 @@ static void sethead(struct head *head,Sp
head->flags |= (1<<9); /* Apple documents this */
/* if there are any indic characters, set bit 10 */
- time(&now); /* seconds since 1970, need to convert to seconds since 1904 */
- cvt_unix_to_1904(now,head->modtime);
- memcpy(head->createtime,head->modtime,sizeof(head->modtime));
-
+ cvt_unix_to_1904(sf->modificationtime,head->modtime);
+ cvt_unix_to_1904(sf->creationtime,head->createtime);
}
static void sethhead(struct hhead *hhead,struct hhead *vhead,struct alltabs *at, SplineFont *sf) {