games/chroma: Version bump to 1.20

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

3 files changed, 9 insertions, 41 deletions

diff --git a/games/chroma/chroma.SlackBuild b/games/chroma/chroma.SlackBuild
index 250adea3ad784..3444fcb715cdf 100644
--- a/games/chroma/chroma.SlackBuild
+++ b/games/chroma/chroma.SlackBuild
@@ -3,11 +3,12 @@
 # Slackware build script for chroma
 
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
+# Maintained by Jeremy Hansen <jebrhansen+SBo@gmail.com> 2024
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=chroma
-VERSION=${VERSION:-1.15}
+VERSION=${VERSION:-1.20}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -20,9 +21,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -61,10 +59,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Removed some inline declarations (incompatible with newer versions of gcc)
-patch -p1 < $CWD/gcc.patch
-
 CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --enable-sdl \
@@ -74,6 +70,8 @@ CFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
 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
 
@@ -83,7 +81,7 @@ install -m 0644 graphics/icon.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  CHANGELOG COPYING INSTALL README \
+  CHANGELOG COPYING README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/games/chroma/chroma.info b/games/chroma/chroma.info
index 793608c91221a..a72183240b38d 100644
--- a/games/chroma/chroma.info
+++ b/games/chroma/chroma.info
@@ -1,8 +1,8 @@
 PRGNAM="chroma"
-VERSION="1.15"
+VERSION="1.20"
 HOMEPAGE="http://www.level7.org.uk/chroma/"
-DOWNLOAD="http://www.level7.org.uk/chroma/download/chroma-1.15.tar.bz2"
-MD5SUM="525ff7f06d43af04cc0bf318b6810c16"
+DOWNLOAD="http://www.level7.org.uk/chroma/download/chroma-1.20.tar.bz2"
+MD5SUM="d0f1e770e49ae10070a78e50cec8a723"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/chroma/gcc.patch b/games/chroma/gcc.patch
deleted file mode 100644
index 22ef1b2ea79c1..0000000000000
--- a/games/chroma/gcc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur chroma-1.15.orig/sdlshadowdisplay.c chroma-1.15/sdlshadowdisplay.c
---- chroma-1.15.orig/sdlshadowdisplay.c	2013-04-20 08:07:00.000000000 +0200
-+++ chroma-1.15/sdlshadowdisplay.c	2017-08-02 12:07:56.327010753 +0200
-@@ -88,7 +88,7 @@
- void displayshadowed_level(struct level* plevel);
- void displayshadowed_movers(struct level* plevel, int redraw);
- 
--inline void displayshadowed_piece(struct level* plevel, int p, int x, int y, int d)
-+void displayshadowed_piece(struct level* plevel, int p, int x, int y, int d)
- {
-     SDL_Surface *pimage;
- 
-@@ -255,7 +255,7 @@
-     }
- }
- 
--inline void displayshadowed_pieceshadow(struct level* plevel, int p, int x, int y, int d)
-+void displayshadowed_pieceshadow(struct level* plevel, int p, int x, int y, int d)
- {
-     SDL_Surface *pimage;
- 
-@@ -310,7 +310,7 @@
-     SDL_BlitSurface(pimage, &srect, screen_surface, &drect);
- }
- 
--inline void displayshadowed_piecebase(struct level* plevel, int x, int y)
-+void displayshadowed_piecebase(struct level* plevel, int x, int y)
- {
-     int p;
-     SDL_Surface *pimage;