4 files changed, 56 insertions, 46 deletions
diff --git a/academic/speedcrunch/doinst.sh b/academic/speedcrunch/doinst.sh
index 4e8ba7071d..3e5691a052 100644
--- a/academic/speedcrunch/doinst.sh
+++ b/academic/speedcrunch/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/speedcrunch/speedcrunch-0.10.1-fix-icon-name.patch b/academic/speedcrunch/speedcrunch-0.10.1-fix-icon-name.patch
deleted file mode 100644
index ccbf8bd34d..0000000000
--- a/academic/speedcrunch/speedcrunch-0.10.1-fix-icon-name.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN speedcrunch-0.10.orig/src/gui/aboutbox.cpp speedcrunch-0.10/src/gui/aboutbox.cpp
---- speedcrunch-0.10.orig/src/gui/aboutbox.cpp	2008-03-31 00:31:18.000000000 -0700
-+++ speedcrunch-0.10/src/gui/aboutbox.cpp	2008-05-31 13:21:39.000000000 -0700
-@@ -209,7 +209,7 @@
-   infoLabel->setOpenExternalLinks( true );
- 
-   QLabel * iconLabel = new QLabel( this );
--  iconLabel->setPixmap( QPixmap( ":/crunch.png" ) );
-+  iconLabel->setPixmap( QPixmap( ":/speedcrunch.png" ) );
-   iconLabel->setAlignment( Qt::AlignVCenter | Qt::AlignRight );
- 
-   MarqueeText * marqueeText = new MarqueeText( this );
diff --git a/academic/speedcrunch/speedcrunch.SlackBuild b/academic/speedcrunch/speedcrunch.SlackBuild
index 84ec44fb78..ac12214f3e 100644
--- a/academic/speedcrunch/speedcrunch.SlackBuild
+++ b/academic/speedcrunch/speedcrunch.SlackBuild
@@ -2,11 +2,30 @@
 
 # Slackware build script for speedcrunch
 
-# Written by Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2009, 2014 Larry Hajali <larryhaja[at]gmail[dot]com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=speedcrunch
-VERSION=${VERSION:-0.10.1}
-BUILD=${BUILD:-2}
+SRCNAM=SpeedCrunch
+VERSION=${VERSION:-0.11}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -41,39 +60,37 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION-src
+unzip $CWD/$SRCNAM-$VERSION-src.zip
+cd $SRCNAM-$VERSION-src
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-patch -p1 < $CWD/speedcrunch-0.10.1-fix-icon-name.patch
-
-mkdir build && cd build
-  # Make translations for speedcrunch
-  lrelease ../src/$PRGNAM.pro
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-	-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-	-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-        -DLIB_SUFFIX:STRING=${LIBDIRSUFFIX} \
-	-DCMAKE_BUILD_TYPE=RELEASE \
-        ../src
-
-  make VERBOSE=1
-  make install DESTDIR=$PKG
-cd -
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+sed -i 's/\r//' pkg/COPYING.rtf
+
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_BUILD_TYPE=RELEASE \
+  src
+
+make VERBOSE=1
+make install DESTDIR=$PKG
+
+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
 
+for i in 16 24 32 48 64 96 128; do
+  convert src/resources/$PRGNAM.png -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
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  ChangeLog* COPYING HACKING.txt INSTALL.txt LISEZMOI PACKAGERS \
-  README TRANSLATORS doc/*  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md pkg/COPYING.rtf doc/*{pdf,odt} $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/academic/speedcrunch/speedcrunch.info b/academic/speedcrunch/speedcrunch.info
index aae54d1637..59ca2bae8a 100644
--- a/academic/speedcrunch/speedcrunch.info
+++ b/academic/speedcrunch/speedcrunch.info
@@ -1,8 +1,8 @@
 PRGNAM="speedcrunch"
-VERSION="0.10.1"
+VERSION="0.11"
 HOMEPAGE="http://www.speedcrunch.org/en_US/index.html"
-DOWNLOAD="http://speedcrunch.googlecode.com/files/speedcrunch-0.10.1.tar.gz"
-MD5SUM="344ee1303b05502d28c58a2fff1ca6b2"
+DOWNLOAD="https://bitbucket.org/heldercorreia/speedcrunch/downloads/SpeedCrunch-0.11-src.zip"
+MD5SUM="38fa6f1de59e3a7c7e7bc6ad5174edda"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""