academic/tuxmath: Updated for version 1.9.0.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>

4 files changed, 26 insertions, 18 deletions

diff --git a/academic/tuxmath/README b/academic/tuxmath/README
index f279551872..425ac6c36c 100644
--- a/academic/tuxmath/README
+++ b/academic/tuxmath/README
@@ -1,6 +1,7 @@
-"Tux, of Math Command" (aka. tuxmath) is a math drill game starring Tux, the
-Linux Penguin. Lessons are included from simple number typing through addition,
-subtraction, multiplication, and division of positive and negative numbers.
+"Tux, of Math Command" (aka. tuxmath) is a math drill game starring Tux,
+the Linux Penguin. Lessons are included from simple number typing through
+addition, subtraction, multiplication, and division of positive and
+negative numbers.
 It is intended for kids ~4-10.
 
-Tuxmath requires SDL_Pango.
+Tuxmath requires SDL_Pango and t4k_common.
diff --git a/academic/tuxmath/doinst.sh b/academic/tuxmath/doinst.sh
index 4e8ba7071d..3e5691a052 100644
--- a/academic/tuxmath/doinst.sh
+++ b/academic/tuxmath/doinst.sh
@@ -2,3 +2,8 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/academic/tuxmath/tuxmath.SlackBuild b/academic/tuxmath/tuxmath.SlackBuild
index ccfe72460b..af44073146 100644
--- a/academic/tuxmath/tuxmath.SlackBuild
+++ b/academic/tuxmath/tuxmath.SlackBuild
@@ -5,16 +5,14 @@
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
 PRGNAM=tuxmath
-VERSION=${VERSION:-1.7.2}
+VERSION=${VERSION:-1.9.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -48,17 +46,16 @@ find . \
  -exec chmod 644 {} \;
 
 # Fix .desktop.
-sed -i '/^##/d' $PRGNAM.desktop
+sed -i -e '/^##/d' -e '/^X/d' -e 's|Math;||' $PRGNAM.desktop
 
-# Hmmmm...SDL_pango is an optional requirement with SDL_ttf as the fallback.
-# However, I can't get tuxmath to build without SDL_pango even by passing
-# --without-sdlpango option to configure.  Oh well!!! :/
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --localstatedir=/var \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --disable-sdltest \
+  --disable-dependency-tracking \
   --build=$ARCH-slackware-linux
 
 make
@@ -67,9 +64,14 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/share/{applications,pixmaps}
-install -m 0644 $PRGNAM.desktop $PKG/usr/share/applications
-install -m 0644 data/images/icons/$PRGNAM.svg $PKG/usr/share/pixmaps
+install -D -m 0644 $PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+for i in 16 24 32 48 64 96 128; do
+  convert data/images/icons/$PRGNAM.svg -resize ${i}x${i}! $PRGNAM-$i.png
+  install -D -m 0644 $PRGNAM-$i.png \
+    $PKG/usr/share/icons/hicolor/${i}x${i}/apps/$PRGNAM.png
+done
+install -D -m 0644 data/images/icons/$PRGNAM.svg \
+  $PKG/usr/share/icons/hicolor/scalable/apps/$PRGNAM.svg
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/academic/tuxmath/tuxmath.info b/academic/tuxmath/tuxmath.info
index aefe5e205c..397961aa26 100644
--- a/academic/tuxmath/tuxmath.info
+++ b/academic/tuxmath/tuxmath.info
@@ -1,10 +1,10 @@
 PRGNAM="tuxmath"
-VERSION="1.7.2"
+VERSION="1.9.0"
 HOMEPAGE="http://tux4kids.alioth.debian.org/"
-DOWNLOAD="http://downloads.sourceforge.net/project/tuxmath/tuxmath-source/TuxMath%201.7.2%20-%20Source/tuxmath_w_fonts-1.7.2.tar.gz"
-MD5SUM="8617c4eb3dcc203da02c150c7463327d"
+DOWNLOAD="http://alioth.debian.org/frs/download.php/3470/tuxmath_w_fonts-1.9.0.tar.gz"
+MD5SUM="572ee65edda5e0a6696c76ca27891526"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="rworkman"
+APPROVED="rworkman,Niels Horn"