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 dc24cf8..f36e059 100644 --- a/fonttosfnt.changes +++ b/fonttosfnt.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +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 diff --git a/fonttosfnt.spec b/fonttosfnt.spec index 46fed91..d689b7b 100644 --- a/fonttosfnt.spec +++ b/fonttosfnt.spec @@ -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 6e75b66..0000000 --- a/reproducible.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 5fb8b61537b832561f074a6d400956c8cb6b31a5 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 - -Part-of: ---- - 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 2a6a5574001d7a9959ba4d924522b96f8cc57b43 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. - -Part-of: ---- - 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 -