From 75bf2e61a2f7ae3f744fc94b92d6f332436057d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:45:48 +0000 Subject: [PATCH 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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