games/trigger-rally: Updated for version 0.6.6.1. New maintainer.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Johannes Schoepfer 2022-04-29 09:10:20 +01:00 committed by Willy Sudiarto Raharjo
parent 25f965245f
commit af50ca3ec1
No known key found for this signature in database
GPG key ID: 3F617144D7238786
4 changed files with 18 additions and 126 deletions

View file

@ -1,44 +0,0 @@
diff -rupN src/include/hiscore1.h src_patched/include/hiscore1.h
--- src/include/hiscore1.h 2016-04-08 20:58:38.000000000 +0200
+++ src_patched/include/hiscore1.h 2016-04-28 15:27:43.763427992 +0200
@@ -41,6 +41,17 @@
return InputStream; \
} else (void)0
+
+// TODO: remove duplicate code
+#define GETLINE_SKIP_EMPTY_LINES_B(InputStream, String) if (true) { \
+ while (std::getline(InputStream, String)) { \
+ if (!String.empty()) \
+ break; \
+ } \
+ if (String.empty()) \
+ return static_cast<bool> (InputStream); \
+} else (void)0
+
///
/// @brief Basic structure to load and save race results.
///
@@ -724,19 +735,19 @@ private:
std::istringstream sspdata(decrypt(pdata));
#undef decrypt
- GETLINE_SKIP_EMPTY_LINES(sspdata, ts);
+ GETLINE_SKIP_EMPTY_LINES_B(sspdata, ts);
nu = std::stoul(ts);
while (nu-- != 0)
{
- GETLINE_SKIP_EMPTY_LINES(sspdata, ts);
+ GETLINE_SKIP_EMPTY_LINES_B(sspdata, ts);
allunlocks[pname].insert(ts);
}
while (sspdata >> rd)
alltimes.insert({rd.mapname, rd});
- return sspdata;
+ return static_cast<bool> (sspdata);
}
///

View file

@ -15,5 +15,5 @@ trigger-rally: to reach several locations marked by pulsating rings in sequence.
trigger-rally: win a race if you reach the last location in time. Trigger is highly
trigger-rally: customisable, and it's easy to add new levels and vehicles.
trigger-rally:
trigger-rally: Homepage: http://trigger-rally.sourceforge.net/
trigger-rally: https://trigger-rally.sourceforge.io
trigger-rally:

View file

@ -2,7 +2,8 @@
# Slackware build script for trigger-rally
# Copyright 2015-2016 Larry Hajali <larryhaja[at]gmail[dot]com>
# Copyright 2015-2016 Larry Hajali
# Copyright 2022 Johannes Schoepfer, Germany
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@ -25,22 +26,19 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=trigger-rally
VERSION=${VERSION:-0.6.4}
VERSION=${VERSION:-0.6.6.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
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
@ -50,8 +48,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"
@ -72,7 +70,6 @@ cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
for i in $CWD/*.zip;do cp $i data/plugins;done
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@ -80,17 +77,6 @@ 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 {} \;
# Fix end-of-line encoding
for j in doc/*; do
sed -e 's/\r//' $i > ${i}.new
touch -r $i ${i}.new
mv ${i}.new $i
done
# Fix for gcc >= 5.x
# https://sourceforge.net/p/trigger-rally/discussion/527953/thread/e1cde947/
patch -p0 < $CWD/hiscore1.h.patch
OPTIMS="$SLKCFLAGS" \
make -C src
@ -104,14 +90,14 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
mkdir $PKG/usr/share/applications
install -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications
# Correct size 16x12 icon
convert -resize 16x16 $PKG/usr/share/games/$PRGNAM/icon/trigger-256.png \
$PKG/usr/share/games/$PRGNAM/icon/trigger-16.png
for i in 16 22 24 32 36 48 64 72 96 128 192 256; do
mkdir -p $PKG/usr/share/icons/hicolor/${i}x${i}/apps
ln -s /usr/share/games/$PRGNAM/icon/trigger-${i}.png \
ln -sr $PKG/usr/share/games/$PRGNAM/icon/trigger-${i}.png \
$PKG/usr/share/icons/hicolor/${i}x${i}/apps/$PRGNAM.png
done
mkdir -p $PKG/usr/share/icons/hicolor/scalable/apps
ln -s /usr/share/games/$PRGNAM/icons/trigger-${i}-icons.svg \
$PKG/usr/share/icons/hicolor/scalable/apps/$PRGNAM.svg
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild

View file

@ -1,60 +1,10 @@
PRGNAM="trigger-rally"
VERSION="0.6.4"
HOMEPAGE="http://trigger-rally.sourceforge.net"
DOWNLOAD="https://downloads.sourceforge.net/trigger-rally/trigger-rally-0.6.4.tar.gz \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/map-volcanic.zip \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/map-delta.zip \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/map-desertrush.zip \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/map-ghats.zip \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/map-greengrounds.zip \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/map-helicoil.zip \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/map-icypeak.zip \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/map-labrally.zip \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/map-marsspirit.zip \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/map-monza.zip \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/map-mountainclimbing.zip \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/map-mountainpass.zip \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/map-pistol.zip \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/map-pulp.zip \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/map-roundhouse.zip \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/map-santa.zip \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/map-serpentine.zip \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/map-snowlevel.zip \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/map-snowyhills.zip \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/map-tea.zip \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/map-tobago.zip \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/event-rscup.zip \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/event-westernchallenge.zip \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/map-banana.zip \
https://sourceforge.net/projects/trigger-rally/files/plugins/plugins-0.6.4/map-crossmountain.zip"
MD5SUM="551c964bd96e308eecf8c416bbd46287 \
03f17ff67f19b979461e2d5308970350 \
b036667b4242da7df08db1ca5bd93eb6 \
dc05c2fddd90f88ab49036083108da58 \
55d22fef0f38c718443cd341f591524d \
cb24d43b1d0ce1ecd7fad927ac6c5729 \
ff9719e33d0c155da30c7d0a634dbe9e \
12bccc8f4ed517b1d50f898b1285c018 \
abc74fd1281201356f2eb8409bfeef33 \
5196f0dc2fc91855eaa13f9cf981f244 \
a875e7e34ff28392e1c9e1fab74adae5 \
8e4cdc1565eeea896f5ec37db4a2aa24 \
1dc69423acc8fddc09cb4122893843ff \
99cffbc41841dd3aceded54f9e9b4507 \
029d468650f5479c64a3dcc79858818e \
e55a8d93648571bb8c90e52055be23ee \
bb66d3fff48a62e323a77a1b09cd642f \
158e628c122e4db886c791df62ad9528 \
c8ebfd0b2b9cce351d4474cfcc2006a6 \
38522c921d734467a7d7133d08c0aece \
a7f83cf58f60ff15646993264b96e28c \
ae44d813c3108d11eb9e54b155c09a44 \
6d3bf46e9d756db05fac9a069cdc6694 \
f6dba6c135a0df234f53a8312456cfa2 \
9cbd3414caca1a9300c5fd0ed43efdce \
351bd5afb5c82c889408690d208f6430"
VERSION="0.6.6.1"
HOMEPAGE="https://trigger-rally.sourceforge.io/"
DOWNLOAD="https://downloads.sourceforge.net/trigger-rally/trigger-rally-0.6.6.1.tar.gz"
MD5SUM="0734800a6d81c73b6d3a2864e624e4c2"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="freealut physfs"
MAINTAINER="Larry Hajali"
EMAIL="larryhaja[at]gmail[dot]com"
REQUIRES="freealut physfs tinyxml2"
MAINTAINER="Johannes Schoepfer"
EMAIL="slackbuilds@schoepfer.info"