pool/fonttosfnt
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1207469 from X11:XOrg

Browse Source 
- 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

- refresh reproducible.patch

OBS-URL: https://build.opensuse.org/request/show/1207469
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fonttosfnt?expand=0&rev=14
This commit is contained in:
Dominique Leuenberger 2024-10-13 15:33:12 +00:00 committed by Git OBS Bridge
commit 848872bfc8
5 changed files with 26 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
fonttosfnt-1.2.3.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

3
fonttosfnt-1.2.4.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:249635f67fb94fabd46837283c40ba8dd5e7b774df2bac03d5026a3480766372
size 143928

24
fonttosfnt.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Sat Oct 12 17:41:37 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
- 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 <dmueller@suse.com>
- refresh reproducible.patch
-------------------------------------------------------------------
Mon Jul 29 13:37:47 UTC 2024 - Bernhard Wiedemann <bwiedemann@suse.com>
@ -38,12 +56,12 @@ Tue Dec 22 08:40:19 UTC 2020 - Dirk Müller <dmueller@suse.com>
Wed Oct 21 09:17:35 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- 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 <sndirsch@suse.com>
- 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 <sndirsch@suse.com>
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

5
fonttosfnt.spec
View File

@ -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)

70
reproducible.patch
View File

@ -1,70 +0,0 @@
From 6e3754966240b62819e9ea4ba4c461ba3c719a2b Mon Sep 17 00:00:00 2001
From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
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" <bwiedemann@suse.de>
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