academic/celestia: Updated for version 1.6.2.2

Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>

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

7 files changed, 33 insertions, 92 deletions

diff --git a/academic/celestia/README b/academic/celestia/README
index 84faa8608e..038946a99d 100644
--- a/academic/celestia/README
+++ b/academic/celestia/README
@@ -3,7 +3,9 @@ in three dimensions.
 
 There are four frontend possibilities to choose. The Glut one works out 
 of the box, the GTK one needs gtkglext, and the Gnome one is untested.
-The KDE frontend requires kde3 and will not work with the kde3 compat
-packages, so it's essentially nonfunctional.
+The KDE frontend hasn't been updated since kde3 times, so it's practically
+non-functional.
 
-This requires lua, and gtkglext is optional but recommended.
+Since the GTK frontend is the default, gtkglext is a required dependency.
+Further, lua53 is listed as required dependency, but lua or lua52 will
+work as well.
diff --git a/academic/celestia/celestia-1.6.1-gcc47.patch b/academic/celestia/celestia-1.6.1-gcc47.patch
deleted file mode 100644
index 385f39a205..0000000000
--- a/academic/celestia/celestia-1.6.1-gcc47.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up celestia-1.6.1/src/celengine/frametree.h.gcc47 celestia-1.6.1/src/celengine/frametree.h
---- celestia-1.6.1/src/celengine/frametree.h.gcc47	2012-03-22 12:56:56.096087430 -0400
-+++ celestia-1.6.1/src/celengine/frametree.h	2012-03-22 12:57:04.333022427 -0400
-@@ -13,6 +13,7 @@
- #ifndef _CELENGINE_FRAMETREE_H_
- #define _CELENGINE_FRAMETREE_H_
- 
-+#include <unistd.h>
- #include <vector>
- 
- class Star;
-diff -up celestia-1.6.1/src/celengine/planetgrid.cpp.gcc47 celestia-1.6.1/src/celengine/planetgrid.cpp
---- celestia-1.6.1/src/celengine/planetgrid.cpp.gcc47	2012-03-22 12:53:01.496950513 -0400
-+++ celestia-1.6.1/src/celengine/planetgrid.cpp	2012-03-22 12:53:08.812891865 -0400
-@@ -12,6 +12,7 @@
- 
- #include <cstdio>
- #include <cmath>
-+#include <celmath/mathlib.h>
- #include <celmath/intersect.h>
- #include "planetgrid.h"
- #include "body.h"
diff --git a/academic/celestia/celestia-1.6.1-libpng15.patch b/academic/celestia/celestia-1.6.1-libpng15.patch
deleted file mode 100644
index 5dffbab246..0000000000
--- a/academic/celestia/celestia-1.6.1-libpng15.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-imagecapture.cpp:184:40: error: ‘Z_BEST_COMPRESSION’ was not declared in this scope
-
---- src/celestia/imagecapture.cpp
-+++ src/celestia/imagecapture.cpp
-@@ -31,6 +31,9 @@
- #include "png.h"
- #endif
- 
-+// Z_BEST_COMPRESSION
-+#include <zlib.h>
-+
- // Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng
- #ifndef png_jmpbuf
- #define png_jmpbuf(png_ptr) png_ptr->jmpbuf
diff --git a/academic/celestia/celestia-1.6.1-libpng16.patch b/academic/celestia/celestia-1.6.1-libpng16.patch
deleted file mode 100644
index 78911cb557..0000000000
--- a/academic/celestia/celestia-1.6.1-libpng16.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-image.cpp:530:61: error: ‘memcpy’ was not declared in this scope
-
-https://bugs.gentoo.org/show_bug.cgi?id=464764
-
-Patch written by Lars Wendler <polynomial-c@gentoo.org>
---- a/celestia/src/celengine/image.cpp
-+++ b/celestia/src/celengine/image.cpp
-@@ -42,6 +42,7 @@ extern "C" {
- #include "jpeglib.h"
- #else
- #include <cstdio>
-+#include <string.h>
- #include <jpeglib.h>
- #endif
- }
---- a/celestia/src/celengine/texture.cpp
-+++ b/celestia/src/celengine/texture.cpp
-@@ -28,6 +28,7 @@
- #include <cstdlib>
- #include <cstdio>
- #include <cassert>
-+#include <string.h>
- 
- #ifndef _WIN32
- #ifndef TARGET_OS_MAC
diff --git a/academic/celestia/celestia.SlackBuild b/academic/celestia/celestia.SlackBuild
index d9f1528908..8697c7ce48 100644
--- a/academic/celestia/celestia.SlackBuild
+++ b/academic/celestia/celestia.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for celestia
 
-# Copyright 2008-2011 Heinz Wiesinger <pprkut@liwjatan.at>
+# Copyright 2008-2021 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,22 +11,23 @@
 # 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.
+#  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.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=celestia
-VERSION=${VERSION:-1.6.1}
-BUILD=${BUILD:-2}
+SRCNAM=Celestia
+VERSION=${VERSION:-1.6.2.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -66,9 +67,9 @@ 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
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -82,12 +83,7 @@ find -L . \
 # Note that the kde frontend will only build with kde3
 FRONTEND=${FRONTEND:-gtk}
 
-# Fix incompatibility with gcc 4.7
-patch -p1 -i $CWD/celestia-1.6.1-gcc47.patch
-
-# Fix libpng incompatibilities (thanks to Arch Linux)
-patch -p0 -i $CWD/celestia-1.6.1-libpng15.patch
-patch -p2 -i $CWD/celestia-1.6.1-libpng16.patch
+autoreconf -vif
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -103,6 +99,10 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 
+# Fix name of executable in desktop file
+sed -i "s|celestia-gtk|celestia|" \
+  $PKG/usr/share/applications/celestia.desktop
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL NEWS README TRANSLATORS \
   $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/academic/celestia/celestia.info b/academic/celestia/celestia.info
index 5fcebbdcda..b8c4371e03 100644
--- a/academic/celestia/celestia.info
+++ b/academic/celestia/celestia.info
@@ -1,10 +1,10 @@
 PRGNAM="celestia"
-VERSION="1.6.1"
-HOMEPAGE="http://www.shatters.net/celestia/"
-DOWNLOAD="http://downloads.sourceforge.net/celestia/celestia-1.6.1.tar.gz"
-MD5SUM="02208982a431b984502fac909bf380f4"
+VERSION="1.6.2.2"
+HOMEPAGE="https://celestia.space/"
+DOWNLOAD="https://github.com/CelestiaProject/Celestia/archive/1.6.2.2/Celestia-1.6.2.2.tar.gz"
+MD5SUM="0f4871b44f05e0eb9e3714bb13fed2b7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="gtkglext lua"
+REQUIRES="gtkglext lua53"
 MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@slackbuilds.org"
diff --git a/academic/celestia/slack-desc b/academic/celestia/slack-desc
index a0b2b9d767..60881f44da 100644
--- a/academic/celestia/slack-desc
+++ b/academic/celestia/slack-desc
@@ -11,7 +11,7 @@ celestia:
 celestia: A real-time space simulation that lets you experience our universe
 celestia: in three dimensions.
 celestia:
-celestia: Homepage: http://www.shatters.net/celestia/
+celestia: Homepage: https://celestia.space/
 celestia:
 celestia:
 celestia: