diff options
Diffstat (limited to 'games/openclonk')
-rw-r--r-- | games/openclonk/findreadline.patch | 42 | ||||
-rw-r--r-- | games/openclonk/openclonk.SlackBuild | 30 | ||||
-rw-r--r-- | games/openclonk/openclonk.info | 10 |
3 files changed, 26 insertions, 56 deletions
diff --git a/games/openclonk/findreadline.patch b/games/openclonk/findreadline.patch deleted file mode 100644 index d27bedd169..0000000000 --- a/games/openclonk/findreadline.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- openclonk-7.0/cmake/FindReadline.orig.cmake 2016-02-15 06:17:40.060057466 +0200 -+++ openclonk-7.0/cmake/FindReadline.cmake 2016-02-15 06:20:18.585067004 +0200 -@@ -1,6 +1,6 @@ - # OpenClonk, http://www.openclonk.org - # --# Copyright (c) 2011-2013, The OpenClonk Team and contributors -+# Copyright (c) 2011-2016, The OpenClonk Team and contributors - # - # Distributed under the terms of the ISC license; see accompanying file - # "COPYING" for details. -@@ -26,6 +26,14 @@ - - FIND_PATH(READLINE_INCLUDE_DIR readline.h PATH_SUFFIXES readline) - -+# Unmodified readline depends on symbols from termcap without explicitly -+# linking to it. Several distributions patch this to make it link against -+# terminfo from ncurses or another termcap library, but some don't. To avoid -+# having to run link tests, we'll just look for and use any termcap providing -+# library. -+FIND_LIBRARY(TERMCAP_LIBRARY NAMES tinfo termcap ncursesw ncurses cursesw curses) -+ -+ - SET(READLINE_NAMES readline libreadline) - FIND_LIBRARY(READLINE_LIBRARY NAMES ${READLINE_NAMES} ) - -@@ -35,10 +43,13 @@ - FIND_PACKAGE_HANDLE_STANDARD_ARGS(READLINE DEFAULT_MSG READLINE_LIBRARY READLINE_INCLUDE_DIR) - - IF(READLINE_FOUND) -- SET( READLINE_LIBRARIES ${READLINE_LIBRARY} ) -+ if(TERMCAP_LIBRARY) -+ set(READLINE_LIBRARIES ${READLINE_LIBRARY} ${TERMCAP_LIBRARY}) -+ else() -+ set(READLINE_LIBRARIES ${READLINE_LIBRARY}) -+ endif() - ELSE(READLINE_FOUND) - SET( READLINE_LIBRARIES ) - ENDIF(READLINE_FOUND) - --MARK_AS_ADVANCED( READLINE_LIBRARY READLINE_INCLUDE_DIR ) -- -+MARK_AS_ADVANCED( READLINE_LIBRARY TERMINFO_LIBRARY READLINE_INCLUDE_DIR ) diff --git a/games/openclonk/openclonk.SlackBuild b/games/openclonk/openclonk.SlackBuild index f62004104c..cbb50438e3 100644 --- a/games/openclonk/openclonk.SlackBuild +++ b/games/openclonk/openclonk.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for openclonk -# Copyright 2014-2016 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2014-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=openclonk -VERSION=${VERSION:-7.0} +VERSION=${VERSION:-8.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +38,11 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -60,16 +67,21 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz +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 \ + -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 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -patch -p1 < $CWD/findreadline.patch +sed -i '1i#include <limits>' \ + src/script/C4AulParse.cpp \ + src/editor/C4EditCursor.cpp \ + src/gui/C4ScriptGuiWindow.cpp \ + src/object/C4Object.cpp \ + src/editor/C4ConsoleQtPropListViewer.cpp mkdir -p build cd build @@ -95,4 +107,4 @@ 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} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/games/openclonk/openclonk.info b/games/openclonk/openclonk.info index c25d756ff7..dcfa5ad45e 100644 --- a/games/openclonk/openclonk.info +++ b/games/openclonk/openclonk.info @@ -1,10 +1,10 @@ PRGNAM="openclonk" -VERSION="7.0" +VERSION="8.1" HOMEPAGE="http://www.openclonk.org/" -DOWNLOAD="https://github.com/openclonk/openclonk/archive/v7.0.tar.gz" -MD5SUM="ea3a4bbacb57fbd0ec6ac568b670132d" +DOWNLOAD="https://github.com/openclonk/openclonk/archive/v8.1/openclonk-8.1.tar.gz" +MD5SUM="7b05d434e070257beb62e908557c1d0e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="freealut gtksourceview3 libupnp" +REQUIRES="freealut miniupnpc" MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" |