academic/GeoGebra: Updated for version 5.0.62.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 45 insertions, 69 deletions

diff --git a/academic/GeoGebra/GeoGebra.SlackBuild b/academic/GeoGebra/GeoGebra.SlackBuild
index 58caf843a4..ace8559ce5 100644
--- a/academic/GeoGebra/GeoGebra.SlackBuild
+++ b/academic/GeoGebra/GeoGebra.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=GeoGebra
-VERSION=${VERSION:-4.4.45.0}
+VERSION=${VERSION:-5.0.62.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,9 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-Linux-Installer-$VERSION.tar.gz
-cd geogebra-$VERSION
+rm -rf $PRGNAM-Linux-Portable-$VERSION
+tar xvf $CWD/$PRGNAM-Linux-Portable-$VERSION.tar.bz2
+cd $PRGNAM-Linux-Portable-$VERSION/geogebra
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -71,77 +71,53 @@ find -L . \
 
 install -dm755 $PKG/usr/bin \
                $PKG/usr/share/applications \
-               $PKG/usr/share/geogebra \
-               $PKG/usr/share/mime/packages
-
-install -dm755 $PKG/usr/share/icons/hicolor/16x16/apps \
-               $PKG/usr/share/icons/hicolor/22x22/apps \
-               $PKG/usr/share/icons/hicolor/24x24/apps \
-               $PKG/usr/share/icons/hicolor/32x32/apps \
-               $PKG/usr/share/icons/hicolor/36x36/apps \
-               $PKG/usr/share/icons/hicolor/48x48/apps \
-               $PKG/usr/share/icons/hicolor/64x64/apps \
-               $PKG/usr/share/icons/hicolor/72x72/apps \
-               $PKG/usr/share/icons/hicolor/96x96/apps \
-               $PKG/usr/share/icons/hicolor/128x128/apps \
-               $PKG/usr/share/icons/hicolor/192x192/apps \
-               $PKG/usr/share/icons/hicolor/256x256/apps \
-               $PKG/usr/share/icons/hicolor/scalable/apps
-
-install -dm755 $PKG/usr/share/icons/hicolor/16x16/mimetypes \
-               $PKG/usr/share/icons/hicolor/22x22/mimetypes \
-               $PKG/usr/share/icons/hicolor/24x24/mimetypes \
-               $PKG/usr/share/icons/hicolor/32x32/mimetypes \
-               $PKG/usr/share/icons/hicolor/36x36/mimetypes \
-               $PKG/usr/share/icons/hicolor/48x48/mimetypes \
-               $PKG/usr/share/icons/hicolor/64x64/mimetypes \
-               $PKG/usr/share/icons/hicolor/72x72/mimetypes \
-               $PKG/usr/share/icons/hicolor/96x96/mimetypes \
-               $PKG/usr/share/icons/hicolor/128x128/mimetypes \
-               $PKG/usr/share/icons/hicolor/192x192/mimetypes \
-               $PKG/usr/share/icons/hicolor/256x256/mimetypes \
-               $PKG/usr/share/icons/hicolor/scalable/mimetypes
-
+               $PKG/usr/share/geogebra
+install -dm755 $PKG/usr/share/icons/hicolor/16x16/apps
 install -m644 *.jar $PKG/usr/share/geogebra
 install -m755 geogebra $PKG/usr/bin
-install -m644 geogebra.xml $PKG/usr/share/mime/packages
-install -m644 geogebra.desktop $PKG/usr/share/applications
-
-install -m644 icons/hicolor/16x16/apps/geogebra.png $PKG/usr/share/icons/hicolor/16x16/apps
-install -m644 icons/hicolor/22x22/apps/geogebra.png $PKG/usr/share/icons/hicolor/22x22/apps
-install -m644 icons/hicolor/24x24/apps/geogebra.png $PKG/usr/share/icons/hicolor/24x24/apps
-install -m644 icons/hicolor/32x32/apps/geogebra.png $PKG/usr/share/icons/hicolor/32x32/apps
-install -m644 icons/hicolor/36x36/apps/geogebra.png $PKG/usr/share/icons/hicolor/36x36/apps
-install -m644 icons/hicolor/48x48/apps/geogebra.png $PKG/usr/share/icons/hicolor/48x48/apps
-install -m644 icons/hicolor/64x64/apps/geogebra.png $PKG/usr/share/icons/hicolor/64x64/apps
-install -m644 icons/hicolor/72x72/apps/geogebra.png $PKG/usr/share/icons/hicolor/72x72/apps
-install -m644 icons/hicolor/96x96/apps/geogebra.png $PKG/usr/share/icons/hicolor/96x96/apps
-install -m644 icons/hicolor/128x128/apps/geogebra.png $PKG/usr/share/icons/hicolor/128x128/apps
-install -m644 icons/hicolor/192x192/apps/geogebra.png $PKG/usr/share/icons/hicolor/192x192/apps
-install -m644 icons/hicolor/256x256/apps/geogebra.png $PKG/usr/share/icons/hicolor/256x256/apps
-install -m644 icons/hicolor/scalable/apps/geogebra.svgz $PKG/usr/share/icons/hicolor/scalable/apps
-
-install -m644 icons/hicolor/16x16/mimetypes/*.* $PKG/usr/share/icons/hicolor/16x16/mimetypes
-install -m644 icons/hicolor/22x22/mimetypes/*.* $PKG/usr/share/icons/hicolor/22x22/mimetypes
-install -m644 icons/hicolor/24x24/mimetypes/*.* $PKG/usr/share/icons/hicolor/24x24/mimetypes
-install -m644 icons/hicolor/32x32/mimetypes/*.* $PKG/usr/share/icons/hicolor/32x32/mimetypes
-install -m644 icons/hicolor/36x36/mimetypes/*.* $PKG/usr/share/icons/hicolor/36x36/mimetypes
-install -m644 icons/hicolor/48x48/mimetypes/*.* $PKG/usr/share/icons/hicolor/48x48/mimetypes
-install -m644 icons/hicolor/64x64/mimetypes/*.* $PKG/usr/share/icons/hicolor/64x64/mimetypes
-install -m644 icons/hicolor/72x72/mimetypes/*.* $PKG/usr/share/icons/hicolor/72x72/mimetypes
-install -m644 icons/hicolor/96x96/mimetypes/*.* $PKG/usr/share/icons/hicolor/96x96/mimetypes
-install -m644 icons/hicolor/128x128/mimetypes/*.* $PKG/usr/share/icons/hicolor/128x128/mimetypes
-install -m644 icons/hicolor/192x192/mimetypes/*.* $PKG/usr/share/icons/hicolor/192x192/mimetypes
-install -m644 icons/hicolor/256x256/mimetypes/*.* $PKG/usr/share/icons/hicolor/256x256/mimetypes
-install -m644 icons/hicolor/scalable/mimetypes/*.* $PKG/usr/share/icons/hicolor/scalable/mimetypes
+cd ..
+install -m644 geogebra.png $PKG/usr/share/icons/hicolor/16x16/apps
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README _license.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a readme.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
+cat <<EOF > $PKG/usr/share/applications/$PRGNAM.desktop
+[Desktop Entry]
+Name=GeoGebra
+GenericName=Dynamic mathematics software
+GenericName[cs]=Dynamický matematický software
+GenericName[de]=Dynamische Mathematiksoftware
+GenericName[el]=Λογισμικό δυναμικών μαθηματικών
+GenericName[es]=Programa de matemáticas dinámico
+GenericName[fr]=Logiciel de Mathématiques dynamiques
+GenericName[hi]=सक्रिय गणितीय सॉफ्टवेर
+GenericName[hu]=Dinamikus matematikai szoftver
+GenericName[it]=Software di matematica dinamica
+GenericName[pt_BR]=Programa de Matemática Dinâmica
+Comment=Create interactive mathematical constructions and applets.
+Comment[cs]=Vytvořte interaktivní konstrukce a aplety.
+Comment[de]=Erstellen Sie interaktive Konstruktionen und Applets.
+Comment[el]=Δημιουργήστε αλληπειδραστικές μαθηματικές κατασκευές και applet.
+Comment[fr]=Créer des constructions mathématiques et des appliquettes.
+Comment[hi]=संवादात्मक गणितीय निर्माण और एप्लेट बनाएँ
+Comment[hu]=Interaktív matematikai szerkesztések és appletek létrehozása.
+Comment[it]=Creazione di costruzioni matematiche e applet interattive.
+Comment[pt_BR]=Crie construções matemáticas interativas e applets.
+TryExec=geogebra
+Exec=geogebra %F
+Icon=geogebra
+Terminal=false
+Type=Application
+StartupNotify=true
+StartupWMClass=geogebra-GeoGebra
+Categories=Education;Science;Math;
+MimeType=application/vnd.geogebra.file;application/vnd.geogebra.tool;
+EOF
+
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/GeoGebra/GeoGebra.info b/academic/GeoGebra/GeoGebra.info
index 2fbb33bbda..d92fd003c7 100644
--- a/academic/GeoGebra/GeoGebra.info
+++ b/academic/GeoGebra/GeoGebra.info
@@ -1,8 +1,8 @@
 PRGNAM="GeoGebra"
-VERSION="4.4.45.0"
+VERSION="5.0.62.0"
 HOMEPAGE="http://www.geogebra.org/cms/en/"
-DOWNLOAD="http://download.geogebra.org/installers/4.4/GeoGebra-Linux-Installer-4.4.45.0.tar.gz"
-MD5SUM="d5639effe2e995d9803e403f47c5e51c"
+DOWNLOAD="http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-5.0.62.0.tar.bz2"
+MD5SUM="cdf7583ab67beb3e446181dfc69f52d8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="openjdk"