5 files changed, 73 insertions, 18 deletions
diff --git a/graphics/fontmatrix/README b/graphics/fontmatrix/README
index 25c89a8c04..5b2a0626ea 100644
--- a/graphics/fontmatrix/README
+++ b/graphics/fontmatrix/README
@@ -12,4 +12,7 @@ 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.
 
-Requires: Qt4.
-\ No newline at end of file
+This package can optionally use podofo and icu4c if 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.
+\ No newline at end of file
diff --git a/graphics/fontmatrix/fix-podofo-detection.patch b/graphics/fontmatrix/fix-podofo-detection.patch
new file mode 100644
index 0000000000..f87fefb020
--- /dev/null
+++ b/graphics/fontmatrix/fix-podofo-detection.patch
@@ -0,0 +1,11 @@
+diff -Naur fontmatrix-0.6.0-Source.orig/cmake/modules/FindLIBPODOFO.cmake fontmatrix-0.6.0-Source/cmake/modules/FindLIBPODOFO.cmake
+--- fontmatrix-0.6.0-Source.orig/cmake/modules/FindLIBPODOFO.cmake	2009-07-03 15:26:41.000000000 +0000
++++ fontmatrix-0.6.0-Source/cmake/modules/FindLIBPODOFO.cmake	2009-07-04 02:15:14.000000000 +0000
+@@ -32,6 +32,7 @@
+     "${LIBPODOFO_DIR}/src" 
+     "${LIBPODOFO_DIR}"
+     /usr/lib /usr/local/lib
++    /usr/lib64 /usr/local/lib64
+ )
+ 
+ IF(LIBPODOFO_INCLUDE_DIR AND LIBPODOFO_LIBRARY)
diff --git a/graphics/fontmatrix/fontmatrix.SlackBuild b/graphics/fontmatrix/fontmatrix.SlackBuild
index d0164c4db4..af450f435d 100644
--- a/graphics/fontmatrix/fontmatrix.SlackBuild
+++ b/graphics/fontmatrix/fontmatrix.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
 PRGNAM=fontmatrix
-VERSION=${VERSION:-0.4.2}
+VERSION=${VERSION:-0.6.0}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -26,6 +26,10 @@ elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 fi
 
+# Decide if we compile fontmatrix with icu4c and/or podofo support. Default is no.
+HAVE_ICU=${HAVE_ICU:-no}
+HAVE_PODOFO=${HAVE_PODOFO:-no}
+
 set -e
 
 rm -rf $PKG
@@ -41,20 +45,50 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Fix the desktop menu item.
-echo "" >> $PRGNAM.desktop
+# Fix the desktop menu item, location of man files, and PODOFO lib64 detection.
 echo "StartupNotify=false" >> $PRGNAM.desktop
+sed -i 's|share/man|man|' CMakeLists.txt
+patch -p1 < $CWD/fix-podofo-detection.patch
+# Cmake uses the static python lib. Let's use the shared lib instead.
+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"
+else
+  USE_PODOFO="FALSE"
+fi
 
 mkdir build && cd build
   cmake \
     -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-    -DOWN_SHAPER=1 \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DPYTHON_LIBRARY:PATH="$PY_LIB_SHARED" \
+    -DOWN_SHAPER:BOOL=1 \
     -DCMAKE_SKIP_RPATH:BOOL=1 \
     -DRPATH_STYLE:STRING=none \
+    -DWANT_ICU:BOOL="$USE_ICU" \
+    -DWANT_M17N:BOOL=true \
+    -DWANT_PYTHONQT:BOOL=true \
+    -DWANT_PODOFO:BOOL="$USE_PODOFO" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" ..
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release ..
+
+  # Remove -O3 flag.
+  for i in $(find . -name "flags.make"); do
+    sed -i 's|-O3||g' $i
+  done
 
-  make
+  make VERBOSE=1
   make install DESTDIR=$PKG
 cd ..
 
@@ -65,6 +99,11 @@ cd ..
     xargs strip --strip-unneeded 2> /dev/null
 )
 
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+)
+
 rm -rf $PKG/usr/share/icons
 for i in 16 22 32 48 64 128; do
   mkdir -p $PKG/usr/share/icons/hicolor/${i}x${i}/apps
@@ -85,4 +124,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/fontmatrix/fontmatrix.info b/graphics/fontmatrix/fontmatrix.info
index c62a967591..c9da05b812 100644
--- a/graphics/fontmatrix/fontmatrix.info
+++ b/graphics/fontmatrix/fontmatrix.info
@@ -1,8 +1,10 @@
 PRGNAM="fontmatrix"
-VERSION="0.4.2"
+VERSION="0.6.0"
 HOMEPAGE="http://fontmatrix.net/"
-DOWNLOAD="http://fontmatrix.net/archives/fontmatrix-0.4.2-Source.tar.gz"
-MD5SUM="8ad43c26162b33b2a9eb9f11a02a93c2"
+DOWNLOAD="http://fontmatrix.net/archives/fontmatrix-0.6.0-Source.tar.gz"
+MD5SUM="6a00c9448a50d3bab5acb4145f778f2d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/graphics/fontmatrix/slack-desc b/graphics/fontmatrix/slack-desc
index 4b918cdf50..0c43275b63 100644
--- a/graphics/fontmatrix/slack-desc
+++ b/graphics/fontmatrix/slack-desc
@@ -9,11 +9,11 @@
 fontmatrix: fontmatrix (font manager)
 fontmatrix: 
 fontmatrix: fontmatrix is a manager built with the kind of features and abilities
-fontmatrix: graphic designers, layout professionals along with others have felt
+fontmatrix: graphic designers, layout professionals, and others have felt
 fontmatrix: necessary, but modernized with some new touches.
-fontmatrix: 
+fontmatrix:
 fontmatrix: Homepage: http://fontmatrix.net/
-fontmatrix: 
-fontmatrix: 
-fontmatrix: 
-fontmatrix: 
+fontmatrix:
+fontmatrix:
+fontmatrix:
+fontmatrix: