commit 2c567a721a15ffc9cf9a5161a3885507bc5dd2f3 Author: Danny Rawlins <monster.romster@gmail.com> Date: Sun Jun 7 20:02:12 2020 +1000 fontforge: update cmake syntax and disable html pages diff --git a/fontforge/.signature b/fontforge/.signature index 7866fa805..c8658ec86 100644 --- a/fontforge/.signature +++ b/fontforge/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3wLveGqnC9hSosxN4n3dt6VgZ8fjBetTrSTqOrabRK2fH+Vm2QM6RYxLwyqGLW9KgR8LjjuQj+JVzFF/3P5GTAQ= -SHA256 (Pkgfile) = e01d19b8cc314ea0bfe9dcd3aed1105c16356fc645d17ed741e22207db156f6d +RWSagIOpLGJF3/1vZwM/wapPTPcGRVgduVEm7kWtaTwnWvJvSuSxmHXJMU6nxHApPmCE/wbNdrLUHQyceDCZXuk2n+uhRRMxuAA= +SHA256 (Pkgfile) = a2792bd462a7568ee79b43c209f30f447929c63634effbcac0e13cc4bc5e0c1b SHA256 (.footprint) = 80b6d4704b9b3301d4cb5d12f9005f85cde727bc002c4a47f2772160f0cfa56c SHA256 (fontforge-20200314.tar.xz) = cd190b237353dc3f48ddca7b0b3439da8ec4fcf27911d14cc1ccc76c1a47c861 diff --git a/fontforge/Pkgfile b/fontforge/Pkgfile index dfa9f0025..5013625db 100644 --- a/fontforge/Pkgfile +++ b/fontforge/Pkgfile @@ -9,27 +9,22 @@ release=1 source=(https://github.com/$name/$name/releases/download/$version/$name-$version.tar...) build() { - cd $name-$version - if [ -e '/usr/lib/ccache' ]; then PKGMK_FONTFORGE+=' -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache' PATH=$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//') fi - mkdir build - cd build - - cmake .. ${PKGMK_FONTFORGE} \ + cmake -S$name-$version -Bbuild -GNinja ${PKGMK_FONTFORGE} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=/usr/lib \ -DCMAKE_BUILD_TYPE=Release \ -DENABLE_MAINTAINER_TOOLS=TRUE \ -DENABLE_FONTFORGE_EXTRAS=TRUE \ -DUNIX=TRUE \ - -GNinja + -DENABLE_DOCS=FALSE - ninja -j ${JOBS:-1} - DESTDIR=$PKG ninja install + cmake --build build + DESTDIR=$PKG cmake --build build --target install rm -r $PKG/usr/share/locale }