From 389b3c43f33cdd25ba13cfc9b5ee1674106fbc13 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sat, 6 Oct 2018 08:26:41 +0200 Subject: 20181006.1 global branch merge. Signed-off-by: Matteo Bernardini --- games/0ad-data/0ad-data.SlackBuild | 2 +- games/0ad-data/0ad-data.info | 6 +- games/0ad/0ad.SlackBuild | 20 +- games/0ad/0ad.info | 8 +- .../alienarena-7.66-no-qglBlitFramebufferEXT.patch | 22 ++ games/alienarena/alienarena.SlackBuild | 30 +- games/alienarena/alienarena.info | 4 +- games/alienarena/checkout_code.sh | 6 + games/assaultcube/assaultcube-gcc6.patch | 301 +++++++++++++++++++++ games/assaultcube/assaultcube.SlackBuild | 2 + games/berusky2/berusky2.SlackBuild | 6 +- games/berusky2/berusky2.info | 6 +- games/blobwars/blobwars.SlackBuild | 2 +- games/bloodfrontier/bloodfrontier.SlackBuild | 2 +- games/brainparty/brainparty.SlackBuild | 3 + games/brainparty/patches/gcc-6.patch | 47 ++++ games/chroma/chroma.SlackBuild | 19 +- games/chroma/gcc.patch | 30 ++ games/desmume/desmume.SlackBuild | 13 +- games/desmume/desmume.info | 6 +- games/desmume/osmesa-header-fix.patch | 11 - games/dolphin-emu/dolphin-emu.SlackBuild | 3 + games/etlegacy-from-source/README | 25 ++ games/etlegacy-from-source/doinst.sh | 3 + .../etlegacy-from-source.SlackBuild | 186 +++++++++++++ .../etlegacy-from-source/etlegacy-from-source.info | 16 ++ games/etlegacy-from-source/files/etlegacy.desktop | 9 + games/etlegacy-from-source/files/etlegacy.svg | 100 +++++++ .../files/get_tarball_from_git.sh | 31 +++ games/etlegacy-from-source/files/openurl.sh | 15 + games/etlegacy-from-source/slack-desc | 19 ++ games/f1spirit/03_gcc6.patch | 12 + games/f1spirit/f1spirit.SlackBuild | 3 + games/frogatto/frogatto.SlackBuild | 6 +- games/gargoyle/gargoyle.SlackBuild | 2 +- games/glob2/c++14.patch | 46 ++++ games/glob2/glob2.SlackBuild | 3 + games/gnubg/gnubg.SlackBuild | 2 - games/goonies/gcc6.patch | 12 + games/goonies/goonies.SlackBuild | 3 + games/higan-libretro/higan-libretro.SlackBuild | 4 - games/higan-libretro/openmp.patch.gz | Bin 457 -> 0 bytes games/higan/higan.SlackBuild | 4 +- games/higan/higan.info | 6 +- games/micropolis/micropolis.SlackBuild | 2 +- games/nlarn/nlarn.SlackBuild | 3 + games/noteye/noteye.SlackBuild | 3 + games/openlierox/http_curl.patch | 20 -- games/openlierox/openlierox.SlackBuild | 8 +- games/openlierox/openlierox.info | 8 +- games/openttd/openttd.SlackBuild | 2 +- games/pcsxr/pcsxr.SlackBuild | 3 + games/pcsxr/zlib129fix.patch | 34 +++ games/pingus/missing-header.patch | 22 ++ games/pingus/pingus.SlackBuild | 3 + ...okerth-1.1.1-boost-1.65-ambiguous-advance.patch | 14 + ...okerth-1.1.2-boost-1.66-remove-deprecated.patch | 26 ++ games/pokerth/pokerth.SlackBuild | 33 +-- games/pokerth/pokerth.info | 6 +- games/quakespasm/README | 1 + games/quakespasm/doinst.sh | 3 + games/quakespasm/quakespasm.SlackBuild | 91 +++++++ games/quakespasm/quakespasm.desktop | 9 + games/quakespasm/quakespasm.info | 10 + games/quakespasm/slack-desc | 19 ++ games/rlvm/gcc.patch | 24 ++ games/rlvm/rlvm.SlackBuild | 3 + games/roadfighter/gcc.patch | 11 + games/roadfighter/roadfighter.SlackBuild | 3 + .../speed-dreams-params-conversion.patch | 22 ++ games/speed-dreams/speed-dreams.SlackBuild | 3 + games/supertux/supertux.SlackBuild | 18 +- games/supertux/supertux.info | 8 +- games/torcs/torcs.SlackBuild | 2 +- games/trackballs/trackballs.SlackBuild | 53 ++-- games/trackballs/trackballs.info | 8 +- games/warmux/patches/return-null.patch | 11 + games/warmux/warmux.SlackBuild | 5 +- games/widelands/widelands-gcc47.patch | 12 - games/widelands/widelands.SlackBuild | 12 +- games/widelands/widelands.info | 6 +- games/xmoto/xmoto.SlackBuild | 2 +- games/xu4/gcc7.patch | 90 ++++++ games/xu4/xu4.SlackBuild | 3 + games/xye/xye.SlackBuild | 2 +- 85 files changed, 1471 insertions(+), 203 deletions(-) create mode 100644 games/alienarena/alienarena-7.66-no-qglBlitFramebufferEXT.patch create mode 100644 games/alienarena/checkout_code.sh create mode 100644 games/assaultcube/assaultcube-gcc6.patch create mode 100644 games/brainparty/patches/gcc-6.patch create mode 100644 games/chroma/gcc.patch delete mode 100644 games/desmume/osmesa-header-fix.patch create mode 100644 games/etlegacy-from-source/README create mode 100644 games/etlegacy-from-source/doinst.sh create mode 100644 games/etlegacy-from-source/etlegacy-from-source.SlackBuild create mode 100644 games/etlegacy-from-source/etlegacy-from-source.info create mode 100644 games/etlegacy-from-source/files/etlegacy.desktop create mode 100644 games/etlegacy-from-source/files/etlegacy.svg create mode 100644 games/etlegacy-from-source/files/get_tarball_from_git.sh create mode 100644 games/etlegacy-from-source/files/openurl.sh create mode 100644 games/etlegacy-from-source/slack-desc create mode 100644 games/f1spirit/03_gcc6.patch create mode 100644 games/glob2/c++14.patch create mode 100644 games/goonies/gcc6.patch delete mode 100644 games/higan-libretro/openmp.patch.gz delete mode 100644 games/openlierox/http_curl.patch create mode 100644 games/pcsxr/zlib129fix.patch create mode 100644 games/pingus/missing-header.patch create mode 100644 games/pokerth/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch create mode 100644 games/pokerth/pokerth-1.1.2-boost-1.66-remove-deprecated.patch create mode 100644 games/quakespasm/README create mode 100644 games/quakespasm/doinst.sh create mode 100644 games/quakespasm/quakespasm.SlackBuild create mode 100644 games/quakespasm/quakespasm.desktop create mode 100644 games/quakespasm/quakespasm.info create mode 100644 games/quakespasm/slack-desc create mode 100644 games/rlvm/gcc.patch create mode 100644 games/roadfighter/gcc.patch create mode 100644 games/speed-dreams/speed-dreams-params-conversion.patch create mode 100644 games/warmux/patches/return-null.patch delete mode 100644 games/widelands/widelands-gcc47.patch create mode 100644 games/xu4/gcc7.patch (limited to 'games') diff --git a/games/0ad-data/0ad-data.SlackBuild b/games/0ad-data/0ad-data.SlackBuild index 4d84bd6605..259cdbd2db 100644 --- a/games/0ad-data/0ad-data.SlackBuild +++ b/games/0ad-data/0ad-data.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=0ad-data DATANAM=0ad -VERSION=${VERSION:-0.0.21} +VERSION=${VERSION:-0.0.23} RELEASE=${RELEASE:-alpha} ARCH=noarch BUILD=${BUILD:-1} diff --git a/games/0ad-data/0ad-data.info b/games/0ad-data/0ad-data.info index 375d4d178f..cdb378d06a 100644 --- a/games/0ad-data/0ad-data.info +++ b/games/0ad-data/0ad-data.info @@ -1,8 +1,8 @@ PRGNAM="0ad-data" -VERSION="0.0.21" +VERSION="0.0.23" HOMEPAGE="https://play0ad.com/" -DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.21-alpha-unix-data.tar.xz" -MD5SUM="d42b04e1f65d45b5a4bbf8fcea6076f8" +DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.23-alpha-unix-data.tar.xz" +MD5SUM="84dbb0e2fc24e7a972ea6f374fdf308d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/0ad/0ad.SlackBuild b/games/0ad/0ad.SlackBuild index 524b16e406..18b7983b5d 100644 --- a/games/0ad/0ad.SlackBuild +++ b/games/0ad/0ad.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=0ad -VERSION=${VERSION:-0.0.21} +VERSION=${VERSION:-0.0.23} RELEASE=${RELEASE:-alpha} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,26 +71,32 @@ 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 {} \; +unset CPPFLAGS + export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS -fpermissive" -# and yes, it's really necessary to set CPPFLAGS like this :( -export CPPFLAGS="$SLKCFLAGS -fpermissive" +export CXXFLAGS="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1" export LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" +export SDL2_CONFIG="/usr/bin/sdl2-config" -# Fix boost names -sed -i 's/-mt//g' build/premake/extern_libs4.lua +# Fix boost names, include paths and remove isystem +sed -i 's|-mt||g' build/premake/extern_libs5.lua +sed -i 's|/usr/local/include|/usr/include|' build/premake/{extern_libs5.lua,premake5.lua} +sed -i 's|-isystem |-I|' build/premake/premake5/{src/tools/gcc.lua,tests/tools/test_gcc.lua} # build/workspaces/update-workspaces.sh # have a root check, let's disable it. patch -p1 < $CWD/disable-root-check.patch build/workspaces/update-workspaces.sh \ + --without-pch \ --bindir=/usr/games \ --datadir=/usr/share/games/0ad \ --libdir=/usr/lib${LIBDIRSUFFIX}/0ad \ --${ATLAS:-disable}-atlas -make CONFIG=Release -C build/workspaces/gcc +sed -i 's|-isystem |-I|g' build/workspaces/gcc/*.make + +verbose=1 make CONFIG=Release -C build/workspaces/gcc mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/0ad cp binaries/system/*.so* $PKG/usr/lib${LIBDIRSUFFIX}/0ad diff --git a/games/0ad/0ad.info b/games/0ad/0ad.info index 97bc6ce2ac..6acd4190da 100644 --- a/games/0ad/0ad.info +++ b/games/0ad/0ad.info @@ -1,10 +1,10 @@ PRGNAM="0ad" -VERSION="0.0.21" +VERSION="0.0.23" HOMEPAGE="https://play0ad.com/" -DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.21-alpha-unix-build.tar.xz" -MD5SUM="095eade8c9b3deaf25d0d7fa423ff860" +DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.23-alpha-unix-build.tar.xz" +MD5SUM="062efa3857b9ad08243487968adafb7b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="0ad-data OpenAL enet gloox miniupnpc SDL2" +REQUIRES="0ad-data OpenAL enet gloox libsodium miniupnpc SDL2" MAINTAINER="Reedych" EMAIL="reedych@ya.ru" diff --git a/games/alienarena/alienarena-7.66-no-qglBlitFramebufferEXT.patch b/games/alienarena/alienarena-7.66-no-qglBlitFramebufferEXT.patch new file mode 100644 index 0000000000..1f07e24f46 --- /dev/null +++ b/games/alienarena/alienarena-7.66-no-qglBlitFramebufferEXT.patch @@ -0,0 +1,22 @@ +diff -up alienarena-7.66/source/ref_gl/r_shadowmaps.c.no-qglBlitFramebufferEXT alienarena-7.66/source/ref_gl/r_shadowmaps.c +--- alienarena-7.66/source/ref_gl/r_shadowmaps.c.no-qglBlitFramebufferEXT 2013-11-05 14:46:37.611487279 -0500 ++++ alienarena-7.66/source/ref_gl/r_shadowmaps.c 2013-11-05 15:00:47.510933729 -0500 +@@ -95,12 +95,12 @@ void R_CheckFBOExtensions (void) + + //must check for ability to blit(Many old ATI drivers do not support) + //TODO: redundant with previous check? +- if(gl_state.hasFBOblit) { +- if(!qglBlitFramebufferEXT) { +- Com_Printf("glBlitFramebufferEXT not found...\n"); +- gl_state.hasFBOblit = false; +- } +- } ++ // if(gl_state.hasFBOblit) { ++ // if(!qglBlitFramebufferEXT) { ++ // Com_Printf("glBlitFramebufferEXT not found...\n"); ++ // gl_state.hasFBOblit = false; ++ // } ++ //} + } + + diff --git a/games/alienarena/alienarena.SlackBuild b/games/alienarena/alienarena.SlackBuild index 3241f2f1c9..1d3d42b012 100644 --- a/games/alienarena/alienarena.SlackBuild +++ b/games/alienarena/alienarena.SlackBuild @@ -29,7 +29,7 @@ TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,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" @@ -59,15 +59,19 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar -xvf $CWD/$PRGNAM-$VERSION-linux20130827.tar.gz -cd $PRGNAM-$VERSION +rm -rf $PRGNAM-$VERSION-svn4307 +tar -xvf $CWD/$PRGNAM-$VERSION-svn4307.tar.xz +cd $PRGNAM-$VERSION-svn4307 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 {} \; + \( -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 {} \; + +patch -p1 < $CWD/alienarena-7.66-no-qglBlitFramebufferEXT.patch + +rm -rf source/unix/ode sed -i -e "s|crx|$PRGNAM|g" -e "s|\.codred|\.${PRGNAM}|g" Tools/LinuxScripts/* @@ -83,7 +87,7 @@ CXXFLAGS="$SLKCFLAGS" \ --with-zlib \ --enable-ansi-color \ --with-system-libode \ - --with-xf86dga \ + --without-xf86dga \ --with-icondir=/usr/share/pixmaps \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux @@ -91,13 +95,13 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +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 mkdir -p $PKG/usr/share/applications install -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications -cp -a COPYING Tools/* $PKG/usr/doc/$PRGNAM-$VERSION +cp -a Tools/* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild find $PKG/usr/doc -type f -exec chmod 0644 '{}' \; diff --git a/games/alienarena/alienarena.info b/games/alienarena/alienarena.info index a1fff59833..30878e5abc 100644 --- a/games/alienarena/alienarena.info +++ b/games/alienarena/alienarena.info @@ -1,8 +1,8 @@ PRGNAM="alienarena" VERSION="7.66" HOMEPAGE="http://icculus.org/alienarena/rpa/" -DOWNLOAD="http://red.planetarena.org/files/alienarena-7.66-linux20130827.tar.gz" -MD5SUM="50928622f614ccd9938943de5fd37c1a" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/alienarena-7.66-svn4307.tar.xz" +MD5SUM="bdaa12739a196df9fc1abc18a9ccfbbe" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="OpenAL ode" diff --git a/games/alienarena/checkout_code.sh b/games/alienarena/checkout_code.sh new file mode 100644 index 0000000000..d78a5c0e1a --- /dev/null +++ b/games/alienarena/checkout_code.sh @@ -0,0 +1,6 @@ +svn co svn://svn.icculus.org/alienarena/trunk +cd trunk +svn update -r 4307 +cd .. +mv trunk alienarena-7.66-svn4307 +tar --exclude-vcs -cJf alienarena-7.66-svn4307.tar.xz alienarena-7.66-svn4307 diff --git a/games/assaultcube/assaultcube-gcc6.patch b/games/assaultcube/assaultcube-gcc6.patch new file mode 100644 index 0000000000..521372ee9d --- /dev/null +++ b/games/assaultcube/assaultcube-gcc6.patch @@ -0,0 +1,301 @@ +From 752950989b4e286459ca9aee3d61a868d7b20fa4 Mon Sep 17 00:00:00 2001 +From: ac-stef +Date: Sat, 27 Feb 2016 21:28:23 +0100 +Subject: [PATCH] fix some errors and warnings for GCC 6 + +* do not use std::abs() because math.h includes one, that converts ints + to double. Use own iabs(), which directly uses labs() instead. +* don't use the word "gamma" as name for variables +* don't use a homebrew round() function +--- + source/src/bot/bot_waypoint.cpp | 12 ++++++------ + source/src/command.cpp | 2 +- + source/src/command.h | 1 + + source/src/crypto.cpp | 2 +- + source/src/editing.cpp | 6 +++--- + source/src/entity.h | 2 +- + source/src/main.cpp | 8 ++++---- + source/src/platform.h | 9 +-------- + source/src/protos.h | 3 ++- + source/src/rendercubes.cpp | 8 ++++---- + source/src/rendertext.cpp | 4 ++-- + source/src/tools.h | 3 +-- + source/src/world.cpp | 6 +++--- + source/src/worldocull.cpp | 2 +- + source/src/worldrender.cpp | 4 ++-- + 15 files changed, 33 insertions(+), 39 deletions(-) + +diff --git a/source/src/bot/bot_waypoint.cpp b/source/src/bot/bot_waypoint.cpp +index 520c686..7b265ef 100644 +--- a/source/src/bot/bot_waypoint.cpp ++++ b/source/src/bot/bot_waypoint.cpp +@@ -1221,7 +1221,7 @@ void CWaypointClass::CalcCost(node_s *pNode) + flCost += (1.0f-flFraction)*0.5f; + } + +- if ((abs(a) > 4) || (abs(b) > 4)) continue; ++ if ((iabs(a) > 4) || (iabs(b) > 4)) continue; + + vec from = to; + to.z -= (JUMP_HEIGHT - 1.0f); +@@ -1249,7 +1249,7 @@ void CWaypointClass::CalcCost(node_s *pNode) + flCost += (1.0f-flFraction)*0.5f; + } + +- if ((abs(a) > 4) || (abs(b) > 4)) continue; ++ if ((iabs(a) > 4) || (iabs(b) > 4)) continue; + + vec from = to; + to.z -= (JUMP_HEIGHT - 1.0f); +@@ -1671,12 +1671,12 @@ node_s *CWaypointClass::GetNearestTriggerFloodWP(vec v_origin, float flRange) + void CWaypointClass::GetNodeIndexes(const vec &v_origin, short *i, short *j) + { + // Function code by cheesy and PMB +- //*i = abs((int)((int)(v_origin.x + (2*ssize)) / SECTOR_SIZE)); +- //*j = abs((int)((int)(v_origin.y + (2*ssize)) / SECTOR_SIZE)); ++ //*i = iabs((int)((int)(v_origin.x + (2*ssize)) / SECTOR_SIZE)); ++ //*j = iabs((int)((int)(v_origin.y + (2*ssize)) / SECTOR_SIZE)); + //*i = (int)((v_origin.x) / ssize * MAX_MAP_GRIDS); + //*j = (int)((v_origin.y) / ssize * MAX_MAP_GRIDS); +- *i = abs((int)((v_origin.x) / MAX_MAP_GRIDS)); +- *j = abs((int)((v_origin.y) / MAX_MAP_GRIDS)); ++ *i = iabs((int)((v_origin.x) / MAX_MAP_GRIDS)); ++ *j = iabs((int)((v_origin.y) / MAX_MAP_GRIDS)); + + if (*i > MAX_MAP_GRIDS - 1) + *i = MAX_MAP_GRIDS - 1; +diff --git a/source/src/command.cpp b/source/src/command.cpp +index 668f3bf..2a5c90d 100644 +--- a/source/src/command.cpp ++++ b/source/src/command.cpp +@@ -499,7 +499,7 @@ char *executeret(const char *p) // all evaluation hap + if(lc<=seer_t1.length()) + { + int dt = seer_t1[seer_index] - seer_t1[lc]; +- if(abs(dt)<2) ++ if(iabs(dt)<2) + { + conoutf("SCRIPT EXECUTION warning [%d:%s]", &p, p); + seer_t2.add(seer_t1[seer_index]); +diff --git a/source/src/command.h b/source/src/command.h +index a3ca68a..2a3de0c 100644 +--- a/source/src/command.h ++++ b/source/src/command.h +@@ -86,6 +86,7 @@ enum { IEXC_CORE = 0, IEXC_CFG, IEXC_PROMPT, IEXC_MAPCFG, IEXC_MDLCFG, IEXC_NUM + #define VARNP(name, global, min, cur, max) int global = variable(#name, min, cur, max, &global, NULL, true) + #define VARF(name, min, cur, max, body) extern int name; void var_##name() { body; } int name = variable(#name, min, cur, max, &name, var_##name, false) + #define VARFP(name, min, cur, max, body) extern int name; void var_##name() { body; } int name = variable(#name, min, cur, max, &name, var_##name, true) ++#define VARNFP(name, global, min, cur, max, body) extern int global; void var_##name() { body; } int global = variable(#name, min, cur, max, &global, var_##name, true) + + #define FVARP(name, min, cur, max) float name = fvariable(#name, min, cur, max, &name, NULL, true) + #define FVAR(name, min, cur, max) float name = fvariable(#name, min, cur, max, &name, NULL, false) +diff --git a/source/src/crypto.cpp b/source/src/crypto.cpp +index 44041be..0684750 100644 +--- a/source/src/crypto.cpp ++++ b/source/src/crypto.cpp +@@ -778,7 +778,7 @@ static const char *hashchunktoa(tiger::chunk h) // portable solution instead o + const char *genpwdhash(const char *name, const char *pwd, int salt) + { + static string temp; +- formatstring(temp)("%s %d %s %s %d", pwd, salt, name, pwd, abs(PROTOCOL_VERSION)); ++ formatstring(temp)("%s %d %s %s %d", pwd, salt, name, pwd, iabs(PROTOCOL_VERSION)); + tiger::hashval hash; + tiger::hash((uchar *)temp, (int)strlen(temp), hash); + formatstring(temp)("%s %s %s", hashchunktoa(hash.chunks[0]), hashchunktoa(hash.chunks[1]), hashchunktoa(hash.chunks[2])); +diff --git a/source/src/editing.cpp b/source/src/editing.cpp +index 8d5e1ff..745aa98 100644 +--- a/source/src/editing.cpp ++++ b/source/src/editing.cpp +@@ -137,11 +137,11 @@ void checkselections() + void makesel(bool isnew) + { + block &cursel = sels.last(); //RR 10/12/12 - FIXEME, error checking should happen with "isnew", not here checking if it really is new. +- if(isnew || sels.length() == 0) addselection(min(lastx, cx), min(lasty, cy), abs(lastx-cx)+1, abs(lasty-cy)+1, max(lasth, ch)); ++ if(isnew || sels.length() == 0) addselection(min(lastx, cx), min(lasty, cy), iabs(lastx-cx)+1, iabs(lasty-cy)+1, max(lasth, ch)); + else + { + cursel.x = min(lastx, cx); cursel.y = min(lasty, cy); +- cursel.xs = abs(lastx-cx)+1; cursel.ys = abs(lasty-cy)+1; ++ cursel.xs = iabs(lastx-cx)+1; cursel.ys = iabs(lasty-cy)+1; + cursel.h = max(lasth, ch); + correctsel(cursel); + } +@@ -849,7 +849,7 @@ void movemap(int xo, int yo, int zo) // move whole map + } + if(xo || yo) + { +- block b = { max(-xo, 0), max(-yo, 0), ssize - abs(xo), ssize - abs(yo) }, *cp = blockcopy(b); ++ block b = { max(-xo, 0), max(-yo, 0), ssize - iabs(xo), ssize - iabs(yo) }, *cp = blockcopy(b); + cp->x = max(xo, 0); + cp->y = max(yo, 0); + blockpaste(*cp); +diff --git a/source/src/entity.h b/source/src/entity.h +index e2ad32d..84ac385 100644 +--- a/source/src/entity.h ++++ b/source/src/entity.h +@@ -538,7 +538,7 @@ class playerent : public dynent, public playerstate + { + const int maxskin[2] = { 4, 6 }; + t = team_base(t < 0 ? team : t); +- nextskin[t] = abs(s) % maxskin[t]; ++ nextskin[t] = iabs(s) % maxskin[t]; + } + }; + +diff --git a/source/src/main.cpp b/source/src/main.cpp +index 0d57c0c..c51cd74 100644 +--- a/source/src/main.cpp ++++ b/source/src/main.cpp +@@ -519,11 +519,11 @@ void setresdata(char *s, enet_uint32 c) + COMMANDF(screenres, "ii", (int *w, int *h) { screenres(*w, *h); }); + + static int curgamma = 100; +-VARFP(gamma, 30, 100, 300, ++VARNFP(gamma, vgamma, 30, 100, 300, + { +- if(gamma == curgamma) return; +- curgamma = gamma; +- float f = gamma/100.0f; ++ if(vgamma == curgamma) return; ++ curgamma = vgamma; ++ float f = vgamma/100.0f; + if(SDL_SetGamma(f,f,f)==-1) conoutf("Could not set gamma: %s", SDL_GetError()); + }); + +diff --git a/source/src/platform.h b/source/src/platform.h +index aece7e2..fd2eef1 100644 +--- a/source/src/platform.h ++++ b/source/src/platform.h +@@ -2,14 +2,6 @@ + #ifdef _FORTIFY_SOURCE + #undef _FORTIFY_SOURCE + #endif +- +- #define gamma __gamma +-#endif +- +-#include +- +-#ifdef __GNUC__ +- #undef gamma + #endif + + #include +@@ -19,6 +11,7 @@ + #include + #include + #include ++#include + #ifdef __GNUC__ + #include + #include +diff --git a/source/src/protos.h b/source/src/protos.h +index 1c07fad..97b0ee0 100644 +--- a/source/src/protos.h ++++ b/source/src/protos.h +@@ -1053,7 +1053,8 @@ struct servercommandline + { + demo_interm = true; + } +- else if(ai > 0) maxdemos = ai; break; ++ else if(ai > 0) maxdemos = ai; ++ break; + } + case 'W': demopath = a; break; + case 'r': maprot = a; break; +diff --git a/source/src/rendercubes.cpp b/source/src/rendercubes.cpp +index 1940da8..2be7fb0 100644 +--- a/source/src/rendercubes.cpp ++++ b/source/src/rendercubes.cpp +@@ -216,9 +216,9 @@ void render_flat(int wtex, int x, int y, int size, int h, sqr *l1, sqr *l4, sqr + else // continue strip + { + int lighterr = lighterror*2; +- if((abs(ol1r-l3->r)r)g)g)b)b)r)r)g)g)b)b)r)g)b)r)g)b) 0) ? --sp : sp]; // restore color + else if(c == 'b') { if(allowblinkingtext && !ignoreblinkingbit) stack[sp] *= -1; } // blinking text - only if allowed + else stack[sp] = c; +- switch(abs(stack[sp])) ++ switch(iabs(stack[sp])) + { + case '0': color = bvec( 2, 255, 128 ); break; // green: player talk + case '1': color = bvec( 96, 160, 255 ); break; // blue: team chat +@@ -380,7 +380,7 @@ static void text_color(char c, char *stack, int size, int &sp, bvec color, int a + //default: color = bvec( 255, 255, 255 ); break; + } + int b = (int) (sinf(lastmillis / 200.0f) * 115.0f); +- b = stack[sp] > 0 ? 100 : min(abs(b), 100); ++ b = stack[sp] > 0 ? 100 : min(iabs(b), 100); + glColor4ub(color.x, color.y, color.z, (a * b) / 100); + } + } +diff --git a/source/src/tools.h b/source/src/tools.h +index 0aeacff..9eb5a38 100644 +--- a/source/src/tools.h ++++ b/source/src/tools.h +@@ -54,8 +54,7 @@ static inline T min(T a, T b) + { + return a < b ? a : b; + } +- +-static inline float round(float x) { return floor(x + 0.5f); } ++inline int iabs(int n) { return labs(n); } + + #define clamp(a,b,c) (max(b, min(a, c))) + #define rnd(x) ((int)(randomMT()&0xFFFFFF)%(x)) +diff --git a/source/src/world.cpp b/source/src/world.cpp +index 6a1c7bb..99a70eb 100644 +--- a/source/src/world.cpp ++++ b/source/src/world.cpp +@@ -79,9 +79,9 @@ void remip(const block &b, int level) + || o[i]->ceil!=o[3]->ceil + || o[i]->ftex!=o[3]->ftex + || o[i]->ctex!=o[3]->ctex +- || abs(o[i+1]->r-o[0]->r)>lighterr // perfect mip even if light is not exactly equal +- || abs(o[i+1]->g-o[0]->g)>lighterr +- || abs(o[i+1]->b-o[0]->b)>lighterr ++ || iabs(o[i+1]->r-o[0]->r)>lighterr // perfect mip even if light is not exactly equal ++ || iabs(o[i+1]->g-o[0]->g)>lighterr ++ || iabs(o[i+1]->b-o[0]->b)>lighterr + || o[i]->utex!=o[3]->utex + || o[i]->wtex!=o[3]->wtex) goto c; + } +diff --git a/source/src/worldrender.cpp b/source/src/worldrender.cpp +index 8fd3104..45aa606 100644 +--- a/source/src/worldrender.cpp ++++ b/source/src/worldrender.cpp +@@ -297,10 +297,10 @@ void distlod(int &low, int &high, int angle, float widef) + void render_world(float vx, float vy, float vh, float changelod, int yaw, int pitch, float fov, float fovy, int w, int h) + { + loopi(LARGEST_FACTOR) stats[i] = 0; +- min_lod = minimap || (player1->isspectating() && player1->spectatemode == SM_OVERVIEW) ? MAX_LOD : MIN_LOD+abs(pitch)/12; ++ min_lod = minimap || (player1->isspectating() && player1->spectatemode == SM_OVERVIEW) ? MAX_LOD : MIN_LOD+iabs(pitch)/12; + yaw = 360-yaw; + float widef = fov/75.0f; +- int cdist = abs(yaw%90-45); ++ int cdist = iabs(yaw%90-45); + if(cdist<7) // hack to avoid popup at high fovs at 45 yaw + { + min_lod = max(min_lod, (int)(MIN_LOD+(10-cdist)/1.0f*widef)); // less if lod worked better diff --git a/games/assaultcube/assaultcube.SlackBuild b/games/assaultcube/assaultcube.SlackBuild index 0f5f023de6..21563e48f1 100644 --- a/games/assaultcube/assaultcube.SlackBuild +++ b/games/assaultcube/assaultcube.SlackBuild @@ -67,6 +67,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 {} \; +patch -p1 < $CWD/assaultcube-gcc6.patch + # Use custom SLKCFLAGS, remove end-of-line encoding and remove precompiled binaries. patch -p1 < $CWD/Makefile.patch sed -i 's/\r//g' changelog.txt diff --git a/games/berusky2/berusky2.SlackBuild b/games/berusky2/berusky2.SlackBuild index c6021d1496..eee4fade35 100644 --- a/games/berusky2/berusky2.SlackBuild +++ b/games/berusky2/berusky2.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=berusky2 -VERSION=${VERSION:-0.10} +VERSION=${VERSION:-20170630_974e2e5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -69,6 +69,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 {} \; +autoreconf -fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/games/berusky2/berusky2.info b/games/berusky2/berusky2.info index 58aeeb1346..7db48900d1 100644 --- a/games/berusky2/berusky2.info +++ b/games/berusky2/berusky2.info @@ -1,8 +1,8 @@ PRGNAM="berusky2" -VERSION="0.10" +VERSION="20170630_974e2e5" HOMEPAGE="http://anakreon.cz/?q=node/2" -DOWNLOAD="http://downloads.sourceforge.net/project/berusky2/berusky2-0.10/berusky2-0.10.tar.gz" -MD5SUM="3c2d5217f7a61a6fbc13d689b88ec4e4" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/berusky2-20170630_974e2e5.tar.xz" +MD5SUM="f4a1306eeff8a38591898cafa6d1934d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="freealut berusky2-data" diff --git a/games/blobwars/blobwars.SlackBuild b/games/blobwars/blobwars.SlackBuild index 1808f6e6e5..14df961364 100644 --- a/games/blobwars/blobwars.SlackBuild +++ b/games/blobwars/blobwars.SlackBuild @@ -63,7 +63,7 @@ sed -i "s_blobwars/man_blobwars-$VERSION/man_" data/titleWidgets #doc dir fixed for slackware and help display bug. #note. the trailing / on the first make command is intentional. -make USEPAK=1 CFLAGS="$SLKCFLAGS" DOCDIR="/usr/doc/$PRGNAM-$VERSION/" +make USEPAK=1 CFLAGS="$SLKCFLAGS -Wno-error=format-truncation=" DOCDIR="/usr/doc/$PRGNAM-$VERSION/" make install USEPAK=1 DESTDIR=$PKG DOCDIR="/usr/doc/$PRGNAM-$VERSION" find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/games/bloodfrontier/bloodfrontier.SlackBuild b/games/bloodfrontier/bloodfrontier.SlackBuild index 0f85e8fca2..2470383f75 100644 --- a/games/bloodfrontier/bloodfrontier.SlackBuild +++ b/games/bloodfrontier/bloodfrontier.SlackBuild @@ -64,7 +64,7 @@ sed -i "s|X11R6/lib|lib${LIBDIRSUFFIX} -lX11|" src/Makefile make -C src \ CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS -Wno-narrowing" \ LDFLAGS="$SLKLDFLAGS" mkdir -p $PKG/usr/bin $PKG/usr/lib${LIBDIRSUFFIX}/bloodfrontier/bin diff --git a/games/brainparty/brainparty.SlackBuild b/games/brainparty/brainparty.SlackBuild index 71770366d2..8536a94331 100644 --- a/games/brainparty/brainparty.SlackBuild +++ b/games/brainparty/brainparty.SlackBuild @@ -51,6 +51,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Thanks debian +patch -p1 < $CWD/patches/gcc-6.patch + # Save directory patch. Data directory patch. Use custom SLKCFLAGS. patch -p1 < $CWD/patches/brainparty-0.5-savegame.patch patch -p1 < $CWD/patches/brainparty-0.5-data-directory.patch diff --git a/games/brainparty/patches/gcc-6.patch b/games/brainparty/patches/gcc-6.patch new file mode 100644 index 0000000000..67dfadd540 --- /dev/null +++ b/games/brainparty/patches/gcc-6.patch @@ -0,0 +1,47 @@ +Description: Fix FTBFS on GCC 6 by removing use of hash_set class +Author: James Cowgill +Bug-Debian: https://bugs.debian.org/811885 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/WordList.h ++++ b/WordList.h +@@ -18,24 +18,11 @@ + #ifndef __WORDLIST_H__ + #define __WORDLIST_H__ + ++#include + #include +-#include ++#include + +-using namespace std; +-using namespace __gnu_cxx; +- +-namespace __gnu_cxx +-{ +- template<> struct hash< std::string > +- { +- size_t operator()( const std::string& x ) const +- { +- return hash< const char* >()( x.c_str() ); +- } +- }; +-} +- +-typedef hash_set > string_hash_set; ++typedef std::unordered_set string_hash_set; + + class WordList { + private: +--- a/Makefile ++++ b/Makefile +@@ -17,6 +17,9 @@ else + OSXCOMPAT = + endif + ++# enable c++11 ++CXXFLAGS += -std=c++11 ++ + # object files have corresponding source files + CXX = g++ + diff --git a/games/chroma/chroma.SlackBuild b/games/chroma/chroma.SlackBuild index f46788b147..420528367e 100644 --- a/games/chroma/chroma.SlackBuild +++ b/games/chroma/chroma.SlackBuild @@ -11,7 +11,7 @@ TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -22,8 +22,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" @@ -46,10 +46,13 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 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 {} \; + \( -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 {} \; + +# Removed some inline declarations (incompatible with newer versions of gcc) +patch -p1 < $CWD/gcc.patch CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -61,7 +64,7 @@ CFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +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 mkdir -p $PKG/usr/share/{applications,pixmaps} diff --git a/games/chroma/gcc.patch b/games/chroma/gcc.patch new file mode 100644 index 0000000000..22ef1b2ea7 --- /dev/null +++ b/games/chroma/gcc.patch @@ -0,0 +1,30 @@ +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; diff --git a/games/desmume/desmume.SlackBuild b/games/desmume/desmume.SlackBuild index 4e5fec368b..a13e3a7cd7 100644 --- a/games/desmume/desmume.SlackBuild +++ b/games/desmume/desmume.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=desmume -VERSION=${VERSION:-0.9.11} +VERSION=${VERSION:-20170609_73c8f8a} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -77,8 +77,8 @@ for i in AUTHORS; do mv ${i}.new $i done -# Fix missing header. -patch -p1 < $CWD/osmesa-header-fix.patch +cd src/frontend/posix +./autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -88,7 +88,6 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --enable-osmesa \ --enable-hud \ - --enable-gdb-stub \ --enable-wifi \ --enable-openal \ --enable-glade \ @@ -99,6 +98,8 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG +cd ../../.. + 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 @@ -106,7 +107,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS ChangeLog COPYING INSTALL README README.LIN ds*.txt \ + AUTHORS ChangeLog COPYING README README.LIN doc/ds*.txt \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/games/desmume/desmume.info b/games/desmume/desmume.info index b06dd8381e..66f876b98e 100644 --- a/games/desmume/desmume.info +++ b/games/desmume/desmume.info @@ -1,8 +1,8 @@ PRGNAM="desmume" -VERSION="0.9.11" +VERSION="20170609_73c8f8a" HOMEPAGE="http://desmume.org/" -DOWNLOAD="http://downloads.sourceforge.net/desmume/desmume-0.9.11.tar.gz" -MD5SUM="269b5d4ddc5715720469a9d0efc53044" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/desmume-20170609_73c8f8a.tar.xz" +MD5SUM="e28cf3d3578c48670aab926b28818057" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="OpenAL agg gtkglext soundtouch zziplib" diff --git a/games/desmume/osmesa-header-fix.patch b/games/desmume/osmesa-header-fix.patch deleted file mode 100644 index 7ba5bd070f..0000000000 --- a/games/desmume/osmesa-header-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur desmume-0.9.11.orig/src/gtk/osmesa_3Demu.cpp desmume-0.9.11/src/gtk/osmesa_3Demu.cpp ---- desmume-0.9.11.orig/src/gtk/osmesa_3Demu.cpp 2015-02-14 15:05:26.000000000 +0000 -+++ desmume-0.9.11/src/gtk/osmesa_3Demu.cpp 2015-05-09 02:00:11.279367208 +0000 -@@ -20,6 +20,7 @@ - - #ifdef HAVE_LIBOSMESA - #include -+#include - #include - #include "../OGLRender.h" - #include "osmesa_3Demu.h" diff --git a/games/dolphin-emu/dolphin-emu.SlackBuild b/games/dolphin-emu/dolphin-emu.SlackBuild index a254bf93aa..676a965265 100644 --- a/games/dolphin-emu/dolphin-emu.SlackBuild +++ b/games/dolphin-emu/dolphin-emu.SlackBuild @@ -69,6 +69,9 @@ 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 {} \; +# From upstream +sed -i 's/CHAR_/CHARACTER_/g' Source/Core/VideoBackends/OGL/RasterFont.cpp + mkdir build cd build cmake -G "Unix Makefiles" \ diff --git a/games/etlegacy-from-source/README b/games/etlegacy-from-source/README new file mode 100644 index 0000000000..4d6185212f --- /dev/null +++ b/games/etlegacy-from-source/README @@ -0,0 +1,25 @@ +Wolfenstein Enemy Territory: Legacy is a project that aims to create +a fully compatible client and server for the popular online FPS game +Wolfenstein: Enemy Territory. + +It's based on its source code released under the GPLv3 license. + +The main goal of this project is to fix bugs, remove old dependencies +and make it playable on all major operating systems while still +remaining compatible with the ET 2.60b version and as many of its mods +as possible. + +This script builds the server with omni-bot support (x86 32bit only). +(http://www.omni-bot.com/) + +To play you *need* also the data files from the original game +(etlegacy-data). + +* WARNING * + +To have a client/server compatible with the existing ones (to play +on the existing online servers), build it on/for a 32bit platform. + +This version of the game is built from source: the resulting package +conflicts with the etlegacy SlackBuild you can find on SBo so install +only one of the two. diff --git a/games/etlegacy-from-source/doinst.sh b/games/etlegacy-from-source/doinst.sh new file mode 100644 index 0000000000..5fb28930db --- /dev/null +++ b/games/etlegacy-from-source/doinst.sh @@ -0,0 +1,3 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi diff --git a/games/etlegacy-from-source/etlegacy-from-source.SlackBuild b/games/etlegacy-from-source/etlegacy-from-source.SlackBuild new file mode 100644 index 0000000000..ef7b9625c1 --- /dev/null +++ b/games/etlegacy-from-source/etlegacy-from-source.SlackBuild @@ -0,0 +1,186 @@ +#!/bin/sh + +# Slackware build script for etlegacy-from-source +# Copyright 2013-2016 Matteo Bernardini , Pisa, Italy +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 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. + +PRGNAM=etlegacy-from-source +SRCNAM=etlegacy +VERSION=${VERSION:-20170622_ae5f9ef} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i*86) ARCH=i686 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +w_omnibot=1 +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mtune=i686" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=core2" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + w_omnibot=0 +else + SLKCFLAGS="-O2" + w_omnibot=0 +fi + +set -e # Exit on most errors + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* +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 \) -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 {} \; + +# Fix location of the omnibot.zip, man install path +# and leave the relative path to binaries off +sed -i "s|share/man|man|" CMakeLists.txt +sed -i "s|^\.\/etl|etl|" misc/etl_bot.sh misc/etlded_bot.sh + +mkdir -p build/legacy +cd build + ln -s $CWD/omnibot-linux-latest.tar.gz legacy/ + ln -s $CWD/wolfadmin.tar.gz legacy/ + # We have to use bundled lua and sdl + cmake \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DINSTALL_DEFAULT_BINDIR="bin" \ + -DINSTALL_DEFAULT_MODDIR="share/$SRCNAM" \ + -DINSTALL_DEFAULT_BASEDIR="/usr/share/$SRCNAM" \ + -DBUILD_CLIENT=1 \ + -DBUILD_SERVER=1 \ + -DBUILD_MOD=1 \ + -DBUILD_MOD_PK3=1 \ + -DBUILD_PAK3_PK3=1 \ + -DFEATURE_CURL=1 \ + -DFEATURE_OGG_VORBIS=1 \ + -DFEATURE_THEORA=1 \ + -DFEATURE_OPENAL=1 \ + -DFEATURE_FREETYPE=1 \ + -DFEATURE_TRACKER=0 \ + -DFEATURE_GETTEXT=1 \ + -DFEATURE_JANSSON=0 \ + -DFEATURE_DBMS=1 \ + -DFEATURE_LUA=1 \ + -DFEATURE_MULTIVIEW=1 \ + -DFEATURE_EDV=1 \ + -DFEATURE_ANTICHEAT=1 \ + -DFEATURE_RATING=1 \ + -DFEATURE_AUTOUPDATE=0 \ + -DFEATURE_LUASQL=1 \ + -DFEATURE_OMNIBOT=$w_omnibot \ + -DINSTALL_EXTRA=1 \ + -DINSTALL_OMNIBOT=$w_omnibot \ + -DINSTALL_GEOIP=1 \ + -DINSTALL_WOLFADMIN=1 \ + -DCROSS_COMPILE32=0 \ + -DFEATURE_OGG_VORBIS=1 \ + -DFEATURE_FREETYPE=1 \ + -DFEATURE_AUTOUPDATE=0 \ + -DFEATURE_IPV6=0 \ + -DFEATURE_GETTEXT=1 \ + -DFEATURE_RENDERER2=1 \ + -DFEATURE_RENDERER_GLES=0 \ + -DRENDERER_DYNAMIC=1 \ + -DBUNDLED_LIBS=1 \ + -DBUNDLED_SDL=1 \ + -DBUNDLED_LUA=1 \ + -DBUNDLED_OGG_VORBIS=1 \ + -DBUNDLED_THEORA=1 \ + -DBUNDLED_SQLITE3=1 \ + -DBUNDLED_JANSSON=0 \ + -DBUNDLED_ZLIB=1 \ + -DBUNDLED_MINIZIP=1 \ + -DBUNDLED_CURL=1 \ + -DBUNDLED_OPENAL=1 \ + -DBUNDLED_JPEG=1 \ + -DBUNDLED_GLEW=0 \ + -DBUNDLED_FREETYPE=1 \ + -DCMAKE_BUILD_TYPE=Release .. + + # JIC, sanitize the just-uncompressed stuff + chown -R root:root legacy + find -L legacy \ + \( -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 {} \; + make + make install DESTDIR=$PKG +cd .. + +# Move man pages in the proper place +mv $PKG/usr/share/man $PKG/usr/man + +# Install a script to open urls, and move two scripts to launch the client and +# the dedicated server with omnibot support in the binaries folder +install -m 0755 $CWD/files/openurl.sh $PKG/usr/bin/openurl.sh +mv $PKG/usr/share/$SRCNAM/etl*.sh $PKG/usr/bin/ +chmod 755 $PKG/usr/bin/etl*.sh + +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 + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +# Install an icon, a desktop file and man pages +install -m 0644 -D $CWD/files/$SRCNAM.svg \ + $PKG/usr/share/pixmaps/$SRCNAM.svg +install -m 0644 -D $CWD/files/$SRCNAM.desktop \ + $PKG/usr/share/applications/$SRCNAM.desktop +mkdir -p $PKG/usr/man/man6 +gzip -9 -c docs/linux/man/man6/etl.6 > $PKG/usr/man/man6/etl.6.gz +gzip -9 -c docs/linux/man/man6/etlded.6 > $PKG/usr/man/man6/etlded.6.gz + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mv \ + $PKG/usr/share/$SRCNAM/*.txt \ + $PKG/usr/doc/$PRGNAM-$VERSION +cp README* $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/games/etlegacy-from-source/etlegacy-from-source.info b/games/etlegacy-from-source/etlegacy-from-source.info new file mode 100644 index 0000000000..34a4acd1e3 --- /dev/null +++ b/games/etlegacy-from-source/etlegacy-from-source.info @@ -0,0 +1,16 @@ +PRGNAM="etlegacy" +VERSION="20170622_ae5f9ef" +HOMEPAGE="http://www.etlegacy.com" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/etlegacy-20170622_ae5f9ef.tar.xz \ + http://ponce.cc/slackware/sources/repo/omnibot-linux-latest.tar.gz \ + http://ponce.cc/slackware/sources/repo/wolfadmin.tar.gz \ + http://ponce.cc/slackware/sources/repo/GeoIP.dat.gz" +MD5SUM="3932c07ac68fac86d2d15679029028a3 \ + 714a5c98406e455377e6cea1fdfdd16b \ + a322a5b8bf478643785362f35143847c \ + 5ac81d5de50c557be104e4c43f851c36" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="%README% etlegacy-data zenity" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/games/etlegacy-from-source/files/etlegacy.desktop b/games/etlegacy-from-source/files/etlegacy.desktop new file mode 100644 index 0000000000..2618c0c13e --- /dev/null +++ b/games/etlegacy-from-source/files/etlegacy.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=ETLegacy +Comment=ET: Legacy (Collaborative online FPS) +Exec=etl +Icon=etl +Terminal=false +Type=Application +Categories=Game; +StartupNotify=false diff --git a/games/etlegacy-from-source/files/etlegacy.svg b/games/etlegacy-from-source/files/etlegacy.svg new file mode 100644 index 0000000000..51754d1889 --- /dev/null +++ b/games/etlegacy-from-source/files/etlegacy.svg @@ -0,0 +1,100 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/games/etlegacy-from-source/files/get_tarball_from_git.sh b/games/etlegacy-from-source/files/get_tarball_from_git.sh new file mode 100644 index 0000000000..42aaa1626d --- /dev/null +++ b/games/etlegacy-from-source/files/get_tarball_from_git.sh @@ -0,0 +1,31 @@ +rm -fR /tmp/tmp-etlegacy +mkdir -p /tmp/tmp-etlegacy +cd /tmp/tmp-etlegacy +git clone git://github.com/etlegacy/etlegacy.git +cd etlegacy +git submodule init +git submodule update +cd libs +git archive master > ../../libs.tar +cd .. +cd scripts +git archive master > ../../scripts.tar +cd .. +COMMIT=$( git log -1 | head -1 | cut -c 8-14 ) +COMMDATE=$( git log -1 --date=short | grep ^Date | awk '{print $2}' | sed 's/-//g' ) +rm -f /tmp/etlegacy-${COMMDATE}_${COMMIT}.tar.xz +git archive master > ../src.tar +cd .. +mkdir etlegacy-${COMMDATE}_${COMMIT} +cd etlegacy-${COMMDATE}_${COMMIT} +tar xf ../src.tar +cd libs +tar xf ../../libs.tar +cd .. +cd scripts +tar xf ../../scripts.tar +cd .. +cd .. +rm -f src.tar libs.tar scripts.tar +tar Jcf /tmp/etlegacy-${COMMDATE}_${COMMIT}.tar.xz etlegacy-${COMMDATE}_${COMMIT} +echo "/tmp/etlegacy-${COMMDATE}_${COMMIT}.tar.xz done." diff --git a/games/etlegacy-from-source/files/openurl.sh b/games/etlegacy-from-source/files/openurl.sh new file mode 100644 index 0000000000..274f12d08d --- /dev/null +++ b/games/etlegacy-from-source/files/openurl.sh @@ -0,0 +1,15 @@ +#!/bin/sh +# use this script to customize the way the engine should open URLs + +for test_browser in firefox seamonkey opera +do + browser=`which $test_browser` + if [ "x$browser" != "x" ] + then + $browser -remote "openURL($1,new-window)" || $browser "$1" + exit + fi +done +# xterm -e lynx "$1" + +exit 0 diff --git a/games/etlegacy-from-source/slack-desc b/games/etlegacy-from-source/slack-desc new file mode 100644 index 0000000000..e6866b09b8 --- /dev/null +++ b/games/etlegacy-from-source/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +etlegacy-from-source: etlegacy-from-source (collaborative FPS) +etlegacy-from-source: +etlegacy-from-source: Wolfenstein Enemy Territory : Legacy is a project that aims to create +etlegacy-from-source: a fully compatible client and server for the popular online FPS game +etlegacy-from-source: Wolfenstein: Enemy Territory. +etlegacy-from-source: It's based on its source code released under the GPLv3 license. +etlegacy-from-source: The main goal of this project is to fix bugs, remove old dependencies +etlegacy-from-source: and make it playable on all major operating systems while still +etlegacy-from-source: remaining compatible with the ET 2.60b version and as many of its mods +etlegacy-from-source: as possible. This version is built from source. +etlegacy-from-source: homepage: http://www.etlegacy.com/ diff --git a/games/f1spirit/03_gcc6.patch b/games/f1spirit/03_gcc6.patch new file mode 100644 index 0000000000..fbae3bd832 --- /dev/null +++ b/games/f1spirit/03_gcc6.patch @@ -0,0 +1,12 @@ +diff -Naur f1spirit-0.rc9.1615.orig/sources/auxiliar.cpp f1spirit-0.rc9.1615/sources/auxiliar.cpp +--- f1spirit-0.rc9.1615.orig/sources/auxiliar.cpp 2009-02-06 10:54:49.000000000 +0100 ++++ f1spirit-0.rc9.1615/sources/auxiliar.cpp 2017-06-23 11:57:14.145689872 +0200 +@@ -93,7 +93,7 @@ + + if (tmp == 0 || + mask == 0) +- return false; ++ return 0; + + res = SDL_DisplayFormatAlpha(tmp); + diff --git a/games/f1spirit/f1spirit.SlackBuild b/games/f1spirit/f1spirit.SlackBuild index 8109ea68a7..4b9206d624 100644 --- a/games/f1spirit/f1spirit.SlackBuild +++ b/games/f1spirit/f1spirit.SlackBuild @@ -53,6 +53,9 @@ 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 for the newer gccs +patch -p1 < $CWD/03_gcc6.patch + make install PREFIX=$PKG/usr find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/games/frogatto/frogatto.SlackBuild b/games/frogatto/frogatto.SlackBuild index c292542f79..ab84386732 100644 --- a/games/frogatto/frogatto.SlackBuild +++ b/games/frogatto/frogatto.SlackBuild @@ -69,13 +69,13 @@ 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 linking with boost libs -sed -i 's,-mt,,g' Makefile +# Fix linking with boost libs and remove -Werror +sed -i -e 's,-mt,,g' -e 's, -Werror,,' Makefile make \ OPTIMIZE=no \ USE_CCACHE=no \ - CXX=g++ \ + CXX=clang++ \ CXXFLAGS="$SLKCFLAGS" \ LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" diff --git a/games/gargoyle/gargoyle.SlackBuild b/games/gargoyle/gargoyle.SlackBuild index bfa8194bcd..ea191f0d13 100644 --- a/games/gargoyle/gargoyle.SlackBuild +++ b/games/gargoyle/gargoyle.SlackBuild @@ -59,7 +59,7 @@ jam -s DESTDIR=$PKG \ -s _BINDIR=/usr/libexec/gargoyle \ -s _APPDIR=/usr/libexec/gargoyle \ -s _LIBDIR=/usr/lib$LIBDIRSUFFIX/gargoyle \ - -s CCFLAGS="$SLKCFLAGS -fgnu89-inline" \ + -s CCFLAGS="$SLKCFLAGS -fgnu89-inline -fpermissive" \ -dx \ install diff --git a/games/glob2/c++14.patch b/games/glob2/c++14.patch new file mode 100644 index 0000000000..6465f659af --- /dev/null +++ b/games/glob2/c++14.patch @@ -0,0 +1,46 @@ +# HG changeset patch +# User Jonathan Wakely +# Date 1485875296 0 +# Node ID c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a +# Parent c4da01699846179d8bf21e8dae2b973158ec0775 +Fix last argument to ChooseMapScreen constructor + +Since C++14 'false' is not a valid null pointer constant, so cannot be passed +to functions expecting pointer arguments. + +diff --git a/src/EditorMainMenu.cpp b/src/EditorMainMenu.cpp +--- a/src/EditorMainMenu.cpp ++++ b/src/EditorMainMenu.cpp +@@ -90,7 +90,7 @@ + } + else if (par1==LOADMAP) + { +- ChooseMapScreen chooseMapScreen("maps", "map", false, "games", "game", false); ++ ChooseMapScreen chooseMapScreen("maps", "map", false, "games", "game", NULL); + int rc=chooseMapScreen.execute(globalContainer->gfx, 40); + if (rc==ChooseMapScreen::OK) + { +diff --git a/src/LANMenuScreen.cpp b/src/LANMenuScreen.cpp +--- a/src/LANMenuScreen.cpp ++++ b/src/LANMenuScreen.cpp +@@ -62,7 +62,7 @@ + } + else if(par1 == HOST) + { +- ChooseMapScreen cms("maps", "map", false, "games", "game", false); ++ ChooseMapScreen cms("maps", "map", false, "games", "game", NULL); + int rc = cms.execute(globalContainer->gfx, 40); + if(rc == ChooseMapScreen::OK) + { +diff --git a/src/YOGClientLobbyScreen.cpp b/src/YOGClientLobbyScreen.cpp +--- a/src/YOGClientLobbyScreen.cpp ++++ b/src/YOGClientLobbyScreen.cpp +@@ -326,7 +326,7 @@ + + void YOGClientLobbyScreen::hostGame() + { +- ChooseMapScreen cms("maps", "map", false, "games", "game", false); ++ ChooseMapScreen cms("maps", "map", false, "games", "game", NULL); + int rc = cms.execute(globalContainer->gfx, 40); + if(rc == ChooseMapScreen::OK) + { diff --git a/games/glob2/glob2.SlackBuild b/games/glob2/glob2.SlackBuild index 6bb719cd26..435af508ff 100644 --- a/games/glob2/glob2.SlackBuild +++ b/games/glob2/glob2.SlackBuild @@ -71,6 +71,9 @@ find -L . \ patch -p1 < $CWD/fixes.patch +# From upstream +patch -p1 < $CWD/c++14.patch + mkdir -p $PKG/usr/bin \ $PKG/usr/share/games/$PRGNAM diff --git a/games/gnubg/gnubg.SlackBuild b/games/gnubg/gnubg.SlackBuild index 2e987b8125..6ba3010227 100644 --- a/games/gnubg/gnubg.SlackBuild +++ b/games/gnubg/gnubg.SlackBuild @@ -69,8 +69,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 {} \; -./autogen.sh - LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \ CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/games/goonies/gcc6.patch b/games/goonies/gcc6.patch new file mode 100644 index 0000000000..f586243cf1 --- /dev/null +++ b/games/goonies/gcc6.patch @@ -0,0 +1,12 @@ +diff -Naur goonies-1.4.1528.orig/src/auxiliar.cpp goonies-1.4.1528/src/auxiliar.cpp +--- goonies-1.4.1528.orig/src/auxiliar.cpp 2009-03-12 09:43:32.000000000 +0100 ++++ goonies-1.4.1528/src/auxiliar.cpp 2017-06-23 10:24:12.765749591 +0200 +@@ -94,7 +94,7 @@ + + if (tmp == 0 || + mask == 0) +- return false; ++ return 0; + + res = SDL_DisplayFormatAlpha(tmp); + diff --git a/games/goonies/goonies.SlackBuild b/games/goonies/goonies.SlackBuild index 760f39ef37..236b445e1c 100644 --- a/games/goonies/goonies.SlackBuild +++ b/games/goonies/goonies.SlackBuild @@ -70,6 +70,9 @@ 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 for the newer compilers +patch -p1 < $CWD/gcc6.patch + # fix linker and installation paths patch -p1 < $CWD/makefile.patch diff --git a/games/higan-libretro/higan-libretro.SlackBuild b/games/higan-libretro/higan-libretro.SlackBuild index 38b0128ded..525ad5a332 100644 --- a/games/higan-libretro/higan-libretro.SlackBuild +++ b/games/higan-libretro/higan-libretro.SlackBuild @@ -74,10 +74,6 @@ find -L . \ [ "${DEBUG:=optimize}" != optimize ] && DEBUG=debug -# Use the gcc OpenMP implementation since clang in Slackware-14.2 does -# not include OpenMP. -zcat $CWD/openmp.patch.gz | patch -p1 - # clang++ avoids crashes when loading content for the second time make -C higan \ binary=library \ diff --git a/games/higan-libretro/openmp.patch.gz b/games/higan-libretro/openmp.patch.gz deleted file mode 100644 index 8b988733e2..0000000000 Binary files a/games/higan-libretro/openmp.patch.gz and /dev/null differ diff --git a/games/higan/higan.SlackBuild b/games/higan/higan.SlackBuild index a9511ca33c..2b0a75c1bc 100644 --- a/games/higan/higan.SlackBuild +++ b/games/higan/higan.SlackBuild @@ -27,7 +27,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=higan -VERSION=${VERSION:-101} +VERSION=${VERSION:-103} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -94,7 +94,7 @@ install -m 755 icarus/out/icarus $PKG/usr/bin/ install -m 755 higan/out/higan $PKG/usr/bin/ install -m 644 higan/data/higan.desktop $PKG/usr/share/applications/ install -m 644 higan/data/higan.png $PKG/usr/share/pixmaps/ -cp -dr higan/systems/* higan/data/cheats.bml $PKG/usr/share/higan/ +cp -dr higan/systems/* $PKG/usr/share/higan/ 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 diff --git a/games/higan/higan.info b/games/higan/higan.info index 9f10b12b0d..e8a96fd65d 100644 --- a/games/higan/higan.info +++ b/games/higan/higan.info @@ -1,8 +1,8 @@ PRGNAM="higan" -VERSION="101" +VERSION="103" HOMEPAGE="https://byuu.org/emulation/higan/" -DOWNLOAD="http://helmet.kafuka.org/higan_v101-source.7z" -MD5SUM="7c0f00b05c5589ea01b5c2b18c452e0f" +DOWNLOAD="https://download.byuu.org/higan_v103-source.7z" +MD5SUM="b45deec0c92a05d1677c919d0d387a19" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="OpenAL p7zip" diff --git a/games/micropolis/micropolis.SlackBuild b/games/micropolis/micropolis.SlackBuild index 2f74efd4ae..b9617b5e6c 100644 --- a/games/micropolis/micropolis.SlackBuild +++ b/games/micropolis/micropolis.SlackBuild @@ -78,7 +78,7 @@ find . -iname \*makefile\* -o -iname \*.mk \ # comment out the next line to disable the airplane crash disaster sed -i -e 's/-DNO_AIRCRASH//' src/sim/makefile -make -j1 PREFIX=/usr DOCDIR=/usr/doc/$PRGNAM-$VERSION SLKCFLAGS="$SLKCFLAGS" +make -j1 PREFIX=/usr DOCDIR=/usr/doc/$PRGNAM-$VERSION SLKCFLAGS="$SLKCFLAGS -DTCL_IEEE_FP_MATH" make -j1 install PREFIX=/usr DOCDIR=/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG # Make .desktop file pass desktop-file-validate diff --git a/games/nlarn/nlarn.SlackBuild b/games/nlarn/nlarn.SlackBuild index d182511647..fef6664c4e 100644 --- a/games/nlarn/nlarn.SlackBuild +++ b/games/nlarn/nlarn.SlackBuild @@ -69,6 +69,9 @@ 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 {} \; +# set our CFLAGS, disable -Werror and use ncurses6-config +sed -i -e "s|-Werror ||" -e "s|-O2|$SLKCFLAGS|" -e "s|ncurses5|ncurses6|" Makefile + make find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/games/noteye/noteye.SlackBuild b/games/noteye/noteye.SlackBuild index 828e65f220..4ae54029b8 100644 --- a/games/noteye/noteye.SlackBuild +++ b/games/noteye/noteye.SlackBuild @@ -74,6 +74,9 @@ sed -i 's,-llua5.1,-llua,g' src/Makefile # store the writable high score file in /var, not /usr/share. sed -i 's,"hydrascores.sav","/var/games/hydrascores.sav",' hydra/hydra.cpp +# use clang++ as the code won't build with gcc >= 5.x +sed -i 's|g++ |clang++ |' src/Makefile + make -C src CFLAGS="$SLKCFLAGS" # The 'make install' target is bad and wrong. Don't use. diff --git a/games/openlierox/http_curl.patch b/games/openlierox/http_curl.patch deleted file mode 100644 index c74fcd3d22..0000000000 --- a/games/openlierox/http_curl.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- openlierox-0.58_rc3/include/HTTP.original.h 2014-04-19 19:58:09.213990582 +0300 -+++ openlierox-0.58_rc3/include/HTTP.h 2014-04-21 13:45:11.485876525 +0300 -@@ -21,7 +21,6 @@ - - #include - #include --#include - #include - - #include "Networking.h" ---- openlierox-0.58_rc3/src/common/HTTP.original.cpp 2014-04-19 20:48:13.255434896 +0300 -+++ openlierox-0.58_rc3/src/common/HTTP.cpp 2014-04-21 13:48:08.493663623 +0300 -@@ -25,7 +25,6 @@ - #include - #endif - #include --#include - #include - - #include "LieroX.h" diff --git a/games/openlierox/openlierox.SlackBuild b/games/openlierox/openlierox.SlackBuild index 352f4ce332..3a407c408d 100644 --- a/games/openlierox/openlierox.SlackBuild +++ b/games/openlierox/openlierox.SlackBuild @@ -23,8 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=openlierox -VERSION=${VERSION:-0.58_rc3} -SRCVER=$(echo $VERSION | tr _ .) +VERSION=${VERSION:-20170313_3825306} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -61,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -70,9 +69,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 {} \; -# curl/types.h removed because not supported from new CURL versions -patch -p1 < $CWD/http_curl.patch - mkdir -p build cd build cmake . \ diff --git a/games/openlierox/openlierox.info b/games/openlierox/openlierox.info index 44f5cb5814..f3115748bd 100644 --- a/games/openlierox/openlierox.info +++ b/games/openlierox/openlierox.info @@ -1,10 +1,10 @@ PRGNAM="openlierox" -VERSION="0.58_rc3" +VERSION="20170313_3825306" HOMEPAGE="http://www.openlierox.net/" -DOWNLOAD="https://github.com/albertz/openlierox/archive/0.58_rc3.tar.gz" -MD5SUM="4ce050ca069b1ebe2fb720b3a1c2c760" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/openlierox-20170313_3825306.tar.xz" +MD5SUM="7540eab45506561ccae1e75cf42a8fdd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="HawkNL" +REQUIRES="HawkNL freealut" MAINTAINER="Dimitris Zlatanidis" EMAIL="d.zlatanidis@gmail.com" diff --git a/games/openttd/openttd.SlackBuild b/games/openttd/openttd.SlackBuild index 2430a7d97a..c8955ce4b9 100644 --- a/games/openttd/openttd.SlackBuild +++ b/games/openttd/openttd.SlackBuild @@ -88,7 +88,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1" \ ./configure \ --prefix-dir=/usr \ --binary-dir=/games \ diff --git a/games/pcsxr/pcsxr.SlackBuild b/games/pcsxr/pcsxr.SlackBuild index 49eba27447..af5d3b9f33 100644 --- a/games/pcsxr/pcsxr.SlackBuild +++ b/games/pcsxr/pcsxr.SlackBuild @@ -69,6 +69,9 @@ 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 {} \; +# Thanks fedora +patch -p1 < $CWD/zlib129fix.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ LDFLAGS="$SLKLDFLAGS" \ diff --git a/games/pcsxr/zlib129fix.patch b/games/pcsxr/zlib129fix.patch new file mode 100644 index 0000000000..632e1ceffe --- /dev/null +++ b/games/pcsxr/zlib129fix.patch @@ -0,0 +1,34 @@ +diff --git a/pcsxr/configure.ac b/pcsxr/configure.ac +index 300bb18..128b4f9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -113,6 +113,9 @@ if test "x$have_xtest" = xno; then + AC_MSG_ERROR([unable to find xtest headers]) + fi + ++AC_CHECK_LIB(z, uncompress2, ++[ AC_DEFINE([HAVE_UNCOMPRESS2], [1], [Define if libz supports uncompress2]) ]) ++ + AM_CONDITIONAL(USE_LIBCDIO, false) + + AC_ARG_ENABLE(libcdio, [ --enable-libcdio use GNU libcdio for CD-ROM support (default=no)], +diff --git a/pcsxr/libpcsxcore/cdriso.c b/pcsxr/libpcsxcore/cdriso.c +index 04e866d..fb7f28a 100644 +--- a/libpcsxcore/cdriso.c ++++ b/libpcsxcore/cdriso.c +@@ -1219,6 +1219,7 @@ static int cdread_sub_mixed(FILE *f, unsigned int base, void *dest, int sector) + return ret; + } + ++#ifndef HAVE_UNCOMPRESS2 + static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size) + { + static z_stream z; +@@ -1249,6 +1250,7 @@ static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned lo + *out_size -= z.avail_out; + return ret == 1 ? 0 : ret; + } ++#endif + + static int cdread_compressed(FILE *f, unsigned int base, void *dest, int sector) + { diff --git a/games/pingus/missing-header.patch b/games/pingus/missing-header.patch new file mode 100644 index 0000000000..cc1dcdbb85 --- /dev/null +++ b/games/pingus/missing-header.patch @@ -0,0 +1,22 @@ +From df6e2f445d3e2925a94d22faeb17be9444513e92 Mon Sep 17 00:00:00 2001 +From: Jonathan Wakely +Date: Mon, 30 Jan 2017 15:41:53 +0000 +Subject: [PATCH] Add missing header for std::function and std::bind + +--- + src/pingus/screens/demo_session.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/pingus/screens/demo_session.cpp b/src/pingus/screens/demo_session.cpp +index e3ec49a2c..f887e50f0 100644 +--- a/src/pingus/screens/demo_session.cpp ++++ b/src/pingus/screens/demo_session.cpp +@@ -18,6 +18,7 @@ + + #include + #include ++#include + + #include "engine/gui/gui_manager.hpp" + #include "engine/gui/surface_button.hpp" + diff --git a/games/pingus/pingus.SlackBuild b/games/pingus/pingus.SlackBuild index e7abf19ddf..a548e5c2a2 100644 --- a/games/pingus/pingus.SlackBuild +++ b/games/pingus/pingus.SlackBuild @@ -69,6 +69,9 @@ 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 {} \; +# Thanks archlinux +patch -p1 < $CWD/missing-header.patch + mkdir -p build scons \ diff --git a/games/pokerth/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch b/games/pokerth/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch new file mode 100644 index 0000000000..2e8c9c50c5 --- /dev/null +++ b/games/pokerth/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch @@ -0,0 +1,14 @@ +Boost 1.65 made 'advance()' ambiguous. +Bug: https://bugs.gentoo.org/show_bug.cgi?id=629966 + +--- a/src/gui/qt/gametable/gametableimpl.cpp ++++ b/src/gui/qt/gametable/gametableimpl.cpp +@@ -3859,7 +3859,7 @@ + int playerCount = static_cast(seatList->size()); + if (id < playerCount) { + PlayerListIterator pos = seatList->begin(); +- advance(pos, id); ++ std::advance(pos, id); + myStartWindow->getSession()->startVoteKickPlayer((*pos)->getMyUniqueID()); + } + } diff --git a/games/pokerth/pokerth-1.1.2-boost-1.66-remove-deprecated.patch b/games/pokerth/pokerth-1.1.2-boost-1.66-remove-deprecated.patch new file mode 100644 index 0000000000..d265eb1db9 --- /dev/null +++ b/games/pokerth/pokerth-1.1.2-boost-1.66-remove-deprecated.patch @@ -0,0 +1,26 @@ +diff -Naur pokerth-1.1.2-rc.orig/src/net/common/clientthread.cpp pokerth-1.1.2-rc/src/net/common/clientthread.cpp +--- pokerth-1.1.2-rc.orig/src/net/common/clientthread.cpp 2017-08-16 14:24:03.000000000 +0200 ++++ pokerth-1.1.2-rc/src/net/common/clientthread.cpp 2017-12-23 21:48:58.660592917 +0100 +@@ -993,8 +993,7 @@ + newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v6())); + else + newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v4())); +- boost::asio::socket_base::non_blocking_io command(true); +- newSock->io_control(command); ++ newSock->non_blocking(true); + newSock->set_option(tcp::no_delay(true)); + newSock->set_option(boost::asio::socket_base::keep_alive(true)); + +diff -Naur pokerth-1.1.2-rc.orig/src/net/serveraccepthelper.h pokerth-1.1.2-rc/src/net/serveraccepthelper.h +--- pokerth-1.1.2-rc.orig/src/net/serveraccepthelper.h 2017-08-16 14:24:03.000000000 +0200 ++++ pokerth-1.1.2-rc/src/net/serveraccepthelper.h 2017-12-23 22:05:51.075613870 +0100 +@@ -122,8 +122,7 @@ + const boost::system::error_code &error) + { + if (!error) { +- boost::asio::socket_base::non_blocking_io command(true); +- acceptedSocket->io_control(command); ++ acceptedSocket->non_blocking(true); + acceptedSocket->set_option(typename P::no_delay(true)); + acceptedSocket->set_option(boost::asio::socket_base::keep_alive(true)); + boost::shared_ptr sessionData(new SessionData(acceptedSocket, m_lobbyThread->GetNextSessionId(), m_lobbyThread->GetSessionDataCallback(), *m_ioService)); diff --git a/games/pokerth/pokerth.SlackBuild b/games/pokerth/pokerth.SlackBuild index 5412cb9fbe..d2dfdc6278 100644 --- a/games/pokerth/pokerth.SlackBuild +++ b/games/pokerth/pokerth.SlackBuild @@ -26,14 +26,13 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pokerth -SRCNAM=PokerTH -VERSION=${VERSION:-1.1.1} +VERSION=${VERSION:-1.1.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -44,8 +43,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" @@ -61,11 +60,11 @@ fi set -e rm -rf $PKG -rm -rf $TMP/$SRCNAM-$VERSION-src mkdir -p $TMP $PKG $OUTPUT cd $TMP -tar xvf $CWD/$SRCNAM-$VERSION-src.tar.bz2 -cd $SRCNAM-$VERSION-src +rm -rf $PRGNAM-$VERSION-rc +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION-rc chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -73,18 +72,20 @@ 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 {} \; -# The headers to which this file points have moved in the newer libircclient... -# Thanks ponce. -sed -i "s|libircclient/||" src/net/common/ircthread.cpp +patch -p1 < $CWD/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch +patch -p1 < $CWD/pokerth-1.1.2-boost-1.66-remove-deprecated.patch -qmake pokerth.pro +qmake -spec linux-g++ pokerth.pro +make +mkdir -p $PKG/usr/bin +install -s -D -m 0755 bin/pokerth_server $PKG/usr/bin +install -s -D -m 0755 chatcleaner $PKG/usr/bin +make clean -make #CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" +qmake CONFIG+="client" -spec linux-g++ pokerth.pro +make make install DESTDIR=$PKG INSTALL_ROOT=$PKG -mkdir -p $PKG/usr/bin -install -s -D -m 0755 $TMP/$SRCNAM-$VERSION-src/bin/pokerth_server $PKG/usr/bin - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a COPYING INSTALL TODO ChangeLog \ $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/games/pokerth/pokerth.info b/games/pokerth/pokerth.info index 24588c1909..e3a18f5b1a 100644 --- a/games/pokerth/pokerth.info +++ b/games/pokerth/pokerth.info @@ -1,8 +1,8 @@ PRGNAM="pokerth" -VERSION="1.1.1" +VERSION="1.1.2" HOMEPAGE="https://www.pokerth.net" -DOWNLOAD="https://downloads.sourceforge.net/pokerth/PokerTH-1.1.1-src.tar.bz2" -MD5SUM="a7f76f95782099f966e5f2b6809f502a" +DOWNLOAD="https://downloads.sourceforge.net/pokerth/pokerth-1.1.2.tar.gz" +MD5SUM="8fd7d7fc7ece17315e58aa3240dd4586" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libgsasl libircclient tinyxml protobuf" diff --git a/games/quakespasm/README b/games/quakespasm/README new file mode 100644 index 0000000000..0761ca3e56 --- /dev/null +++ b/games/quakespasm/README @@ -0,0 +1 @@ +This is an engine for iD software's Quake. diff --git a/games/quakespasm/doinst.sh b/games/quakespasm/doinst.sh new file mode 100644 index 0000000000..5fb28930db --- /dev/null +++ b/games/quakespasm/doinst.sh @@ -0,0 +1,3 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi diff --git a/games/quakespasm/quakespasm.SlackBuild b/games/quakespasm/quakespasm.SlackBuild new file mode 100644 index 0000000000..eceb66be24 --- /dev/null +++ b/games/quakespasm/quakespasm.SlackBuild @@ -0,0 +1,91 @@ +#!/bin/sh + +# Slackware build script for quakespasm + +# Copyright 2018 Matteo Bernardini , Pisa, Italy +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 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. + +PRGNAM=quakespasm +VERSION=${VERSION:-0.93.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i686 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +DOCS="LICENSE.txt Quakespasm*" + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tgz +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 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +cd Quake +make DO_USERDIRS=1 USE_SDL2=1 +cd .. +# manual installation +install -D -m0755 Quake/$PRGNAM $PKG/usr/games/$PRGNAM +install -D -m0644 Misc/QuakeSpasm_512.png $PKG/usr/share/pixmaps/$PRGNAM.png +install -D -m0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop + +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 + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/games/quakespasm/quakespasm.desktop b/games/quakespasm/quakespasm.desktop new file mode 100644 index 0000000000..b143371c46 --- /dev/null +++ b/games/quakespasm/quakespasm.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Quakespasm +GenericName=Quakespasm port of ID Software's Quake +Exec=quakespasm +Terminal=false +Type=Application +Categories=Game; +Icon=quakespasm +StartupNotify=false diff --git a/games/quakespasm/quakespasm.info b/games/quakespasm/quakespasm.info new file mode 100644 index 0000000000..79c67d69d0 --- /dev/null +++ b/games/quakespasm/quakespasm.info @@ -0,0 +1,10 @@ +PRGNAM="quakespasm" +VERSION="0.93.1" +HOMEPAGE="https://quakespasm.sourceforge.net" +DOWNLOAD="https://downloads.sourceforge.net/quakespasm/quakespasm-0.93.1.tgz" +MD5SUM="cfb60350081c5526d2bb3320280c1f8c" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="SDL2" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/games/quakespasm/slack-desc b/games/quakespasm/slack-desc new file mode 100644 index 0000000000..5b7ef8a8db --- /dev/null +++ b/games/quakespasm/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +quakespasm: quakespasm (quake engine) +quakespasm: +quakespasm: This is an engine for iD software's Quake. +quakespasm: +quakespasm: homepage: https://quakespasm.sourceforge.net +quakespasm: +quakespasm: +quakespasm: +quakespasm: +quakespasm: +quakespasm: diff --git a/games/rlvm/gcc.patch b/games/rlvm/gcc.patch new file mode 100644 index 0000000000..fc4bedfb69 --- /dev/null +++ b/games/rlvm/gcc.patch @@ -0,0 +1,24 @@ +From 668863d2222b962ee8e7d9829e972ef05c990302 Mon Sep 17 00:00:00 2001 +From: Elliot Glaysher +Date: Sun, 22 May 2016 10:29:27 -0700 +Subject: [PATCH] Theoretical compile fix for gcc 4 series. + +Adds to GraphicsObject. + +Closes #76. +--- + src/systems/base/graphics_object.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/systems/base/graphics_object.cc b/src/systems/base/graphics_object.cc +index 9490b3b0..af22177d 100644 +--- a/src/systems/base/graphics_object.cc ++++ b/src/systems/base/graphics_object.cc +@@ -36,6 +36,7 @@ + #include + + #include ++#include + #include + #include + #include diff --git a/games/rlvm/rlvm.SlackBuild b/games/rlvm/rlvm.SlackBuild index cce10004ed..b4561a4ddd 100644 --- a/games/rlvm/rlvm.SlackBuild +++ b/games/rlvm/rlvm.SlackBuild @@ -59,6 +59,9 @@ 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 {} \; +# From upstream +patch -p1 < $CWD/gcc.patch + scons --release mkdir -p ${PKG}/usr/games ${PKG}/usr/bin diff --git a/games/roadfighter/gcc.patch b/games/roadfighter/gcc.patch new file mode 100644 index 0000000000..c7e3e3895a --- /dev/null +++ b/games/roadfighter/gcc.patch @@ -0,0 +1,11 @@ +--- src/auxiliar.cpp 2016-06-07 16:18:19.672015830 +0200 ++++ src/auxiliar.cpp 2016-06-07 16:18:41.678235683 +0200 +@@ -84,7 +84,7 @@ + mask=IMG_Load(name); + + if (tmp==0 || +- mask==0) return false; ++ mask==0) return 0; + + res=SDL_DisplayFormatAlpha(tmp); + diff --git a/games/roadfighter/roadfighter.SlackBuild b/games/roadfighter/roadfighter.SlackBuild index eee917a62b..95ea975803 100644 --- a/games/roadfighter/roadfighter.SlackBuild +++ b/games/roadfighter/roadfighter.SlackBuild @@ -73,6 +73,9 @@ find -L . \ # fix installation path patch -p1 < $CWD/makefile.patch +# fix building with the newer gcc +patch -p0 < $CWD/gcc.patch + make make install PREFIX=$PKG diff --git a/games/speed-dreams/speed-dreams-params-conversion.patch b/games/speed-dreams/speed-dreams-params-conversion.patch new file mode 100644 index 0000000000..16bd19d2f7 --- /dev/null +++ b/games/speed-dreams/speed-dreams-params-conversion.patch @@ -0,0 +1,22 @@ +--- src/libs/tgf/params.cpp.orig 2017-02-14 10:32:38.701066427 +0100 ++++ src/libs/tgf/params.cpp 2017-02-14 10:33:19.425879383 +0100 +@@ -3809,7 +3809,7 @@ + if( lastSlash != NULL && key ) + { + *key = lastSlash + 1; +- lastSlash = '\0'; ++ lastSlash = NULL; + } + else if( key ) + { +--- src/libs/tgfclient/openalmusicplayer.cpp.orig 2017-02-14 13:14:10.870735828 +0100 ++++ src/libs/tgfclient/openalmusicplayer.cpp 2017-02-14 13:15:11.592684153 +0100 +@@ -171,7 +171,7 @@ + { + char pcm[BUFFERSIZE]; + int size = 0; +- const char* error = '\0'; ++ const char* error = NULL; + + if (!_stream->read(pcm, BUFFERSIZE, &size, error)) { + GfLogError("OpenALMusicPlayer: Stream read error: %s\n", error); diff --git a/games/speed-dreams/speed-dreams.SlackBuild b/games/speed-dreams/speed-dreams.SlackBuild index 3887ecbb24..8cb03ba098 100644 --- a/games/speed-dreams/speed-dreams.SlackBuild +++ b/games/speed-dreams/speed-dreams.SlackBuild @@ -58,6 +58,9 @@ 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 {} \; +# Thanks fedora +patch -p0 < $CWD/speed-dreams-params-conversion.patch + mkdir build cd build diff --git a/games/supertux/supertux.SlackBuild b/games/supertux/supertux.SlackBuild index 72e00c5c77..0702138737 100644 --- a/games/supertux/supertux.SlackBuild +++ b/games/supertux/supertux.SlackBuild @@ -23,13 +23,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=supertux -VERSION=${VERSION:-0.4.0} +VERSION=${VERSION:-0.5.1} +SRCNAM=SuperTux-v$VERSION-Source BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +41,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" @@ -59,9 +60,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -cd $PRGNAM-$VERSION +rm -rf $SRCNAM +tar xvf $CWD/$SRCNAM.tar.gz +cd $SRCNAM chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -78,7 +79,8 @@ cd build -DINSTALL_SUBDIR_BIN=bin \ -DINSTALL_SUBDIR_SHARE=share/$PRGNAM \ -DINSTALL_SUBDIR_DOC=doc/$PRGNAM-$VERSION \ - -DLIB_SUBDIR=lib${LIBDIRSUFFIX} \ + -DLIB_SUFFIX=lib${LIBDIRSUFFIX} \ + -DENABLE_BOOST_STATIC_LIBS=OFF \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/games/supertux/supertux.info b/games/supertux/supertux.info index 299d644b04..af87995d0e 100644 --- a/games/supertux/supertux.info +++ b/games/supertux/supertux.info @@ -1,10 +1,10 @@ PRGNAM="supertux" -VERSION="0.4.0" +VERSION="0.5.1" HOMEPAGE="https://github.com/SuperTux/supertux" -DOWNLOAD="https://github.com/SuperTux/supertux/releases/download/v0.4.0/supertux-0.4.0.tar.bz2" -MD5SUM="8acc3aa1077f0da95c99fdd5f4925088" +DOWNLOAD="https://github.com/SuperTux/supertux/releases/download/v0.5.1/SuperTux-v0.5.1-Source.tar.gz" +MD5SUM="b8b678362e3c5c9e366fb1fb3550a2e0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="SDL2_image OpenAL physfs" +REQUIRES="SDL2_image OpenAL" MAINTAINER="Robby Workman" EMAIL="rworkman@slackbuilds.org" diff --git a/games/torcs/torcs.SlackBuild b/games/torcs/torcs.SlackBuild index 76ee0f1fae..479625aa7b 100644 --- a/games/torcs/torcs.SlackBuild +++ b/games/torcs/torcs.SlackBuild @@ -58,7 +58,7 @@ find -L . \ patch -p1 < $CWD/gcc7.diff CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -fpermissive" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib$LIBDIRSUFFIX \ diff --git a/games/trackballs/trackballs.SlackBuild b/games/trackballs/trackballs.SlackBuild index 810a670593..db385f6a63 100644 --- a/games/trackballs/trackballs.SlackBuild +++ b/games/trackballs/trackballs.SlackBuild @@ -9,8 +9,8 @@ # 20170621 bkw: fix build on -current PRGNAM=trackballs -VERSION=${VERSION:-1.1.4} -BUILD=${BUILD:-3} +VERSION=${VERSION:-1.2.4} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -53,37 +53,32 @@ 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 {} \; - -# Apply two patches from redhat: one to fix building and running with guile-2.0.x, -# another to fix "Esc" behaviour. Also abs.diff, which fixes the build for -# gcc 7 from -current. -for i in $CWD/patches/* ; do patch -p1 < $i ; done - -# Make icons honor DESTDIR (thanks to Johannes for this fix) -sed -i 's/ $(iconsdir)/ $(DESTDIR)$(iconsdir)/g' share/icons/Makefile.in - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG + \( -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 {} \; + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DMAN_INSTALL_DIR=/usr/man \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install DESTDIR=$PKG +cd .. + +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 gzip $PKG/usr/man/man6/$PRGNAM.6 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html -cp -a README AUTHORS COPYING ChangeLog FAQ TODO $PKG/usr/doc/$PRGNAM-$VERSION -cp -a docs/*.html $PKG/usr/doc/$PRGNAM-$VERSION/html +cp -a ABOUT-NLS.md AUTHORS.md COPYING FAQ.md NEWS.md README.md TODO.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a docs/* $PKG/usr/doc/$PRGNAM-$VERSION/html cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/usr/share/applications diff --git a/games/trackballs/trackballs.info b/games/trackballs/trackballs.info index c51e5bd3ef..5d365d9074 100644 --- a/games/trackballs/trackballs.info +++ b/games/trackballs/trackballs.info @@ -1,8 +1,8 @@ PRGNAM="trackballs" -VERSION="1.1.4" -HOMEPAGE="http://trackballs.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/trackballs/trackballs-1.1.4.tar.gz" -MD5SUM="84e2e8bb68842a636da91673751279a0" +VERSION="1.2.4" +HOMEPAGE="https://trackballs.github.io" +DOWNLOAD="https://github.com/trackballs/trackballs/archive/v1.2.4/trackballs-1.2.4.tar.gz" +MD5SUM="e95cb7aa9d344daa4e136dcd67b31b5f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/warmux/patches/return-null.patch b/games/warmux/patches/return-null.patch new file mode 100644 index 0000000000..851dfcbd16 --- /dev/null +++ b/games/warmux/patches/return-null.patch @@ -0,0 +1,11 @@ +--- src/interface/weapon_menu.cpp.orig 2016-05-09 15:22:36.895266463 +0200 ++++ src/interface/weapon_menu.cpp 2016-05-09 15:21:38.518476191 +0200 +@@ -391,7 +391,7 @@ + Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly) + { + if (!show) +- return false; ++ return NULL; + const std::vector& items = poly->GetItem(); + WeaponMenuItem * tmp; + Interface::GetInstance()->SetCurrentOverflyWeapon(NULL); diff --git a/games/warmux/warmux.SlackBuild b/games/warmux/warmux.SlackBuild index 20cd3cd3a5..1c6d7ff6c7 100644 --- a/games/warmux/warmux.SlackBuild +++ b/games/warmux/warmux.SlackBuild @@ -80,6 +80,9 @@ patch -p1 < $CWD/patches/include-zlib.patch sed -i "s|SDLNet_Read32(buffer)|SDLNet_Read32(const_cast(buffer))|" \ lib/warmux/action/action.cpp +# Fix for gcc-6.x +patch -p0 < $CWD/patches/return-null.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -90,7 +93,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --program-prefix="" \ --program-suffix="" \ - --enable-fribidi \ + --disable-fribidi \ --enable-servers \ --build=$ARCH-slackware-linux diff --git a/games/widelands/widelands-gcc47.patch b/games/widelands/widelands-gcc47.patch deleted file mode 100644 index 9ea19c3571..0000000000 --- a/games/widelands/widelands-gcc47.patch +++ /dev/null @@ -1,12 +0,0 @@ -=== modified file 'src/main.cc' ---- src/main.cc 2012-02-15 21:25:34 +0000 -+++ src/main.cc 2012-05-02 07:43:01 +0000 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #include - - diff --git a/games/widelands/widelands.SlackBuild b/games/widelands/widelands.SlackBuild index 793f7a1215..8482c99d6d 100644 --- a/games/widelands/widelands.SlackBuild +++ b/games/widelands/widelands.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=widelands -VERSION=${VERSION:-build19} +VERSION=${VERSION:-20170618} 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-src -tar xvf $CWD/$PRGNAM-$VERSION-src.tar.bz2 -cd $PRGNAM-$VERSION-src +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -69,9 +69,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 compiling with gcc 4.7 -patch -p0 -i $CWD/widelands-gcc47.patch - mkdir -p build1 cd build1 cmake \ @@ -98,7 +95,6 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION mv $PKG/usr/{VERSION,ChangeLog,CREDITS,COPYING} $PKG/usr/doc/$PRGNAM-$VERSION -cp -a WL_RELEASE $PKG/usr/doc/$PRGNAM-$VERSION/ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/games/widelands/widelands.info b/games/widelands/widelands.info index a98f31a43a..2d69dba9b4 100644 --- a/games/widelands/widelands.info +++ b/games/widelands/widelands.info @@ -1,8 +1,8 @@ PRGNAM="widelands" -VERSION="build19" +VERSION="20170618" HOMEPAGE="http://www.widelands.org" -DOWNLOAD="https://launchpad.net/widelands/build19/build19/+download/widelands-build19-src.tar.bz2" -MD5SUM="0ef7ccf021b8001056739f755500366d" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/widelands-20170618.tar.bz2" +MD5SUM="a293822f26386c16a66d4801716e0740" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="SDL2_image SDL2_mixer SDL2_net SDL2_ttf lua" diff --git a/games/xmoto/xmoto.SlackBuild b/games/xmoto/xmoto.SlackBuild index 539df636d7..7dc9f71b37 100644 --- a/games/xmoto/xmoto.SlackBuild +++ b/games/xmoto/xmoto.SlackBuild @@ -52,7 +52,7 @@ find -L . \ patch -p1 < $CWD/gcc-4.7.patch CFLAGS="$SLKCFLAGS -DdDOUBLE" \ -CXXFLAGS="$SLKCFLAGS -DdDOUBLE" \ +CXXFLAGS="$SLKCFLAGS -DdDOUBLE -fpermissive" \ LDFLAGS="-ldl" \ ./configure \ --prefix=/usr \ diff --git a/games/xu4/gcc7.patch b/games/xu4/gcc7.patch new file mode 100644 index 0000000000..29f2cceee4 --- /dev/null +++ b/games/xu4/gcc7.patch @@ -0,0 +1,90 @@ +--- xu4-20130612_svn/src/image_sdl.cpp.orig 2017-07-07 05:16:49.443617174 +0700 ++++ xu4-20130612_svn/src/image_sdl.cpp 2017-07-07 05:25:40.763657058 +0700 +@@ -349,7 +349,7 @@ + unsigned int y_finish = std::min(int(bottom), oy + span + 1); + for (y = y_start; y < y_finish; ++y) { + +- int divisor = 1 + span * 2 - abs(ox - x) - abs(oy - y); ++ int divisor = 1 + span * 2 - std::abs((long int) (ox - x)) - std::abs((long int) (oy - y)); + + unsigned int r, g, b, a; + getPixel(x, y, r, g, b, a); +--- xu4-20130612_svn/src/map.cpp.orig 2017-07-07 05:26:04.108658810 +0700 ++++ xu4-20130612_svn/src/map.cpp 2017-07-07 05:28:17.857668850 +0700 +@@ -123,14 +123,14 @@ + if (map && map->border_behavior == Map::BORDER_WRAP) { + MapCoords me = *this; + +- if (abs(me.x - c.x) > abs(me.x + map->width - c.x)) ++ if (std::abs((long int) (me.x - c.x)) > std::abs((long int) (me.x + map->width - c.x))) + me.x += map->width; +- else if (abs(me.x - c.x) > abs(me.x - map->width - c.x)) ++ else if (std::abs((long int) (me.x - c.x)) > std::abs((long int) (me.x - map->width - c.x))) + me.x -= map->width; + +- if (abs(me.y - c.y) > abs(me.y + map->width - c.y)) ++ if (std::abs((long int) (me.y - c.y)) > std::abs((long int) (me.y + map->width - c.y))) + me.y += map->height; +- else if (abs(me.y - c.y) > abs(me.y - map->width - c.y)) ++ else if (std::abs((long int) (me.y - c.y)) > std::abs((long int) (me.y - map->width - c.y))) + me.y -= map->height; + + dx = me.x - c.x; +--- xu4-20130612_svn/src/person.cpp.orig 2017-07-07 05:28:34.604670107 +0700 ++++ xu4-20130612_svn/src/person.cpp 2017-07-07 05:29:29.432674223 +0700 +@@ -221,7 +221,7 @@ + eventHandler->pushController(&getPlayerCtrl); + int player = getPlayerCtrl.waitFor(); + if (player != -1) { +- string player_str = to_string(player+1); ++ string player_str = to_string((long int) player+1); + script->setVar(script->getInputName(), player_str); + } + else script->unsetVar(script->getInputName()); +--- xu4-20130612_svn/src/script.cpp.orig 2017-07-07 05:29:46.242675485 +0700 ++++ xu4-20130612_svn/src/script.cpp 2017-07-07 05:31:00.015681023 +0700 +@@ -44,7 +44,7 @@ + + Script::Variable::Variable(const int &v) : set(true) { + i_val = v; +- s_val = to_string(v); ++ s_val = to_string((long int) v); + } + + int& Script::Variable::getInt() { return i_val; } +@@ -503,7 +503,7 @@ + } + // Get the current iterator for our loop + else if (item == "iterator") +- prop = to_string(this->iterator); ++ prop = to_string((long int) this->iterator); + else if ((pos = item.find("show_inventory:")) < item.length()) { + pos = item.find(":"); + string itemScript = item.substr(pos+1); +@@ -611,7 +611,7 @@ + if (content.empty()) + errorWarning("Error: empty math() function"); + +- prop = to_string(mathValue(content)); ++ prop = to_string((long int) mathValue(content)); + } + + /** +@@ -643,7 +643,7 @@ + + /* generate a random number */ + else if (funcName == "random") +- prop = to_string(xu4_random((int)strtol(content.c_str(), NULL, 10))); ++ prop = to_string((long int) xu4_random((int)strtol(content.c_str(), NULL, 10))); + + /* replaced with "true" if content is empty, or "false" if not */ + else if (funcName == "isempty") { +@@ -1391,7 +1391,7 @@ + string children_results; + + mathParseChildren(current, &children_results); +- *result = to_string(mathValue(children_results)); ++ *result = to_string((long int) mathValue(children_results)); + } + } + } diff --git a/games/xu4/xu4.SlackBuild b/games/xu4/xu4.SlackBuild index d4439ca2cc..08a91827bf 100644 --- a/games/xu4/xu4.SlackBuild +++ b/games/xu4/xu4.SlackBuild @@ -73,6 +73,9 @@ sed -i -e '/border\.png/s,^,//,' src/imagemgr.cpp # validate the game's XML files. So: sed -i '/#define *DEFAULT_VALIDATE_XML/s,1,0,' src/settings.h +# Patch for GCC 7 +patch -p1 < $CWD/gcc7.patch + # The -DNPERF stops u4 from creating a debug/ in the current dir. make -C src DEBUGCXXFLAGS="-DNPERF $SLKCFLAGS" prefix=/usr libdir=$PKGLIBDIR make -C src install prefix=$PKG/usr libdir=$PKGLIBDIR diff --git a/games/xye/xye.SlackBuild b/games/xye/xye.SlackBuild index 8487aecd40..fbe4eba763 100644 --- a/games/xye/xye.SlackBuild +++ b/games/xye/xye.SlackBuild @@ -72,7 +72,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -Wno-error=narrowing" \ ./configure \ --prefix=/usr \ --bindir=/usr/bin \ -- cgit v1.2.3