diff options
| -rw-r--r-- | system/afdko/afdko.SlackBuild | 31 | ||||
| -rw-r--r-- | system/afdko/afdko.info | 8 |
2 files changed, 9 insertions, 30 deletions
diff --git a/system/afdko/afdko.SlackBuild b/system/afdko/afdko.SlackBuild index 30874696745f3..ff2695274cfa5 100644 --- a/system/afdko/afdko.SlackBuild +++ b/system/afdko/afdko.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=afdko -VERSION=${VERSION:-3.8.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-3.8.3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -79,30 +79,14 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# These fixes are a bit of a forceful attack on cmake files but seem to -# work for now. -# -# 1 cmake tries to download a few things while building. -# 2 then ld tries to link to the static library it thinks has -# been downloaded and built. - -# stop trying to git clone antlr4 -sed -i "/include(ExternalAntlr4Cpp)/d - /ExternalProject_Add_Step/d" CMakeLists.txt - -# add antlr4 include dir mkdir -p build cd build cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -I/usr/include/antlr4-runtime" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -I/usr/include/antlr4-runtime" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release .. -# fix linking #1 -sed -i "s,antlr4_static,antlr4-runtime," \ - c/makeotf/source/CMakeFiles/makeotfexe.dir/link.txt - make make install/strip DESTDIR=$PKG cd .. @@ -111,12 +95,7 @@ cd .. sed -i "/'cmake',/d /'ninja'/d" setup.py -# fix linking #2 -sed -i "s,antlr4_static,antlr4-runtime,g" \ - c/makeotf/lib/hotconv/CMakeLists.txt - -CXXFLAGS="$SLKCFLAGS -I/usr/include/antlr4-runtime" \ - python3 setup.py install --root=$PKG +python3 setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/system/afdko/afdko.info b/system/afdko/afdko.info index e0db54f7f44ce..0126f5a556b15 100644 --- a/system/afdko/afdko.info +++ b/system/afdko/afdko.info @@ -1,10 +1,10 @@ PRGNAM="afdko" -VERSION="3.8.0" +VERSION="3.8.3" HOMEPAGE="https://github.com/adobe-type-tools/afdko/" -DOWNLOAD="https://github.com/adobe-type-tools/afdko/releases/download/3.8.0/afdko-3.8.0.tar.gz" -MD5SUM="b74fd869589bd672e9c50ab73a169e4e" +DOWNLOAD="https://github.com/adobe-type-tools/afdko/releases/download/3.8.3/afdko-3.8.3.tar.gz" +MD5SUM="5aa7305cf8ac232fc6c01da3fb621319" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python-fonttools wheel scikit-build lxml antlr4" +REQUIRES="python-fonttools wheel scikit-build lxml tqdm" MAINTAINER="Duncan Roe" EMAIL="duncan_roe@optusnet.com.au" |