dev-util/afdko: add 3.9.5, drop 3.8.1

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
This commit is contained in:
Anna (cybertailor) Vyalkova
2023-03-01 05:56:00 +05:00
parent 00531b67e3
commit f19640e484
5 changed files with 102 additions and 124 deletions

View File

@@ -1 +1,2 @@
DIST afdko-3.8.1.gh.tar.gz 14290160 BLAKE2B 17cfe6666d5b981bff9b8e41e58ac511d04add7408636782ea8c2ad94af36129d58eda2016af5542825f64a62d79fb1ea3e02e9af8dca4df072bb2abbe67032d SHA512 543f4909a8859e71c11629c35f41de56bcc2bc6d0fe217fa467660783cf3dbb7be9f1dc8e890944d90c8ed4f8da7b97a72e9cd6c6fe528e70dbac300fd5244f3
DIST afdko-3.9.5.tar.gz 16271188 BLAKE2B 32e087a1fee448dc647fbb4a68021a2958806f9d437b48d53fbd46229588051402efcf7e3effea937877f0ad99b42da55e34fef80abd3673be4861b506c2828e SHA512 1d03a756a5201389daaa4cbf660866b72f20046d282e45858a7b0e00090c45fe00eae055019ad24f741c723c59c7d1651bd204c7d18ff12677f74d077836db54
DIST antlr-cpp-4.9.3.zip 488286 BLAKE2B de266a29487f1edcb5c9113df12a5c1f8c1883e1aae5572d5e16dc559767692a6742892157a824aafc9d4a12640090e02d8b1f4d9774a4d7bef7c2d32f383d55 SHA512 23995a6fa661ff038142fa7220a195db3a9a26744d516011dedc3192f152b06a8e31f6cc8f969f8927b86392a960d03e89572e753f033f950839a5bd38d4c722

View File

