Skip to content
Snippets Groups Projects
Commit 09c42387 authored by Rocky Automation's avatar Rocky Automation :tv:
Browse files

import adobe-afdko-3.6.1-10.el10

parents
No related branches found
Tags imports/r10s/adobe-afdko-3.6.1-10.el10
No related merge requests found
Direct Git Import
5b81e0eedf5f8f6310aae206d960bf60608ba1ad41bb91a254ff6ac31fec0705 SOURCES/afdko-3.6.1.tar.gz
Upstream, this is part of this commit:
commit 26761e9616f8a52aa14e7041ac9cbb0e139a1d83
Author: Skef Iterum <iterumllc@skef.org>
Date: Thu May 13 05:33:44 2021 -0700
Antlr 4 feature file parser and CMake build system
diff --git a/c/makeotf/makeotf_lib/source/hotconv/STAT.c b/c/makeotf/makeotf_lib/source/hotconv/STAT.c
index a93cb6571ad14fab..7d31230cf87bd941 100644
--- a/c/makeotf/makeotf_lib/source/hotconv/STAT.c
+++ b/c/makeotf/makeotf_lib/source/hotconv/STAT.c
@@ -301,7 +301,7 @@ void STATAddDesignAxis(hotCtx g, Tag tag, uint16_t nameID, uint16_t ordering) {
// Currently registered tags are 'wght', 'wdth', 'opsz', 'ital', 'slnt'
char tagString[4] = {TAG_ARG(tag)};
- const uint32_t *regTags[5] = {
+ const uint32_t regTags[5] = {
TAG('i', 't', 'a', 'l'),
TAG('o', 'p', 's', 'z'),
TAG('s', 'l', 'n', 't'),
Author: Sergei Trofimovich <slyich@gmail.com>
Date: Wed Dec 6 20:41:57 2023 +0000
c/shared/source/t1write/t1write.c: fix u8/u16 type mismatch on dereference (gcc-14)
Upcoming `gcc-14` enabled a few warnings into errors, like
`-Wincompatible-pointer-types`. This caused `afdko` build to fail as:
/build/afdko/c/shared/source/t1write/t1write.c: In function ‘saveCstr’:
/build/afdko/c/shared/source/t1write/t1write.c:348:28: error: passing argument 3 of ‘writeTmp’ from incompatible pointer type [-Wincompatible-pointer-types]
348 | if (writeTmp(h, 1, &info->iFD))
| ^~~~~~~~~~
| |
| uint16_t * {aka short unsigned int *}
The code attempts to use only one byte of 16-bit value. The code very
likely is broken on a big-endian system.
The change explicitly truncates 16-bit value down to 8 bit value to
retain existing behaviour on both BE and LE systems.
Submitted upstream: <https://github.com/adobe-type-tools/afdko/pull/1730>
diff --git a/c/public/lib/source/t1write/t1write.c b/c/public/lib/source/t1write/t1write.c
index e16387408a953c07..b2e4c0df27d36e56 100644
--- a/c/public/lib/source/t1write/t1write.c
+++ b/c/public/lib/source/t1write/t1write.c
@@ -345,7 +345,8 @@ static int saveCstr(t1wCtx h, abfGlyphInfo *info,
if (info != NULL && info->flags & ABF_GLYPH_CID &&
!(h->arg.flags & T1W_TYPE_HOST)) {
/* CID-keyed incremental download; write fd index */
- if (writeTmp(h, 1, &info->iFD))
+ unsigned char c = info->iFD;
+ if (writeTmp(h, 1, &c))
return 1;
cstr->length++;
}
%global archivename afdko
Name: adobe-afdko
Version: 3.6.1
Release: 10%{?dist}
Summary: Adobe Font Development Kit for OpenType
# ExternalAntlr4Cpp.cmake is BSD-3-clause
# c/makeotf/makeotf_lib/build/hotpccts/pccts/* is ANTLR-PD
# afdko-3.6.1/python/afdko/pdflib/pdfgen.py is Python-2.0.1
# python/afdko/resources/ is BSD-3-Clause
License: Apache-2.0 AND BSD-3-Clause AND ANTLR-PD AND Python-2.0.1
URL: https://github.com/adobe-type-tools/afdko
Source0: https://github.com/adobe-type-tools/%{archivename}/releases/download/%{version}/%{archivename}-%{version}.tar.gz
Patch0: adobe-afdko-c99-1.patch
Patch1: adobe-afdko-c99-2.patch
BuildRequires: gcc
BuildRequires: make
%description
Adobe Font Development Kit for OpenType (AFDKO).
The AFDKO is a set of tools for building OpenType font files
from PostScript and TrueType font data.
%prep
%autosetup -p1 -n %{archivename}-%{version}
%build
%set_build_flags
export XFLAGS="${CFLAGS} ${LDFLAGS}"
pushd c
sh buildalllinux.sh release
popd
%install
install -m 0755 -d %{buildroot}/%{_bindir}
pushd c/build_all
find ./ -type f -executable -exec install -p -m 0755 "{}" \
%{buildroot}/%{_bindir} ";"
%files
%license LICENSE.md
%doc docs/ README.md NEWS.md
%{_bindir}/*
%changelog
* Thu Jan 25 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 3.6.1-10
- Fix a typo in the License expression
- Fix build not respecting distribution compiler flags; this means executables
are now PIE, and the debuginfo package is now useful
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 05 2024 Florian Weimer <fweimer@redhat.com> - 3.6.1-7
- Fix C compatibility issues
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Feb 02 2021 Vishal Vijayraghavan <vishalvvr@fedoraproject.org> - 3.6.1-1
- Build for latest 3.6.1 release
* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Oct 16 2020 Vishal Vijayraghavan <vishalvvr@fedoraproject.org> - 3.5.1-1
- Build for latest release 3.5.1
* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.0-3
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sat Jul 11 2020 Vishal Vijayraghavan <vishalvvr@fedoraproject.org> - 3.4.0-1
- Build for latest release 3.4.0
* Mon May 18 2020 Vishal Vijayraghavan <vishalvvr@fedoraproject.org> - 3.3.0-1
- Build for latest release 3.3.0
* Sat May 09 2020 Vishal Vijayraghavan <vishalvvr@fedoraproject.org> - 3.2.0-2
- undo the change 'Rename makeotfexe to makeotf'
* Fri Apr 3 2020 Vishal Vijayraghavan <vishalvvr@fedoraproject.org> - 3.2.0-1
- Build for latest release
* Mon Mar 23 2020 Vishal Vijayraghavan <vishalvvr@fedoraproject.org> - 3.0.1-4
- rename package name afdko to adobe-afdko
* Mon Mar 9 2020 Vishal Vijayraghavan <vishalvvr@fedoraproject.org> - 3.0.1-3
- Added %%set_build_flags
- Updated install script
* Mon Mar 2 2020 Vishal Vijayraghavan <vishalvvr@fedoraproject.org> - 3.0.1-2
- Added build dependency gcc, make
- Removed unused build dependency
- Rename makeotfexe to makeotf
* Fri Dec 13 2019 Peng Wu <pwu@redhat.com> - 3.0.1-1
- Initial Version
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment