From 5347a6876c526975ead07debfe6c807127e2d9a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Tue, 24 Oct 2023 06:14:26 +0000 Subject: [PATCH 01/17] Migrate to SPDX license This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 --- adobe-afdko.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/adobe-afdko.spec b/adobe-afdko.spec index e29833b..d25107e 100644 --- a/adobe-afdko.spec +++ b/adobe-afdko.spec @@ -4,7 +4,11 @@ Name: adobe-afdko Version: 3.6.1 Release: 6%{?dist} Summary: Adobe Font Development Kit for OpenType -License: ASL 2.0 +# 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 BuildRequires: gcc From 25087f03f500bf84a561571a1fd922cead793341 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 5 Jan 2024 09:11:19 +0100 Subject: [PATCH 02/17] Fix C compatibility issues Related to: --- adobe-afdko-c99-1.patch | 21 +++++++++++++++++++++ adobe-afdko-c99-2.patch | 37 +++++++++++++++++++++++++++++++++++++ adobe-afdko.spec | 9 +++++++-- 3 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 adobe-afdko-c99-1.patch create mode 100644 adobe-afdko-c99-2.patch diff --git a/adobe-afdko-c99-1.patch b/adobe-afdko-c99-1.patch new file mode 100644 index 0000000..543d88e --- /dev/null +++ b/adobe-afdko-c99-1.patch @@ -0,0 +1,21 @@ +Upstream, this is part of this commit: + +commit 26761e9616f8a52aa14e7041ac9cbb0e139a1d83 +Author: Skef Iterum +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'), diff --git a/adobe-afdko-c99-2.patch b/adobe-afdko-c99-2.patch new file mode 100644 index 0000000..f02fe9f --- /dev/null +++ b/adobe-afdko-c99-2.patch @@ -0,0 +1,37 @@ +Author: Sergei Trofimovich +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: + +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++; + } diff --git a/adobe-afdko.spec b/adobe-afdko.spec index d25107e..6f4ff04 100644 --- a/adobe-afdko.spec +++ b/adobe-afdko.spec @@ -2,7 +2,7 @@ Name: adobe-afdko Version: 3.6.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Adobe Font Development Kit for OpenType # ExternalAntlr4Cpp.cmake is BSD-3-clause # c/makeotf/makeotf_lib/build/hotpccts/pccts/* is ANTLR-PD @@ -11,6 +11,8 @@ Summary: Adobe Font Development Kit for OpenType 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 @@ -20,7 +22,7 @@ The AFDKO is a set of tools for building OpenType font files from PostScript and TrueType font data. %prep -%autosetup -n %{archivename}-%{version} +%autosetup -p1 -n %{archivename}-%{version} %build %set_build_flags @@ -40,6 +42,9 @@ find ./ -type f -executable -exec install -p -m 0755 "{}" \ %{_bindir}/* %changelog +* Fri Jan 05 2024 Florian Weimer - 3.6.1-7 +- Fix C compatibility issues + * Wed Jul 19 2023 Fedora Release Engineering - 3.6.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 203a07f722e11f81eaac9107292ac3ebd215030e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:12:19 +0000 Subject: [PATCH 03/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- adobe-afdko.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adobe-afdko.spec b/adobe-afdko.spec index 6f4ff04..d6fc7ce 100644 --- a/adobe-afdko.spec +++ b/adobe-afdko.spec @@ -2,7 +2,7 @@ Name: adobe-afdko Version: 3.6.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Adobe Font Development Kit for OpenType # ExternalAntlr4Cpp.cmake is BSD-3-clause # c/makeotf/makeotf_lib/build/hotpccts/pccts/* is ANTLR-PD @@ -42,6 +42,9 @@ find ./ -type f -executable -exec install -p -m 0755 "{}" \ %{_bindir}/* %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 3.6.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 05 2024 Florian Weimer - 3.6.1-7 - Fix C compatibility issues From bbc9f81f2de7100c16e7ed63a1fcdb5319ea09e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:40:11 +0000 Subject: [PATCH 04/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- adobe-afdko.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adobe-afdko.spec b/adobe-afdko.spec index d6fc7ce..bdde2ef 100644 --- a/adobe-afdko.spec +++ b/adobe-afdko.spec @@ -2,7 +2,7 @@ Name: adobe-afdko Version: 3.6.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Adobe Font Development Kit for OpenType # ExternalAntlr4Cpp.cmake is BSD-3-clause # c/makeotf/makeotf_lib/build/hotpccts/pccts/* is ANTLR-PD @@ -42,6 +42,9 @@ find ./ -type f -executable -exec install -p -m 0755 "{}" \ %{_bindir}/* %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 3.6.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 3.6.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 04461e3151891631b839fb3979059ac4bd1c5716 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 19 Jan 2024 10:02:07 -0500 Subject: [PATCH 05/17] Fix a typo in the License expression --- adobe-afdko.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/adobe-afdko.spec b/adobe-afdko.spec index bdde2ef..cb28c4b 100644 --- a/adobe-afdko.spec +++ b/adobe-afdko.spec @@ -2,13 +2,13 @@ Name: adobe-afdko Version: 3.6.1 -Release: 9%{?dist} +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 +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 @@ -42,6 +42,9 @@ find ./ -type f -executable -exec install -p -m 0755 "{}" \ %{_bindir}/* %changelog +* Thu Jan 22 2024 Benjamin A. Beasley - 3.6.1-10 +- Fix a typo in the License expression + * Mon Jan 22 2024 Fedora Release Engineering - 3.6.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From cf21e7b6a30cb325e1cffa7b0ef757bbdc19b652 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 19 Jan 2024 10:12:59 -0500 Subject: [PATCH 06/17] Fix build not respecting distribution compiler flags - Executables are now built as PIE and with other important hardening flags - The debuginfo package is now useful --- adobe-afdko.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/adobe-afdko.spec b/adobe-afdko.spec index cb28c4b..0739cda 100644 --- a/adobe-afdko.spec +++ b/adobe-afdko.spec @@ -26,6 +26,7 @@ from PostScript and TrueType font data. %build %set_build_flags +export XFLAGS="${CFLAGS} ${LDFLAGS}" pushd c sh buildalllinux.sh release popd @@ -44,6 +45,8 @@ find ./ -type f -executable -exec install -p -m 0755 "{}" \ %changelog * Thu Jan 22 2024 Benjamin A. Beasley - 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 - 3.6.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From e2d9ed68ab47779b6d2f5df46d111be193602a1f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 26 Jan 2024 14:57:40 +0800 Subject: [PATCH 07/17] fixup! last changelog date --- adobe-afdko.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adobe-afdko.spec b/adobe-afdko.spec index 0739cda..b310e9b 100644 --- a/adobe-afdko.spec +++ b/adobe-afdko.spec @@ -43,7 +43,7 @@ find ./ -type f -executable -exec install -p -m 0755 "{}" \ %{_bindir}/* %changelog -* Thu Jan 22 2024 Benjamin A. Beasley - 3.6.1-10 +* Thu Jan 25 2024 Benjamin A. Beasley - 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 From a0de10b4b4c3e6a327d09e61d60253260672ea9f Mon Sep 17 00:00:00 2001 From: matiwari Date: Tue, 25 Jun 2024 23:46:14 +0530 Subject: [PATCH 08/17] Update to release 4.0.1 --- .gitignore | 1 + adobe-afdko-c99-1.patch | 21 ------------------- adobe-afdko-c99-2.patch | 37 ---------------------------------- adobe-afdko.spec | 33 ++++++++++++++++++------------ antlr4-cpp-runtime-4.9.3.patch | 21 +++++++++++++++++++ sources | 3 ++- 6 files changed, 44 insertions(+), 72 deletions(-) delete mode 100644 adobe-afdko-c99-1.patch delete mode 100644 adobe-afdko-c99-2.patch create mode 100644 antlr4-cpp-runtime-4.9.3.patch diff --git a/.gitignore b/.gitignore index ed90fd2..59aa180 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ afdko-*tar.gz afdko-*/ +/antlr4-cpp-runtime-4.9.3-source.zip diff --git a/adobe-afdko-c99-1.patch b/adobe-afdko-c99-1.patch deleted file mode 100644 index 543d88e..0000000 --- a/adobe-afdko-c99-1.patch +++ /dev/null @@ -1,21 +0,0 @@ -Upstream, this is part of this commit: - -commit 26761e9616f8a52aa14e7041ac9cbb0e139a1d83 -Author: Skef Iterum -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'), diff --git a/adobe-afdko-c99-2.patch b/adobe-afdko-c99-2.patch deleted file mode 100644 index f02fe9f..0000000 --- a/adobe-afdko-c99-2.patch +++ /dev/null @@ -1,37 +0,0 @@ -Author: Sergei Trofimovich -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: - -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++; - } diff --git a/adobe-afdko.spec b/adobe-afdko.spec index b310e9b..6959fea 100644 --- a/adobe-afdko.spec +++ b/adobe-afdko.spec @@ -1,8 +1,9 @@ %global archivename afdko +%global antl4_ver 4.9.3 Name: adobe-afdko -Version: 3.6.1 -Release: 10%{?dist} +Version: 4.0.1 +Release: 1%{?dist} Summary: Adobe Font Development Kit for OpenType # ExternalAntlr4Cpp.cmake is BSD-3-clause # c/makeotf/makeotf_lib/build/hotpccts/pccts/* is ANTLR-PD @@ -11,11 +12,15 @@ Summary: Adobe Font Development Kit for OpenType 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 +Source1: https://www.antlr.org/download/antlr4-cpp-runtime-%{antl4_ver}-source.zip +Patch0: antlr4-cpp-runtime-%{antl4_ver}.patch +BuildRequires: gcc g++ BuildRequires: make - +BuildRequires: cmake +BuildRequires: libuuid-devel +BuildRequires: libxml2-devel +BuildRequires: utf8cpp-devel +Provides: bundled(antlr4-project) = %{antl4_ver} %description Adobe Font Development Kit for OpenType (AFDKO). The AFDKO is a set of tools for building OpenType font files @@ -23,19 +28,16 @@ from PostScript and TrueType font data. %prep %autosetup -p1 -n %{archivename}-%{version} +cp %{SOURCE1} . %build %set_build_flags export XFLAGS="${CFLAGS} ${LDFLAGS}" -pushd c -sh buildalllinux.sh release -popd +%cmake +%cmake_build %install -install -m 0755 -d %{buildroot}/%{_bindir} -pushd c/build_all -find ./ -type f -executable -exec install -p -m 0755 "{}" \ - %{buildroot}/%{_bindir} ";" +%cmake_install %files %license LICENSE.md @@ -43,6 +45,11 @@ find ./ -type f -executable -exec install -p -m 0755 "{}" \ %{_bindir}/* %changelog +* Tue Jun 25 2024 Manish Tiwari - 4.0.1-1 +- Updated to 4.0.1 release +- Switched to CMake build system +- Bundled antlr4-cpp-runtime-4.9.3 + * Thu Jan 25 2024 Benjamin A. Beasley - 3.6.1-10 - Fix a typo in the License expression - Fix build not respecting distribution compiler flags; this means executables diff --git a/antlr4-cpp-runtime-4.9.3.patch b/antlr4-cpp-runtime-4.9.3.patch new file mode 100644 index 0000000..49064c3 --- /dev/null +++ b/antlr4-cpp-runtime-4.9.3.patch @@ -0,0 +1,21 @@ +diff -ur afdko-4.0.1.orig/CMakeLists.txt afdko-4.0.1/CMakeLists.txt +--- afdko-4.0.1.orig/CMakeLists.txt 2024-01-17 05:55:45.000000000 +0530 ++++ afdko-4.0.1/CMakeLists.txt 2024-06-19 22:56:00.654124920 +0530 +@@ -18,7 +18,7 @@ + endif() + message(STATUS "Build type is ${CMAKE_BUILD_TYPE}") + +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 17) + + # scikit-build + if(SKBUILD) +@@ -34,7 +34,7 @@ + # encounter compiler problems and need to make small edits to compensate. Start + # with the Antlr project's sources, e.g. + # https://www.antlr.org/download/antlr4-cpp-runtime-4.9.3-source.zip +-# set(ANTLR4_ZIP_REPOSITORY "/path_to_antlr4_archive/a4.zip") ++ set(ANTLR4_ZIP_REPOSITORY "${CMAKE_CURRENT_SOURCE_DIR}/antlr4-cpp-runtime-4.9.3-source.zip") + + add_definitions(-DANTLR4CPP_STATIC) + set(ANTLR4_WITH_STATIC_CRT OFF) diff --git a/sources b/sources index 0370a30..60210f7 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (afdko-3.6.1.tar.gz) = 62d6625196c30508a7be2bfa751fdadba24c4391f2ec17e6a70c4445f2cc8772a9d40ff42e63b93c1f277d684460daafde16c1df6a53d75313c3968435f900a8 +SHA512 (afdko-4.0.1.tar.gz) = 0d0eca23b01f6f191340f8019fe665d29b44133327912f96c3999245921e1ce5bb10f777a9e25f27e8f9554c2fc7bf63a9fa91475109ee5c4e8dfcb873771b72 +SHA512 (antlr4-cpp-runtime-4.9.3-source.zip) = 23995a6fa661ff038142fa7220a195db3a9a26744d516011dedc3192f152b06a8e31f6cc8f969f8927b86392a960d03e89572e753f033f950839a5bd38d4c722 From 177ba4e92fbdad64300bcc951c06946aebcf9b16 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:36:48 +0000 Subject: [PATCH 09/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- adobe-afdko.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adobe-afdko.spec b/adobe-afdko.spec index 6959fea..1047b2a 100644 --- a/adobe-afdko.spec +++ b/adobe-afdko.spec @@ -3,7 +3,7 @@ Name: adobe-afdko Version: 4.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Adobe Font Development Kit for OpenType # ExternalAntlr4Cpp.cmake is BSD-3-clause # c/makeotf/makeotf_lib/build/hotpccts/pccts/* is ANTLR-PD @@ -45,6 +45,9 @@ export XFLAGS="${CFLAGS} ${LDFLAGS}" %{_bindir}/* %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 4.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jun 25 2024 Manish Tiwari - 4.0.1-1 - Updated to 4.0.1 release - Switched to CMake build system From 96710fb03f7db94269a2ae514385ba902e1eccff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:35:59 +0000 Subject: [PATCH 10/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- adobe-afdko.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adobe-afdko.spec b/adobe-afdko.spec index 1047b2a..555a34c 100644 --- a/adobe-afdko.spec +++ b/adobe-afdko.spec @@ -3,7 +3,7 @@ Name: adobe-afdko Version: 4.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Adobe Font Development Kit for OpenType # ExternalAntlr4Cpp.cmake is BSD-3-clause # c/makeotf/makeotf_lib/build/hotpccts/pccts/* is ANTLR-PD @@ -45,6 +45,9 @@ export XFLAGS="${CFLAGS} ${LDFLAGS}" %{_bindir}/* %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 4.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 4.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 75bf2e61a2f7ae3f744fc94b92d6f332436057d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:45:48 +0000 Subject: [PATCH 11/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- adobe-afdko.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adobe-afdko.spec b/adobe-afdko.spec index 555a34c..8cfec61 100644 --- a/adobe-afdko.spec +++ b/adobe-afdko.spec @@ -3,7 +3,7 @@ Name: adobe-afdko Version: 4.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Adobe Font Development Kit for OpenType # ExternalAntlr4Cpp.cmake is BSD-3-clause # c/makeotf/makeotf_lib/build/hotpccts/pccts/* is ANTLR-PD @@ -45,6 +45,9 @@ export XFLAGS="${CFLAGS} ${LDFLAGS}" %{_bindir}/* %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 4.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 4.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 6b68bda09fe0ca3727acd2aac216d5c4024470c5 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Fri, 30 May 2025 13:40:50 +0200 Subject: [PATCH 12/17] Update to 4.0.2 --- .gitignore | 1 + adobe-afdko-4.0.2-Disable_antlr_tests.patch | 28 +++++++++++++++++++++ adobe-afdko.spec | 21 ++++++++++------ antlr4-cpp-runtime-4.9.3.patch | 21 ---------------- sources | 4 +-- 5 files changed, 45 insertions(+), 30 deletions(-) create mode 100644 adobe-afdko-4.0.2-Disable_antlr_tests.patch delete mode 100644 antlr4-cpp-runtime-4.9.3.patch diff --git a/.gitignore b/.gitignore index 59aa180..760bf64 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ afdko-*tar.gz afdko-*/ /antlr4-cpp-runtime-4.9.3-source.zip +/antlr4-cpp-runtime-4.12.0-source.zip diff --git a/adobe-afdko-4.0.2-Disable_antlr_tests.patch b/adobe-afdko-4.0.2-Disable_antlr_tests.patch new file mode 100644 index 0000000..c172dbb --- /dev/null +++ b/adobe-afdko-4.0.2-Disable_antlr_tests.patch @@ -0,0 +1,28 @@ +diff -ru afdko-4.0.2/cmake/ExternalAntlr4Cpp.cmake afdko-4.0.2-new/cmake/ExternalAntlr4Cpp.cmake +--- afdko-4.0.2/cmake/ExternalAntlr4Cpp.cmake 2024-11-06 01:31:38.000000000 +0100 ++++ afdko-4.0.2-new/cmake/ExternalAntlr4Cpp.cmake 2025-06-03 12:18:04.193188997 +0200 +@@ -17,7 +17,7 @@ + elseif(${CMAKE_GENERATOR} MATCHES "Xcode.*") + set(ANTLR4_OUTPUT_DIR ${ANTLR4_ROOT}/runtime/Cpp/dist/$(CONFIGURATION)) + else() +- set(ANTLR4_OUTPUT_DIR ${ANTLR4_ROOT}/runtime/Cpp/dist) ++ set(ANTLR4_OUTPUT_DIR ${ANTLR4_ROOT}/runtime/Cpp/runtime) + endif() + + if(MSVC) +@@ -90,6 +90,7 @@ + -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} + -DWITH_STATIC_CRT:BOOL=${ANTLR4_WITH_STATIC_CRT} + -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES} ++ -DANTLR_BUILD_CPP_TESTS:BOOL=OFF + # -DCMAKE_CXX_STANDARD:STRING=17 # if desired, compile the runtime with a different C++ standard + # -DCMAKE_CXX_STANDARD:STRING=${CMAKE_CXX_STANDARD} # alternatively, compile the runtime with the same C++ standard as the outer project + INSTALL_COMMAND "" +@@ -109,6 +110,7 @@ + -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} + -DWITH_STATIC_CRT:BOOL=${ANTLR4_WITH_STATIC_CRT} + -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES} ++ -DANTLR_BUILD_CPP_TESTS:BOOL=OFF + # -DCMAKE_CXX_STANDARD:STRING=17 # if desired, compile the runtime with a different C++ standard + # -DCMAKE_CXX_STANDARD:STRING=${CMAKE_CXX_STANDARD} # alternatively, compile the runtime with the same C++ standard as the outer project + INSTALL_COMMAND "" diff --git a/adobe-afdko.spec b/adobe-afdko.spec index 8cfec61..097f775 100644 --- a/adobe-afdko.spec +++ b/adobe-afdko.spec @@ -1,9 +1,9 @@ %global archivename afdko -%global antl4_ver 4.9.3 +%global antl4_ver 4.12.0 Name: adobe-afdko -Version: 4.0.1 -Release: 4%{?dist} +Version: 4.0.2 +Release: 1%{?dist} Summary: Adobe Font Development Kit for OpenType # ExternalAntlr4Cpp.cmake is BSD-3-clause # c/makeotf/makeotf_lib/build/hotpccts/pccts/* is ANTLR-PD @@ -13,9 +13,11 @@ 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 Source1: https://www.antlr.org/download/antlr4-cpp-runtime-%{antl4_ver}-source.zip -Patch0: antlr4-cpp-runtime-%{antl4_ver}.patch +# Disable antlr tests (we can't run them anyway) +# When afdko properly supports FetchContent, this patch can be migrated to common -D flags +# https://github.com/adobe-type-tools/afdko/issues/1783 +Patch: adobe-afdko-4.0.2-Disable_antlr_tests.patch BuildRequires: gcc g++ -BuildRequires: make BuildRequires: cmake BuildRequires: libuuid-devel BuildRequires: libxml2-devel @@ -28,12 +30,12 @@ from PostScript and TrueType font data. %prep %autosetup -p1 -n %{archivename}-%{version} -cp %{SOURCE1} . %build %set_build_flags export XFLAGS="${CFLAGS} ${LDFLAGS}" -%cmake +%cmake \ + -DANTLR4_ZIP_REPOSITORY:PATH=%{SOURCE1} %cmake_build %install @@ -45,6 +47,11 @@ export XFLAGS="${CFLAGS} ${LDFLAGS}" %{_bindir}/* %changelog +* Tue Dec 09 2025 Cristian Le - 4.0.2-1 +- Updated to 4.0.2 release +- Bundled antlr4-cpp-runtime-4.12.0 +- Allow to build with CMake 4.0 + * Wed Jul 23 2025 Fedora Release Engineering - 4.0.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/antlr4-cpp-runtime-4.9.3.patch b/antlr4-cpp-runtime-4.9.3.patch deleted file mode 100644 index 49064c3..0000000 --- a/antlr4-cpp-runtime-4.9.3.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur afdko-4.0.1.orig/CMakeLists.txt afdko-4.0.1/CMakeLists.txt ---- afdko-4.0.1.orig/CMakeLists.txt 2024-01-17 05:55:45.000000000 +0530 -+++ afdko-4.0.1/CMakeLists.txt 2024-06-19 22:56:00.654124920 +0530 -@@ -18,7 +18,7 @@ - endif() - message(STATUS "Build type is ${CMAKE_BUILD_TYPE}") - --set(CMAKE_CXX_STANDARD 11) -+set(CMAKE_CXX_STANDARD 17) - - # scikit-build - if(SKBUILD) -@@ -34,7 +34,7 @@ - # encounter compiler problems and need to make small edits to compensate. Start - # with the Antlr project's sources, e.g. - # https://www.antlr.org/download/antlr4-cpp-runtime-4.9.3-source.zip --# set(ANTLR4_ZIP_REPOSITORY "/path_to_antlr4_archive/a4.zip") -+ set(ANTLR4_ZIP_REPOSITORY "${CMAKE_CURRENT_SOURCE_DIR}/antlr4-cpp-runtime-4.9.3-source.zip") - - add_definitions(-DANTLR4CPP_STATIC) - set(ANTLR4_WITH_STATIC_CRT OFF) diff --git a/sources b/sources index 60210f7..f4cfe11 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (afdko-4.0.1.tar.gz) = 0d0eca23b01f6f191340f8019fe665d29b44133327912f96c3999245921e1ce5bb10f777a9e25f27e8f9554c2fc7bf63a9fa91475109ee5c4e8dfcb873771b72 -SHA512 (antlr4-cpp-runtime-4.9.3-source.zip) = 23995a6fa661ff038142fa7220a195db3a9a26744d516011dedc3192f152b06a8e31f6cc8f969f8927b86392a960d03e89572e753f033f950839a5bd38d4c722 +SHA512 (afdko-4.0.2.tar.gz) = 3ed7a066a4821d2c2765769f18dd27be8af979f9d7f8760cc9578ff4887539616891ebe278b51e6749c9880edac5ea5b91a3caffc1b3743ae5c06fcac88eea3e +SHA512 (antlr4-cpp-runtime-4.12.0-source.zip) = 5326008406507e5d1f20fb3843763cf3e9a626c5d12f33921b69253fbcdd707e52a03b74bc166e91516fb0fe752a28ed536cb35e212b01471acb86133bfe4de0 From 56cf7f6e23b54f17495ae207f9917beac25db00c Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 9 Dec 2025 07:22:51 +0000 Subject: [PATCH 13/17] Updated to 4.0.3 release --- .gitignore | 1 + adobe-afdko-4.0.2-Disable_antlr_tests.patch | 28 --------------------- adobe-afdko.spec | 16 +++++++----- sources | 4 +-- 4 files changed, 13 insertions(+), 36 deletions(-) delete mode 100644 adobe-afdko-4.0.2-Disable_antlr_tests.patch diff --git a/.gitignore b/.gitignore index 760bf64..01db142 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ afdko-*tar.gz afdko-*/ /antlr4-cpp-runtime-4.9.3-source.zip /antlr4-cpp-runtime-4.12.0-source.zip +/antlr4-cpp-runtime-4.13.2-source.zip diff --git a/adobe-afdko-4.0.2-Disable_antlr_tests.patch b/adobe-afdko-4.0.2-Disable_antlr_tests.patch deleted file mode 100644 index c172dbb..0000000 --- a/adobe-afdko-4.0.2-Disable_antlr_tests.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ru afdko-4.0.2/cmake/ExternalAntlr4Cpp.cmake afdko-4.0.2-new/cmake/ExternalAntlr4Cpp.cmake ---- afdko-4.0.2/cmake/ExternalAntlr4Cpp.cmake 2024-11-06 01:31:38.000000000 +0100 -+++ afdko-4.0.2-new/cmake/ExternalAntlr4Cpp.cmake 2025-06-03 12:18:04.193188997 +0200 -@@ -17,7 +17,7 @@ - elseif(${CMAKE_GENERATOR} MATCHES "Xcode.*") - set(ANTLR4_OUTPUT_DIR ${ANTLR4_ROOT}/runtime/Cpp/dist/$(CONFIGURATION)) - else() -- set(ANTLR4_OUTPUT_DIR ${ANTLR4_ROOT}/runtime/Cpp/dist) -+ set(ANTLR4_OUTPUT_DIR ${ANTLR4_ROOT}/runtime/Cpp/runtime) - endif() - - if(MSVC) -@@ -90,6 +90,7 @@ - -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} - -DWITH_STATIC_CRT:BOOL=${ANTLR4_WITH_STATIC_CRT} - -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES} -+ -DANTLR_BUILD_CPP_TESTS:BOOL=OFF - # -DCMAKE_CXX_STANDARD:STRING=17 # if desired, compile the runtime with a different C++ standard - # -DCMAKE_CXX_STANDARD:STRING=${CMAKE_CXX_STANDARD} # alternatively, compile the runtime with the same C++ standard as the outer project - INSTALL_COMMAND "" -@@ -109,6 +110,7 @@ - -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} - -DWITH_STATIC_CRT:BOOL=${ANTLR4_WITH_STATIC_CRT} - -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES} -+ -DANTLR_BUILD_CPP_TESTS:BOOL=OFF - # -DCMAKE_CXX_STANDARD:STRING=17 # if desired, compile the runtime with a different C++ standard - # -DCMAKE_CXX_STANDARD:STRING=${CMAKE_CXX_STANDARD} # alternatively, compile the runtime with the same C++ standard as the outer project - INSTALL_COMMAND "" diff --git a/adobe-afdko.spec b/adobe-afdko.spec index 097f775..2dc56a2 100644 --- a/adobe-afdko.spec +++ b/adobe-afdko.spec @@ -1,8 +1,12 @@ %global archivename afdko -%global antl4_ver 4.12.0 +# Upstream actually uses a post-release snapshot of commit +# df4d68c09cdef73e023b8838a8bc7ca4dff1d1de “that addresses a missing include +# directive needed in more recent Visual Studio releases;” we should be able to +# get by with the release. +%global antl4_ver 4.13.2 Name: adobe-afdko -Version: 4.0.2 +Version: 4.0.3 Release: 1%{?dist} Summary: Adobe Font Development Kit for OpenType # ExternalAntlr4Cpp.cmake is BSD-3-clause @@ -13,10 +17,6 @@ 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 Source1: https://www.antlr.org/download/antlr4-cpp-runtime-%{antl4_ver}-source.zip -# Disable antlr tests (we can't run them anyway) -# When afdko properly supports FetchContent, this patch can be migrated to common -D flags -# https://github.com/adobe-type-tools/afdko/issues/1783 -Patch: adobe-afdko-4.0.2-Disable_antlr_tests.patch BuildRequires: gcc g++ BuildRequires: cmake BuildRequires: libuuid-devel @@ -47,6 +47,10 @@ export XFLAGS="${CFLAGS} ${LDFLAGS}" %{_bindir}/* %changelog +* Tue Dec 09 2025 Benjamin A. Beasley - 4.0.3-1 +- Updated to 4.0.3 release +- Bundled antlr4-cpp-runtime-4.13.2 + * Tue Dec 09 2025 Cristian Le - 4.0.2-1 - Updated to 4.0.2 release - Bundled antlr4-cpp-runtime-4.12.0 diff --git a/sources b/sources index f4cfe11..37e86c8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (afdko-4.0.2.tar.gz) = 3ed7a066a4821d2c2765769f18dd27be8af979f9d7f8760cc9578ff4887539616891ebe278b51e6749c9880edac5ea5b91a3caffc1b3743ae5c06fcac88eea3e -SHA512 (antlr4-cpp-runtime-4.12.0-source.zip) = 5326008406507e5d1f20fb3843763cf3e9a626c5d12f33921b69253fbcdd707e52a03b74bc166e91516fb0fe752a28ed536cb35e212b01471acb86133bfe4de0 +SHA512 (afdko-4.0.3.tar.gz) = 81ff16b7f2b1103032871cf6ecc6074de0b7b0b7e2bdcd1a6878601f77a831f02c7eb02e8db7e5a7cee169fa991c5563050cc875074355b807857ad51c8a8c87 +SHA512 (antlr4-cpp-runtime-4.13.2-source.zip) = 2a67afaa6ef0d0b56455850caabc94042785a07036f53b5a195cfb105d9441d89a155dcd9c089da4344a644fa73a01da071a89266340dce621901e0c47233faa From a52d7a83f593cd573e04eb1201edb9cfd111bc91 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 9 Dec 2025 10:09:55 +0000 Subject: [PATCH 14/17] List packaged executables explicitly Avoid globbing everything in a shared directory, https://docs.fedoraproject.org/en-US/packaging-guidelines/#_explicit_lists. --- adobe-afdko.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/adobe-afdko.spec b/adobe-afdko.spec index 2dc56a2..2b3c722 100644 --- a/adobe-afdko.spec +++ b/adobe-afdko.spec @@ -44,12 +44,21 @@ export XFLAGS="${CFLAGS} ${LDFLAGS}" %files %license LICENSE.md %doc docs/ README.md NEWS.md -%{_bindir}/* +%{_bindir}/detype1 +%{_bindir}/makeotfexe +%{_bindir}/mergefonts +%{_bindir}/rotatefont +%{_bindir}/sfntdiff +%{_bindir}/sfntedit +%{_bindir}/spot +%{_bindir}/tx +%{_bindir}/type1 %changelog * Tue Dec 09 2025 Benjamin A. Beasley - 4.0.3-1 - Updated to 4.0.3 release - Bundled antlr4-cpp-runtime-4.13.2 +- List packaged executables explicitly * Tue Dec 09 2025 Cristian Le - 4.0.2-1 - Updated to 4.0.2 release From ad32155a6cbc790d9698afe9d6c912a31258922d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 9 Dec 2025 10:26:33 +0000 Subject: [PATCH 15/17] Correct/update and better document the License expression --- adobe-afdko.spec | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/adobe-afdko.spec b/adobe-afdko.spec index 2b3c722..8db9d90 100644 --- a/adobe-afdko.spec +++ b/adobe-afdko.spec @@ -9,11 +9,25 @@ Name: adobe-afdko Version: 4.0.3 Release: 1%{?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 +# Everything is Apache-2.0 except: +# +# The following would affect the license of a python3-afdko subpackage, which +# we currently don’t have. +# +# - License of afdko-3.6.1/python/afdko/pdflib/pdfgen.py is said to be “same as +# the Python license,” which would seem to suggest Python-2.0.1, but the +# license text matches MIT-CMU. +# - Contents of python/afdko/resources/ are derived from adobe-mappings-cmap +# and share its BSD-3-Clause license. +# +# The following do not affect the licenses of the binary RPMs. +# +# - ExternalAntlr4Cpp.cmake is BSD-3-Clause, as noted in LICENSE.md, but this +# is a build-system file and does not affect the licenses of the binary RPMs +# - Various fonts and other test data files are OFL-1.1 (and/or +# OFL-1.0-RFN/OFL-1.0-no-RFN?), but do not contribute to the licenses of the +# binary RPMs +License: Apache-2.0 URL: https://github.com/adobe-type-tools/afdko Source0: https://github.com/adobe-type-tools/%{archivename}/releases/download/%{version}/%{archivename}-%{version}.tar.gz Source1: https://www.antlr.org/download/antlr4-cpp-runtime-%{antl4_ver}-source.zip @@ -59,6 +73,7 @@ export XFLAGS="${CFLAGS} ${LDFLAGS}" - Updated to 4.0.3 release - Bundled antlr4-cpp-runtime-4.13.2 - List packaged executables explicitly +- Correct/update and better document the License expression * Tue Dec 09 2025 Cristian Le - 4.0.2-1 - Updated to 4.0.2 release From 414aee74cf05dbdbe62975e805c0b7caa3e4439c Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 9 Dec 2025 10:38:29 +0000 Subject: [PATCH 16/17] Reduce unhelpful macro indirection --- adobe-afdko.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/adobe-afdko.spec b/adobe-afdko.spec index 8db9d90..3764765 100644 --- a/adobe-afdko.spec +++ b/adobe-afdko.spec @@ -1,4 +1,3 @@ -%global archivename afdko # Upstream actually uses a post-release snapshot of commit # df4d68c09cdef73e023b8838a8bc7ca4dff1d1de “that addresses a missing include # directive needed in more recent Visual Studio releases;” we should be able to @@ -29,7 +28,7 @@ Summary: Adobe Font Development Kit for OpenType # binary RPMs License: Apache-2.0 URL: https://github.com/adobe-type-tools/afdko -Source0: https://github.com/adobe-type-tools/%{archivename}/releases/download/%{version}/%{archivename}-%{version}.tar.gz +Source0: %{url}/releases/download/%{version}/afdko-%{version}.tar.gz Source1: https://www.antlr.org/download/antlr4-cpp-runtime-%{antl4_ver}-source.zip BuildRequires: gcc g++ BuildRequires: cmake @@ -43,7 +42,7 @@ The AFDKO is a set of tools for building OpenType font files from PostScript and TrueType font data. %prep -%autosetup -p1 -n %{archivename}-%{version} +%autosetup -p1 -n afdko-%{version} %build %set_build_flags From 4cb063d4f04ba8a340410054ebe9367ed9a9cce8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:27:16 +0000 Subject: [PATCH 17/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- adobe-afdko.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adobe-afdko.spec b/adobe-afdko.spec index 3764765..783b15a 100644 --- a/adobe-afdko.spec +++ b/adobe-afdko.spec @@ -6,7 +6,7 @@ Name: adobe-afdko Version: 4.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Adobe Font Development Kit for OpenType # Everything is Apache-2.0 except: # @@ -68,6 +68,9 @@ export XFLAGS="${CFLAGS} ${LDFLAGS}" %{_bindir}/type1 %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 4.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Tue Dec 09 2025 Benjamin A. Beasley - 4.0.3-1 - Updated to 4.0.3 release - Bundled antlr4-cpp-runtime-4.13.2