graphics/fontmatrix: Use icu4c regardless during build

icu4c is now part of Slackware 14.0

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
This commit is contained in:
Robby Workman 2012-08-17 23:43:05 -05:00
parent a92169ee85
commit cb24263cc2
2 changed files with 4 additions and 13 deletions

View file

@ -12,7 +12,6 @@ it creates a nice PDF catalogue of user's fonts for printing or
reference. In short, fontmatrix is a font manager for professionals,
but is nice and user friendly.
This package can optionally use podofo and icu4c if installed before
This package can optionally use podofo if it is installed before
compile time. To use podofo then pass HAVE_PODOFO="yes" to the
slackbuild. Alternatively, or in addition to podofo, you can pass
HAVE_ICU="yes" to the slackbuild for icu4c support.
slackbuild.

View file

@ -38,8 +38,7 @@ else
LIBDIRSUFFIX=""
fi
# Decide if we compile fontmatrix with icu4c and/or podofo support. Default is no.
HAVE_ICU=${HAVE_ICU:-no}
# Decide if we compile fontmatrix with podofo support. Default is no.
HAVE_PODOFO=${HAVE_PODOFO:-no}
set -e
@ -65,13 +64,6 @@ patch -p1 < $CWD/fix-podofo-detection.patch
PYVER=$(python -c 'import sys; print sys.version[:3]')
PY_LIB_SHARED="/usr/lib${LIBDIRSUFFIX}/libpython${PYVER}.so"
# Decide if we use ICU.
if [ "${HAVE_ICU}" == "yes" ]; then
USE_ICU="TRUE"
else
USE_ICU="FALSE"
fi
# Decide if we use PODOFO.
if [ "${HAVE_PODOFO}" == "yes" ]; then
USE_PODOFO="TRUE"
@ -87,7 +79,7 @@ mkdir build && cd build
-DOWN_SHAPER:BOOL=1 \
-DCMAKE_SKIP_RPATH:BOOL=1 \
-DRPATH_STYLE:STRING=none \
-DWANT_ICU:BOOL="$USE_ICU" \
-DWANT_ICU:BOOL=true \
-DWANT_M17N:BOOL=true \
-DWANT_PYTHONQT:BOOL=true \
-DWANT_PODOFO:BOOL="$USE_PODOFO" \