diff --git a/fonttosfnt-1.2.3.tar.xz b/fonttosfnt-1.2.3.tar.xz deleted file mode 100644 index 4cb6842..0000000 --- a/fonttosfnt-1.2.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa7a93f240cbd0f5cdfe6be7c1b934b4f74d23de6257883a9f1b4bf21d7d61af -size 140068 diff --git a/fonttosfnt-1.2.4.tar.xz b/fonttosfnt-1.2.4.tar.xz new file mode 100644 index 0000000..d96199a --- /dev/null +++ b/fonttosfnt-1.2.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:249635f67fb94fabd46837283c40ba8dd5e7b774df2bac03d5026a3480766372 +size 143928 diff --git a/fonttosfnt.changes b/fonttosfnt.changes index e57e857..f36e059 100644 --- a/fonttosfnt.changes +++ b/fonttosfnt.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Sat Oct 12 17:41:37 UTC 2024 - Stefan Dirsch + +- update to 1.2.4 + * unifdef __UNIXOS2__ + * unifdef __SCO__ + * unifdef NEED_SNPRINTF + * Use long long for timestamp diff + * Allow to override build date with SOURCE_DATE_EPOCH + * Use FONT_UNITS_FLOOR for ascent/descent + * Fix `cmap` Subtable Format 4 `entrySelector` +- supersedes reproducible.patch + +------------------------------------------------------------------- +Wed Oct 9 09:48:02 UTC 2024 - Dirk Müller + +- refresh reproducible.patch + ------------------------------------------------------------------- Mon Jul 29 13:37:47 UTC 2024 - Bernhard Wiedemann @@ -38,12 +56,12 @@ Tue Dec 22 08:40:19 UTC 2020 - Dirk Müller Wed Oct 21 09:17:35 UTC 2020 - Stefan Dirsch - Update to version 1.2.0 - * This release contains a bunch of fixes all over the place + * This release contains a bunch of fixes all over the place ------------------------------------------------------------------- Tue Jan 7 09:38:28 UTC 2020 - Stefan Dirsch -- Update to version 1.1.0 +- Update to version 1.1.0 * Update README for gitlab migration * Update configure.ac bug URL for gitlab migration * Correct a string literal @@ -60,7 +78,7 @@ Tue Jan 7 09:38:28 UTC 2020 - Stefan Dirsch Fri Aug 17 10:46:14 UTC 2018 - sndirsch@suse.com - Update to version 1.0.5 - * Is it a bird? is it a plane? No it's a fonttofs.. fontstof.. + * Is it a bird? is it a plane? No it's a fonttofs.. fontstof.. fonttofn... it's a release of the tool that wraps a bitmap font into a truetype wrapper! Bringing you the last 9 years of exciting changes including ansification and lots of diff --git a/fonttosfnt.spec b/fonttosfnt.spec index 181a5e9..d689b7b 100644 --- a/fonttosfnt.spec +++ b/fonttosfnt.spec @@ -1,7 +1,7 @@ # # spec file for package fonttosfnt # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # 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: fonttosfnt -Version: 1.2.3 +Version: 1.2.4 Release: 0 Summary: Utility to wrap a bitmap font in a sfnt (TrueType) wrapper License: MIT Group: System/X11/Utilities URL: https://xorg.freedesktop.org/ Source0: https://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz -Patch0: https://gitlab.freedesktop.org/xorg/app/fonttosfnt/-/merge_requests/22.patch#/reproducible.patch BuildRequires: pkgconfig BuildRequires: pkgconfig(fontenc) BuildRequires: pkgconfig(freetype2) diff --git a/reproducible.patch b/reproducible.patch deleted file mode 100644 index 3f67183..0000000 --- a/reproducible.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 6e3754966240b62819e9ea4ba4c461ba3c719a2b Mon Sep 17 00:00:00 2001 -From: "Bernhard M. Wiedemann" -Date: Wed, 24 Jul 2024 16:27:35 +0200 -Subject: [PATCH 1/2] Use long long for timestamp diff - -to avoid integer overflows in the future ---- - util.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util.c b/util.c -index a393e55..a810c87 100644 ---- a/util.c -+++ b/util.c -@@ -181,7 +181,7 @@ mktime_gmt(struct tm *tm) - int - macTime(int *hi, unsigned *lo) - { -- unsigned long diff; /* Not time_t */ -+ unsigned long long diff; /* Not time_t */ - time_t macEpoch, current; - struct tm tm; - tm.tm_sec = 0; --- -GitLab - - -From 910868fc95546cd16522c0a4ca67887e783329e7 Mon Sep 17 00:00:00 2001 -From: "Bernhard M. Wiedemann" -Date: Wed, 24 Jul 2024 16:28:43 +0200 -Subject: [PATCH 2/2] Allow to override build date with SOURCE_DATE_EPOCH - -to make builds reproducible. -See https://reproducible-builds.org/ for why this is good -and https://reproducible-builds.org/specs/source-date-epoch/ -for the definition of this variable. - -This patch was done while working on reproducible builds for openSUSE, sponsored by the NLnet NGI0 fund. ---- - util.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/util.c b/util.c -index a810c87..a7207f8 100644 ---- a/util.c -+++ b/util.c -@@ -182,6 +182,7 @@ int - macTime(int *hi, unsigned *lo) - { - unsigned long long diff; /* Not time_t */ -+ char *source_date_epoch; - time_t macEpoch, current; - struct tm tm; - tm.tm_sec = 0; -@@ -195,7 +196,11 @@ macTime(int *hi, unsigned *lo) - macEpoch = mktime_gmt(&tm); - if(macEpoch == -1) return -1; - -- current = time(NULL); -+ /* This assumes that the SOURCE_DATE_EPOCH environment variable will contain -+ a correct, positive integer in the time_t range */ -+ if ((source_date_epoch = getenv("SOURCE_DATE_EPOCH")) == NULL || -+ (current = (time_t)strtoll(source_date_epoch, NULL, 10)) <= 0) -+ current = time(NULL); - if(current == -1) - return -1; - --- -GitLab -