diff --git a/.gitignore b/.gitignore index 01db142..59aa180 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ 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.spec b/adobe-afdko.spec index 783b15a..1047b2a 100644 --- a/adobe-afdko.spec +++ b/adobe-afdko.spec @@ -1,36 +1,21 @@ -# 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 +%global archivename afdko +%global antl4_ver 4.9.3 Name: adobe-afdko -Version: 4.0.3 +Version: 4.0.1 Release: 2%{?dist} Summary: Adobe Font Development Kit for OpenType -# 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 +# 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: %{url}/releases/download/%{version}/afdko-%{version}.tar.gz +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 BuildRequires: gcc g++ +BuildRequires: make BuildRequires: cmake BuildRequires: libuuid-devel BuildRequires: libxml2-devel @@ -42,13 +27,13 @@ The AFDKO is a set of tools for building OpenType font files from PostScript and TrueType font data. %prep -%autosetup -p1 -n afdko-%{version} +%autosetup -p1 -n %{archivename}-%{version} +cp %{SOURCE1} . %build %set_build_flags export XFLAGS="${CFLAGS} ${LDFLAGS}" -%cmake \ - -DANTLR4_ZIP_REPOSITORY:PATH=%{SOURCE1} +%cmake %cmake_build %install @@ -57,37 +42,9 @@ export XFLAGS="${CFLAGS} ${LDFLAGS}" %files %license LICENSE.md %doc docs/ README.md NEWS.md -%{_bindir}/detype1 -%{_bindir}/makeotfexe -%{_bindir}/mergefonts -%{_bindir}/rotatefont -%{_bindir}/sfntdiff -%{_bindir}/sfntedit -%{_bindir}/spot -%{_bindir}/tx -%{_bindir}/type1 +%{_bindir}/* %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 -- 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 -- 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 - -* 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 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 37e86c8..60210f7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (afdko-4.0.3.tar.gz) = 81ff16b7f2b1103032871cf6ecc6074de0b7b0b7e2bdcd1a6878601f77a831f02c7eb02e8db7e5a7cee169fa991c5563050cc875074355b807857ad51c8a8c87 -SHA512 (antlr4-cpp-runtime-4.13.2-source.zip) = 2a67afaa6ef0d0b56455850caabc94042785a07036f53b5a195cfb105d9441d89a155dcd9c089da4344a644fa73a01da071a89266340dce621901e0c47233faa +SHA512 (afdko-4.0.1.tar.gz) = 0d0eca23b01f6f191340f8019fe665d29b44133327912f96c3999245921e1ce5bb10f777a9e25f27e8f9554c2fc7bf63a9fa91475109ee5c4e8dfcb873771b72 +SHA512 (antlr4-cpp-runtime-4.9.3-source.zip) = 23995a6fa661ff038142fa7220a195db3a9a26744d516011dedc3192f152b06a8e31f6cc8f969f8927b86392a960d03e89572e753f033f950839a5bd38d4c722