diff options
| author |   Robby Workman <rworkman@slackbuilds.org> | 2012-08-17 23:43:05 -0500 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2012-08-17 23:43:05 -0500 |
| commit | cb24263cc215e8a1f2700ecfe24d9cdf7f9fde58 (patch) | |
| tree | 68c9b6da5bb72f719bd35ae18b59e66f5b5aba04 /graphics | |
| parent | a92169ee85357a9cc3b3b52319b44b9291b1aeed (diff) | |
| download | slackbuilds-cb24263cc215e8a1f2700ecfe24d9cdf7f9fde58.tar.gz slackbuilds-cb24263cc215e8a1f2700ecfe24d9cdf7f9fde58.tar.xz | |
graphics/fontmatrix: Use icu4c regardless during build
icu4c is now part of Slackware 14.0
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/fontmatrix/README | 5 | ||||
| -rw-r--r-- | graphics/fontmatrix/fontmatrix.SlackBuild | 12 |
2 files changed, 4 insertions, 13 deletions
diff --git a/graphics/fontmatrix/README b/graphics/fontmatrix/README index 9cacac854c..4b7ab8f518 100644 --- a/graphics/fontmatrix/README +++ b/graphics/fontmatrix/README @@ -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. diff --git a/graphics/fontmatrix/fontmatrix.SlackBuild b/graphics/fontmatrix/fontmatrix.SlackBuild index 7f6451642c..a0177b0317 100644 --- a/graphics/fontmatrix/fontmatrix.SlackBuild +++ b/graphics/fontmatrix/fontmatrix.SlackBuild @@ -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" \ |