summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/fontforge/README6
-rw-r--r--graphics/fontforge/fontforge.SlackBuild57
-rw-r--r--graphics/fontforge/fontforge.info18
3 files changed, 44 insertions, 37 deletions
diff --git a/graphics/fontforge/README b/graphics/fontforge/README
index 218367cd09..d6e6a74c15 100644
--- a/graphics/fontforge/README
+++ b/graphics/fontforge/README
@@ -4,4 +4,8 @@ bitmap (bdf, FON, NFNT) fonts, or edit existing ones. It also lets you
convert one format to another. FontForge has support for many Macintosh
font formats.
-NOTE: please remove previous version before building new version.
+NOTE: please remove previous version before building a new version.
+
+OPTIONAL
+
+Sphinx: for building documentation. Automatically detected.
diff --git a/graphics/fontforge/fontforge.SlackBuild b/graphics/fontforge/fontforge.SlackBuild
index 7c7b14538c..e811f37a5c 100644
--- a/graphics/fontforge/fontforge.SlackBuild
+++ b/graphics/fontforge/fontforge.SlackBuild
@@ -24,6 +24,9 @@
# Currently maintained by David Woodfall <dave@slackbuilds.org>
#
+# 2022-02-08 19:11:35 +0000,20201107
+# Switch to cmake
+#
# 2020-10-12 20:48:40 +0100:
# Update to Version ff 20190801, gnulib 20200505~0747bf0
# Added --without-libuninameslist
@@ -31,22 +34,26 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=fontforge
-VERSION=${VERSION:-20190801}
+VERSION=${VERSION:-20201107}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
ENABLE_BCINT=${ENABLE_BCINT:-yes}
-FREETYPE=${FREETYPE:-2.10.0}
-GNULIB=${GNULIB:-20200505~0747bf0}
-UTHASH=${UTHASH:-2.1.0}
+FREETYPE=${FREETYPE:-2.11.1}
+GNULIB=${GNULIB:-0.1}
+UTHASH=${UTHASH:-2.3.0}
-if [ -e $( echo /var/log/packages/$PRGNAM-*-*-* ) ]; then
+if [ -f "$( echo /var/lib/pkgtools/packages/$PRGNAM-*-*-* )" ]; then
echo "Please uninstall any previous versions of $PRGNAM first."
echo "Exiting."
exit 1
fi
+if [ -x /usr/bin/sphinx-build ]; then
+ DOCS=ON
+fi
+
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i586 ;;
@@ -88,37 +95,32 @@ mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION freetype-$FREETYPE
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-tar xvf $CWD/freetype-$FREETYPE.tar.bz2
+tar xvf $CWD/freetype-$FREETYPE.tar.xz
chown -R root:root $PRGNAM-$VERSION freetype-$FREETYPE
chmod -R u+w,go+r-w,a-s $PRGNAM-$VERSION freetype-$FREETYPE
cd $PRGNAM-$VERSION
-tar xvf $CWD/gnulib_$GNULIB.orig.tar.gz
+tar xvf $CWD/gnulib-$GNULIB.tar.gz
tar xvf $CWD/uthash-$UTHASH.tar.gz
mv gnulib-"$GNULIB" gnulib
mv uthash-"$UTHASH" uthash
chown -R root:root gnulib uthash
chmod -R u+w,go+r-w,a-s gnulib uthash
-./bootstrap -f
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --with-x \
- --with-freetype-source=$TMP/freetype-${FREETYPE} \
- --enable-python-extension \
- --enable-tile-path \
- --enable-static=no \
- --enable-shared=yes \
- --without-libuninameslist \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+mkdir -p build
+cd build
+ cmake \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+ -DMAN_INSTALL_DIR=/usr/man \
+ -DENABLE_LIBSPIRO=OFF \
+ -DENABLE_LIBUNINAMESLIST=OFF \
+ -DENABLE_DOCS=${DOCS:-OFF} \
+ -DCMAKE_BUILD_TYPE=Release ..
+ make
+ make install DESTDIR=$PKG
+cd ..
# Let's add the cidmaps
mkdir -p $PKG/usr/share/fontforge
@@ -131,6 +133,7 @@ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
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
+mv $PKG/usr/share/man $PKG/usr
find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
diff --git a/graphics/fontforge/fontforge.info b/graphics/fontforge/fontforge.info
index 50f91001a7..36ce98e00d 100644
--- a/graphics/fontforge/fontforge.info
+++ b/graphics/fontforge/fontforge.info
@@ -1,16 +1,16 @@
PRGNAM="fontforge"
-VERSION="20190801"
+VERSION="20201107"
HOMEPAGE="http://fontforge.sourceforge.net"
-DOWNLOAD="https://github.com/fontforge/fontforge/releases/download/20190801/fontforge-20190801.tar.gz \
+DOWNLOAD="https://github.com/fontforge/fontforge/archive/20201107/fontforge-20201107.tar.gz \
http://studioware.org/files/slackbuilds/source/cidmaps.tgz \
- https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.10.0.tar.bz2 \
- http://studioware.org/files/slackbuilds/source/gnulib_20200505~0747bf0.orig.tar.gz \
- https://github.com/troydhanson/uthash/archive/v2.1.0/uthash-2.1.0.tar.gz"
-MD5SUM="5d845f6092b8c3342473ff64bc8ee70c \
+ https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.11.1.tar.xz \
+ https://github.com/coreutils/gnulib/archive/v0.1/gnulib-0.1.tar.gz \
+ https://github.com/troydhanson/uthash/archive/v2.3.0/uthash-2.3.0.tar.gz"
+MD5SUM="adf8fb57cdab2ec9bf74c0ac0280d2f2 \
063691163e592515b31514515bb3ce8c \
- a717e6925b61b9dda946322ecd278a42 \
- 82044230e40ba6b43d0aef70076167e5 \
- 4d0a33f6393260926032f1fad4bad39a"
+ 24e79233d607ded439ef36ff1f3ab68f \
+ 8f90891de739aeb229295f4a799a18f6 \
+ 9a4f0a675ca179b62ebc56b2dd8b59ee"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""