Accepting request 725070 from M17N
OBS-URL: https://build.opensuse.org/request/show/725070 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fontforge?expand=0&rev=48
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
b3542cf0c5
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8d9737722d06501228af2c9f3b25bf40bc54bf7411503b93761f0b87a76750fc
|
||||
size 30215008
|
||||
3
fontforge-20190801-repacked.tar.xz
Normal file
3
fontforge-20190801-repacked.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e5c992427a1cb4105f9d1270bd668caab586d28ebed931bdcb0662e834275aa9
|
||||
size 29199004
|
||||
@ -1,31 +1,26 @@
|
||||
Index: fontforge/start.c
|
||||
Index: fontforge-20190801/fontforge/start.c
|
||||
===================================================================
|
||||
--- fontforge/start.c.orig 2015-04-30 22:29:11.000000000 +0200
|
||||
+++ fontforge/start.c 2015-05-11 12:45:19.923253423 +0200
|
||||
@@ -133,9 +133,14 @@
|
||||
}
|
||||
--- fontforge-20190801.orig/fontforge/start.c 2019-08-21 13:44:15.537289287 +0200
|
||||
+++ fontforge-20190801/fontforge/start.c 2019-08-21 13:44:39.253433054 +0200
|
||||
@@ -108,8 +108,6 @@ return;
|
||||
|
||||
void doversion(const char *source_version_str) {
|
||||
+ /* not to be upstreamed ! */
|
||||
if ( source_version_str!=NULL )
|
||||
+ {
|
||||
printf( "fontforge %s\n", source_version_str );
|
||||
+ printf( "libfontforge %s\n", source_version_str );
|
||||
+ } else {
|
||||
printf( "libfontforge %d\n",
|
||||
FONTFORGE_VERSIONDATE_RAW );
|
||||
+ }
|
||||
- printf( "fontforge %s\n", source_version_str );
|
||||
- printf( "build date: %s\n",
|
||||
- FONTFORGE_MODTIME_STR );
|
||||
+ printf( "libfontforge %s\n", source_version_str );
|
||||
exit(0);
|
||||
}
|
||||
Index: fontforgeexe/startnoui.c
|
||||
Index: fontforge-20190801/fontforgeexe/startnoui.c
|
||||
===================================================================
|
||||
--- fontforgeexe/startnoui.c.orig 2015-04-30 22:29:11.000000000 +0200
|
||||
+++ fontforgeexe/startnoui.c 2015-05-11 11:54:33.442771227 +0200
|
||||
@@ -116,7 +116,7 @@
|
||||
--- fontforge-20190801.orig/fontforgeexe/startnoui.c 2019-08-21 13:44:15.541289311 +0200
|
||||
+++ fontforge-20190801/fontforgeexe/startnoui.c 2019-08-21 13:45:22.769696849 +0200
|
||||
@@ -128,7 +128,7 @@ int fontforge_main( int argc, char **arg
|
||||
else if ( strcmp(pt,"-help")==0 )
|
||||
doscripthelp();
|
||||
else if ( strcmp(pt,"-version")==0 || strcmp(pt,"-v")==0 || strcmp(pt,"-V")==0 )
|
||||
- doversion(FONTFORGE_MODTIME_STR);
|
||||
- doversion(FONTFORGE_VERSION);
|
||||
+ doversion(source_version_str);
|
||||
}
|
||||
# if defined(_NO_PYTHON)
|
||||
|
||||
@ -1,3 +1,28 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 21 12:36:23 UTC 2019 - pgajdos@suse.com
|
||||
|
||||
- version update to 20190801 [bsc#1145185]
|
||||
* Bugfixes
|
||||
* Added Croatian translation
|
||||
* Added user decompositions
|
||||
* New graphic for the splash/about screen
|
||||
* Images embedded in SFDs are now serialised as PNGs
|
||||
* Both the Windows and Mac builds are now built with Python 3 instead of Python 2.
|
||||
* The minimum supported version for the Mac build is now MacOS Sierra (10.12)
|
||||
* FontForge no longer uses gnulib
|
||||
* collab support has been removed
|
||||
* Complete GDK support, enabled by default on Windows and Macintosh, from @jtanx.
|
||||
* Enhanced UFO 3 support, with separate import/export paths for UFO 2 and UFO 3,
|
||||
from @frank-trampe. See the technical bulletin here for more information.
|
||||
* Improved feature file support, from @skef and @khaledhosny.
|
||||
* WOFF2 support, from @jtanx.
|
||||
* Unicode 12.1.0 support, from @JoesCat.
|
||||
* Extended Python interfaces, from @skef.
|
||||
- modified patches
|
||||
% fontforge-version.patch (refreshed)
|
||||
- deleted patches
|
||||
- reproducible.patch (upstreamed)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 1 03:37:01 UTC 2018 - bwiedemann@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package fontforge
|
||||
#
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2019 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
|
||||
@ -12,15 +12,15 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: fontforge
|
||||
Version: 20170731
|
||||
Version: 20190801
|
||||
Release: 0
|
||||
Summary: A Font Editor
|
||||
License: GPL-3.0+
|
||||
License: GPL-3.0-or-later
|
||||
Group: Productivity/Graphics/Vector Editors
|
||||
Url: http://fontforge.org/
|
||||
# Source: https://github.com/fontforge/fontforge/archive/%{version}.tar.gz
|
||||
@ -30,8 +30,6 @@ Source1: get-source.sh
|
||||
# workardound for bug 930076, imho upstream should fix this
|
||||
# https://github.com/fontforge/fontforge/issues/2270
|
||||
Patch0: fontforge-version.patch
|
||||
# PATCH-FIX-UPSTREAM bmwiedemann https://github.com/fontforge/fontforge/pull/3152
|
||||
Patch1: reproducible.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: cairo-devel
|
||||
@ -97,15 +95,8 @@ to develop applications that use FontForge libraries.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0
|
||||
%patch1 -p1
|
||||
%patch0 -p1
|
||||
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 && \
|
||||
sed -i 's:FONTFORGE_MODTIME_STR:"%{version}":' fontforgeexe/startnoui.c
|
||||
grep 'doversion(FONTFORGE_MODTIME_STR)' fontforgeexe/startui.c && \
|
||||
sed -i 's:FONTFORGE_MODTIME_STR:"%{version}":' fontforgeexe/startui.c
|
||||
# ---
|
||||
|
||||
%build
|
||||
./bootstrap --force
|
||||
@ -118,7 +109,7 @@ make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
make DESTDIR=%{buildroot} install %{?_smp_mflags}
|
||||
%suse_update_desktop_file -i %{name} VectorGraphics
|
||||
%suse_update_desktop_file -i org.fontforge.FontForge VectorGraphics
|
||||
%find_lang FontForge
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
%fdupes -s %{buildroot}%{_datadir}/%{name}
|
||||
@ -136,9 +127,12 @@ find %{buildroot} -type f -name "*.la" -delete -print
|
||||
%{_libdir}/lib*.so.*
|
||||
%{_datadir}/fontforge/
|
||||
%{python3_sitearch}/*
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_datadir}/icons/hicolor/*/apps/%{name}.png
|
||||
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
|
||||
%{_datadir}/applications/org.fontforge.FontForge.desktop
|
||||
%{_datadir}/icons/hicolor/*/apps/org.fontforge.FontForge.png
|
||||
%{_datadir}/icons/hicolor/scalable/apps/org.fontforge.FontForge.svg
|
||||
%{_datadir}/appdata/org.fontforge.FontForge.appdata.xml
|
||||
%{_datadir}/metainfo/org.fontforge.FontForge.*.xml
|
||||
%{_datadir}/pixmaps/org.fontforge.FontForge.*
|
||||
%{_datadir}/mime/packages/%{name}.xml
|
||||
|
||||
%files doc
|
||||
|
||||
@ -1,178 +0,0 @@
|
||||
From 4e850c134200d5a62bdecdd68a4ee31ef7688360 Mon Sep 17 00:00:00 2001
|
||||
From: Gioele Barabucci <gioele@svario.it>
|
||||
Date: Sat, 2 Sep 2017 12:08:06 +0200
|
||||
Subject: [PATCH 1/3] Add GetTime function: override time(2) in case
|
||||
SOURCE_DATE_EPOCH is set
|
||||
|
||||
---
|
||||
fontforge/splinefont.c | 6 ++----
|
||||
gutils/gutils.c | 10 ++++++++++
|
||||
inc/gutils.h | 3 +++
|
||||
3 files changed, 15 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/fontforge/splinefont.c b/fontforge/splinefont.c
|
||||
index 4cd7d6a7b..92c8ef1c5 100644
|
||||
--- a/fontforge/splinefont.c
|
||||
+++ b/fontforge/splinefont.c
|
||||
@@ -55,7 +55,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <gfile.h>
|
||||
-#include <time.h>
|
||||
+#include <gutils.h>
|
||||
#include "unicoderange.h"
|
||||
#include "psfont.h"
|
||||
#include <locale.h>
|
||||
@@ -604,9 +604,7 @@ return( true );
|
||||
}
|
||||
|
||||
void SFSetModTime(SplineFont *sf) {
|
||||
- time_t now;
|
||||
- time(&now);
|
||||
- sf->modificationtime = now;
|
||||
+ sf->modificationtime = GetTime();
|
||||
}
|
||||
|
||||
static SplineFont *_SFReadPostScript(FILE *file,char *filename) {
|
||||
diff --git a/gutils/gutils.c b/gutils/gutils.c
|
||||
index bc945e8b9..72334fc2f 100644
|
||||
--- a/gutils/gutils.c
|
||||
+++ b/gutils/gutils.c
|
||||
@@ -89,3 +89,13 @@ return( ret );
|
||||
#endif
|
||||
}
|
||||
|
||||
+time_t GetTime(void) {
|
||||
+ time_t now;
|
||||
+ if (getenv("SOURCE_DATE_EPOCH")) {
|
||||
+ now = atol(getenv("SOURCE_DATE_EPOCH"));
|
||||
+ } else {
|
||||
+ now = time(NULL);
|
||||
+ }
|
||||
+
|
||||
+ return now;
|
||||
+}
|
||||
diff --git a/inc/gutils.h b/inc/gutils.h
|
||||
index 90b087641..112de734f 100644
|
||||
--- a/inc/gutils.h
|
||||
+++ b/inc/gutils.h
|
||||
@@ -27,8 +27,11 @@
|
||||
#ifndef _GUTILS_H
|
||||
#define _GUTILS_H
|
||||
|
||||
+#include <time.h>
|
||||
+
|
||||
extern int16 div_tables[257][2];
|
||||
|
||||
extern const char *GetAuthor(void);
|
||||
+extern time_t GetTime(void);
|
||||
|
||||
#endif
|
||||
|
||||
From 24aeddf65139ee50753537070e51b08c80346423 Mon Sep 17 00:00:00 2001
|
||||
From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
|
||||
Date: Mon, 18 Sep 2017 14:23:26 +0200
|
||||
Subject: [PATCH 2/3] Improve GetTime function
|
||||
|
||||
to only call getenv once
|
||||
---
|
||||
gutils/gutils.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gutils/gutils.c b/gutils/gutils.c
|
||||
index 72334fc2f..de2c3e207 100644
|
||||
--- a/gutils/gutils.c
|
||||
+++ b/gutils/gutils.c
|
||||
@@ -91,8 +91,9 @@ return( ret );
|
||||
|
||||
time_t GetTime(void) {
|
||||
time_t now;
|
||||
- if (getenv("SOURCE_DATE_EPOCH")) {
|
||||
- now = atol(getenv("SOURCE_DATE_EPOCH"));
|
||||
+ const char *source_date_epoch = getenv("SOURCE_DATE_EPOCH");
|
||||
+ if (source_date_epoch) {
|
||||
+ now = atol(source_date_epoch);
|
||||
} else {
|
||||
now = time(NULL);
|
||||
}
|
||||
|
||||
From 078a1738a86717b46e02276bd85bb76893688eea Mon Sep 17 00:00:00 2001
|
||||
From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
|
||||
Date: Mon, 18 Sep 2017 14:34:32 +0200
|
||||
Subject: [PATCH 3/3] Use GetTime in more places
|
||||
|
||||
in order to make more kinds of font operations reproducible
|
||||
---
|
||||
fontforge/dumppfa.c | 4 ++--
|
||||
fontforge/splinesaveafm.c | 4 ++--
|
||||
fontforge/tottf.c | 6 +++---
|
||||
3 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/fontforge/dumppfa.c b/fontforge/dumppfa.c
|
||||
index 524b06f85..b88d124a8 100644
|
||||
--- a/fontforge/dumppfa.c
|
||||
+++ b/fontforge/dumppfa.c
|
||||
@@ -52,7 +52,7 @@
|
||||
# include <pwd.h>
|
||||
#endif
|
||||
#include <stdarg.h>
|
||||
-#include <time.h>
|
||||
+#include <gutils.h>
|
||||
#include "psfont.h"
|
||||
#include "splinefont.h"
|
||||
#include <gdraw.h> /* For image defn */
|
||||
@@ -1763,7 +1763,7 @@ static void dumpfontcomments(void (*dumpchar)(int ch,void *data), void *data,
|
||||
time_t now;
|
||||
const char *author = GetAuthor();
|
||||
|
||||
- time(&now);
|
||||
+ now = GetTime();
|
||||
/* Werner points out that the DSC Version comment has a very specific */
|
||||
/* syntax. We can't just put in a random string, must be <real> <int> */
|
||||
/* So we can sort of do that for CID fonts (give it a <revsion> of 0 */
|
||||
diff --git a/fontforge/splinesaveafm.c b/fontforge/splinesaveafm.c
|
||||
index d37a69f32..420770cb4 100644
|
||||
--- a/fontforge/splinesaveafm.c
|
||||
+++ b/fontforge/splinesaveafm.c
|
||||
@@ -46,7 +46,7 @@
|
||||
#include "splineutil.h"
|
||||
#include <utype.h>
|
||||
#include <ustring.h>
|
||||
-#include <time.h>
|
||||
+#include <gutils.h>
|
||||
#include <math.h>
|
||||
|
||||
#include <sys/types.h> /* For stat */
|
||||
@@ -1183,7 +1183,7 @@ static void AfmSplineFontHeader(FILE *afm, SplineFont *sf, int formattype,
|
||||
iscid ? "StartFontMetrics 4.1\n" :
|
||||
"StartFontMetrics 2.0\n" );
|
||||
fprintf( afm, "Comment Generated by FontForge %d\n", FONTFORGE_VERSIONDATE_RAW );
|
||||
- time(&now);
|
||||
+ now = GetTime();
|
||||
fprintf(afm,"Comment Creation Date: %s", ctime(&now));
|
||||
fprintf( afm, "FontName %s\n", sf->fontname );
|
||||
if ( sf->fullname!=NULL ) fprintf( afm, "FullName %s\n", sf->fullname );
|
||||
diff --git a/fontforge/tottf.c b/fontforge/tottf.c
|
||||
index f53da3fee..b3e065fdb 100644
|
||||
--- a/fontforge/tottf.c
|
||||
+++ b/fontforge/tottf.c
|
||||
@@ -52,7 +52,7 @@
|
||||
#include "ttfspecial.h"
|
||||
#include <math.h>
|
||||
#include <unistd.h>
|
||||
-#include <time.h>
|
||||
+#include <gutils.h>
|
||||
#include <locale.h>
|
||||
#include <utype.h>
|
||||
#include <ustring.h>
|
||||
@@ -3831,8 +3831,8 @@ void DefaultTTFEnglishNames(struct ttflangname *dummy, SplineFont *sf) {
|
||||
if ( dummy->names[ttf_subfamily]==NULL || *dummy->names[ttf_subfamily]=='\0' )
|
||||
dummy->names[ttf_subfamily] = utf8_verify_copy(SFGetModifiers(sf));
|
||||
if ( dummy->names[ttf_uniqueid]==NULL || *dummy->names[ttf_uniqueid]=='\0' ) {
|
||||
- time(&now);
|
||||
- tm = localtime(&now);
|
||||
+ now = GetTime();
|
||||
+ tm = gmtime(&now);
|
||||
snprintf( buffer, sizeof(buffer), "%s : %s : %d-%d-%d",
|
||||
BDFFoundry?BDFFoundry:TTFFoundry?TTFFoundry:"FontForge 2.0",
|
||||
sf->fullname!=NULL?sf->fullname:sf->fontname,
|
||||
Loading…
Reference in New Issue
Block a user