@@ -1,76 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_10 )
inherit distutils-r1
DESCRIPTION="Adobe Font Development Kit for OpenType"
HOMEPAGE="
https://adobe-type-tools.github.io/afdko/
https://github.com/adobe-type-tools/afdko
"
SRC_URI="https://github.com/adobe-type-tools/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
KEYWORDS="~amd64"
LICENSE="Apache-2.0"
SLOT="0"
COMMON_DEPEND="
>=app-arch/brotli-1.0.1[python,${PYTHON_USEDEP}]
>=app-arch/zopfli-0.1.4
dev-cpp/antlr-cpp:4
"
RDEPEND="${COMMON_DEPEND}
>=dev-python/booleanOperations-0.9.0[${PYTHON_USEDEP}]
>=dev-python/brotlicffi-0.8.0[${PYTHON_USEDEP}]
>=dev-python/defcon-0.9.0[${PYTHON_USEDEP}]
>=dev-python/fontMath-0.8.1[${PYTHON_USEDEP}]
dev-python/fontPens[${PYTHON_USEDEP}]
>=dev-python/fonttools-4.26.2[${PYTHON_USEDEP}]
>=dev-python/fs-2.2.0[${PYTHON_USEDEP}]
>=dev-python/lxml-4.8.0[${PYTHON_USEDEP}]
>=dev-python/psautohint-2.3.1[${PYTHON_USEDEP}]
>=dev-python/tqdm-4.62.2[${PYTHON_USEDEP}]
>=dev-python/ufoNormalizer-0.6.0[${PYTHON_USEDEP}]
>=dev-python/ufoProcessor-1.9.0[${PYTHON_USEDEP}]
!app-i18n/transifex-client
" # file collisions with app-i18n/transifex-client
DEPEND="${COMMON_DEPEND}
>=dev-python/cython-0.29.5[${PYTHON_USEDEP}]
>=dev-python/scikit-build-0.11.1[${PYTHON_USEDEP}]
"
BDEPEND="
>=dev-python/setuptools-scm-3.2.0[${PYTHON_USEDEP}]
dev-util/ninja
dev-util/cmake
"
DOCS=( {README,NEWS}.md docs )
PATCHES=(
"${FILESDIR}/${P}-no-cmake-ninja-deps.patch"
"${FILESDIR}/${P}-antlr.patch"
)
EPYTEST_DESELECT=( tests/makeotf_test.py::test_writeOptionsFile )
distutils_enable_tests pytest
pkg_setup() {
export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
}
python_prepare_all() {
rm docs/*.{yml,plist} || die
distutils-r1_python_prepare_all
}
python_test() {
local -x PYTHONPATH="${S}/python:${PYTHONPATH}"
local -x PATH="${BUILD_DIR}/test/scripts:${S}/c/build_all:${PATH}"
epytest
}

View File

@@ -0,0 +1,94 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{9..11} )
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1 pypi
ANTLR_PV="4.9.3"
ANTLR_P="antlr-cpp-${ANTLR_PV}"
DESCRIPTION="Adobe Font Development Kit for OpenType"
HOMEPAGE="
https://adobe-type-tools.github.io/afdko/
https://pypi.org/project/afdko/
https://github.com/adobe-type-tools/afdko
"
SRC_URI+=" https://www.antlr.org/download/antlr4-cpp-runtime-${ANTLR_PV}-source.zip -> ${ANTLR_P}.zip"
KEYWORDS="~amd64"
LICENSE="Apache-2.0 BSD"
SLOT="0"
# requirements.txt
# ================
#
# fontTools[unicode]
# - dev-python/unicodedata2
# fontTools[woff]
# - app-arch/brotli[python] (for CPython)
# - dev-python/brotlicffi (for PyPy3)
# - dev-python/zopfli
# fontTools[lxml]
# - dev-python/lxml
# fontTools[ufo]
# - dev-python/fs
#
# defcon[lxml]
# - dev-python/lxml
# defcon[pens]
# - dev-python/fontPens
#
# Blockers
# ========
#
# app-i18n/transifex-client: file collision
DEPEND="dev-libs/libxml2:2"
RDEPEND="${DEPEND}
>=app-arch/brotli-1.0.1[python,${PYTHON_USEDEP}]
>=dev-python/booleanOperations-0.9.0[${PYTHON_USEDEP}]
>=dev-python/defcon-0.10.2[${PYTHON_USEDEP}]
>=dev-python/fontMath-0.9.3[${PYTHON_USEDEP}]
>=dev-python/fontPens-0.1.0[${PYTHON_USEDEP}]
>=dev-python/fonttools-4.38.0[${PYTHON_USEDEP}]
>=dev-python/fs-2.2.0[${PYTHON_USEDEP}]
>=dev-python/lxml-4.9.2[${PYTHON_USEDEP}]
>=dev-python/psautohint-2.4.0[${PYTHON_USEDEP}]
>=dev-python/tqdm-4.64.1[${PYTHON_USEDEP}]
>=dev-python/ufoNormalizer-0.6.1[${PYTHON_USEDEP}]
>=dev-python/ufoProcessor-1.9.0[${PYTHON_USEDEP}]
>=dev-python/zopfli-0.1.4[${PYTHON_USEDEP}]
$(python_gen_cond_dep \
'>=dev-python/unicodedata2-14.0.0[${PYTHON_USEDEP}]' \
python3_{9..10})
!app-i18n/transifex-client
"
BDEPEND="
app-arch/unzip
>=dev-python/scikit-build-0.11.1[${PYTHON_USEDEP}]
>=dev-python/setuptools-scm-3.2.0[${PYTHON_USEDEP}]
"
DOCS=( {README,NEWS}.md docs )
PATCHES=(
"${FILESDIR}/${PN}-3.9.5-no-cmake-ninja-deps.patch"
)
EEPYTEST_DESELECT=( tests/makeotf_test.py::test_writeOptionsFile )
distutils_enable_tests pytest
src_prepare() {
rm docs/*.{yml,plist} || die
distutils-r1_src_prepare
}
src_configure() {
DISTUTILS_ARGS=( -DANTLR4_ZIP_REPOSITORY="${DISTDIR}/${ANTLR_P}.zip" )
export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
distutils-r1_src_configure
}

View File

@@ -1,39 +0,0 @@
--- a/c/makeotf/lib/hotconv/CMakeLists.txt
+++ b/c/makeotf/lib/hotconv/CMakeLists.txt
@@ -68,8 +68,8 @@
)
set_property(TARGET hotconv PROPERTY C_STANDARD 99)
-target_include_directories(hotconv PRIVATE AFTER $<$<COMPILE_LANGUAGE:CXX>:${ANTLR4_INCLUDE_DIRS}>)
-target_link_libraries(hotconv PUBLIC antlr4_static)
+target_include_directories(hotconv PUBLIC /usr/include/antlr4-runtime)
+target_link_libraries(hotconv PUBLIC -lantlr4-runtime)
if ( CMAKE_COMPILER_IS_GNUCC )
target_compile_options(hotconv PRIVATE -Wall -Wno-attributes)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,23 +27,6 @@
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-# Antlr 4 configuration
-
-# This is an alternate way of supplying the Antlr 4 sources that will override
-# the git clone of the tag listed below. This is especially useful if you
-# 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.2-source.zip
-# set(ANTLR4_ZIP_REPOSITORY "/path_to_antlr4_archive/a4.zip")
-
-add_definitions(-DANTLR4CPP_STATIC)
-set(ANTLR4_WITH_STATIC_CRT OFF)
-# Use slightly more recent commit than 4.9.2 to deal with utfcpp test
-# compilation problems
-# set(ANTLR4_TAG tags/4.9.2)
-set(ANTLR4_TAG 916f03366edf15bf8b50010b11d479c189bf9f96)
-include(ExternalAntlr4Cpp)
-
# sanitizer support
# work around https://github.com/pypa/setuptools/issues/1928 with environment
# variable

View File

@@ -1,26 +1,24 @@
Drop CMake and Ninja dependencies
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,9 +3,7 @@
"setuptools",
@@ -4,8 +4,6 @@ requires = [
"wheel",
"setuptools_scm",
- "scikit-build",
"scikit-build",
- "cmake",
- "ninja"
+ "scikit-build"
]
build-backend = "setuptools.build_meta"
--- a/setup.py
+++ b/setup.py
@@ -196,9 +196,7 @@
setup_requires=[
@@ -197,8 +197,6 @@ def main():
'wheel',
'setuptools_scm',
- 'scikit-build',
'scikit-build',
- 'cmake',
- 'ninja'
+ 'scikit-build'
],
tests_require=[
'pytest',