academic/gelemental: Updated for version 2.0.0.

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

4 files changed, 14 insertions, 78 deletions

diff --git a/academic/gelemental/gelemental-1.2.0-gcc43.patch b/academic/gelemental/gelemental-1.2.0-gcc43.patch
deleted file mode 100644
index 87cfbcc5fd..0000000000
--- a/academic/gelemental/gelemental-1.2.0-gcc43.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gelemental-1.2.0.org/libelemental/value.hh	2007-09-25 09:10:16.000000000 +0400
-+++ gelemental-1.2.0/libelemental/value.hh	2008-06-29 12:36:30.000000000 +0400
-@@ -27,6 +27,7 @@
- #include <libelemental/misc/ucompose.hh>
- #include <libelemental/misc/extras.hh>
- 
-+#include <limits>
- #include <iomanip>
- #include <ostream>
- #include <vector>
diff --git a/academic/gelemental/gelemental.SlackBuild b/academic/gelemental/gelemental.SlackBuild
index 22beaf7d9c..e4b332e18a 100644
--- a/academic/gelemental/gelemental.SlackBuild
+++ b/academic/gelemental/gelemental.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for gelemental
 
-# Copyright 2011-2016 Petar Petrov slackalaxy@gmail.com
+# Copyright 2011-2019 Petar Petrov slackalaxy@gmail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,16 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# The patch is from openSUSE (IIRC) and source tarball is from Debian. Thank you!
-
 PRGNAM=gelemental
-VERSION=${VERSION:-1.2.0}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-2.0.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
        *) export ARCH=$( uname -m ) ;;
   esac
@@ -42,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -62,27 +60,15 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.gz
-
-patch -p0 -s < $CWD/$PRGNAM-$VERSION-gcc43.patch
+tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz
 
 cd $PRGNAM-$VERSION
 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 {} \;
-
-# Change the menu category to "Education"
-sed -i "s:Categories=GTK;Utility;Science;Chemistry;:Categories=Education;:" data/gelemental.desktop.in
-
-# Increase the info button size
-sed -i "s:set_size_request (50, 50):set_size_request (64, 64):" src/buttons.cc
-
-# Starting with glib 2.32 it is now mandatory to
-# include glib.h instead of individual headers.
-patch -p1 -i $CWD/glib-single-include.patch
+ \( -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 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS -std=c++11" \
diff --git a/academic/gelemental/gelemental.info b/academic/gelemental/gelemental.info
index 26ae0cb79e..17d587816a 100644
--- a/academic/gelemental/gelemental.info
+++ b/academic/gelemental/gelemental.info
@@ -1,8 +1,8 @@
 PRGNAM="gelemental"
-VERSION="1.2.0"
+VERSION="2.0.0"
 HOMEPAGE="http://freecode.com/projects/gelemental"
-DOWNLOAD="https://sourceforge.net/projects/sboppetrov/files/gelemental/gelemental_1.2.0.orig.tar.gz"
-MD5SUM="94cc73c76a02f75598f579ff57696805"
+DOWNLOAD="https://github.com/ginggs/gelemental/archive/v2.0.0/gelemental-2.0.0.tar.gz"
+MD5SUM="8d38d7599b0f2fc96e2bd622cd762b9a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/gelemental/glib-single-include.patch b/academic/gelemental/glib-single-include.patch
deleted file mode 100644
index da0c6b4bcf..0000000000
--- a/academic/gelemental/glib-single-include.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: gelemental-1.2.0/libelemental/misc/extras.cc
-===================================================================
---- gelemental-1.2.0.orig/libelemental/misc/extras.cc
-+++ gelemental-1.2.0/libelemental/misc/extras.cc
-@@ -21,7 +21,7 @@
- 
- #include <algorithm>
- #include <stdexcept>
--#include <glib/gmem.h>
-+#include <glib.h>
- #include <glibmm/utility.h>
- 
- namespace misc {
-Index: gelemental-1.2.0/libelemental/misc/widgets.cc
-===================================================================
---- gelemental-1.2.0.orig/libelemental/misc/widgets.cc
-+++ gelemental-1.2.0/libelemental/misc/widgets.cc
-@@ -20,7 +20,7 @@
- #include "macros.hh"
- #include "widgets.hh"
- 
--#include <glib/gmessages.h>
-+#include <glib.h>
- #include <gtkmm/alignment.h>
- #include <gtkmm/image.h>
- #include <gtkmm/label.h>
-Index: gelemental-1.2.0/src/main.cc
-===================================================================
---- gelemental-1.2.0.orig/src/main.cc
-+++ gelemental-1.2.0/src/main.cc
-@@ -26,8 +26,7 @@
- #include <clocale>
- #include <iostream>
- #include <locale>
--#include <glib/goption.h>
--#include <glib/gutils.h>
-+#include <glib.h>
- #include <glibmm/optionentry.h>
- #include <gtk/gtkaboutdialog.h>
- #include <gtk/gtkversion.h>