aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2022-02-23 02:10:30 -0500
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2022-02-23 20:10:27 +0700
commit4cad69eceb338c5cdd37d61899c728b9eb205859 (patch)
tree21e294d585876545aaae555e6643a285594b078d
parentde064cd224b0ae04e1cf33a8627898429776d637 (diff)
games/openclonk: Updated for version 8.0.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--games/openclonk/findreadline.patch42
-rw-r--r--games/openclonk/openclonk.SlackBuild22
-rw-r--r--games/openclonk/openclonk.info6
3 files changed, 17 insertions, 53 deletions
diff --git a/games/openclonk/findreadline.patch b/games/openclonk/findreadline.patch
deleted file mode 100644
index d27bedd16943..000000000000
--- 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 70cd359aa6e8..92fe4e3ee417 100644
--- a/games/openclonk/openclonk.SlackBuild
+++ b/games/openclonk/openclonk.SlackBuild
@@ -22,10 +22,14 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20220222 bkw: Modified by SlackBuilds.org:
+# - update for v8.0. 7.0 won't build on Slackware 15.0. plus it would
+# need libupnp-legacy, which is probably going away soon.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=openclonk
-VERSION=${VERSION:-7.0}
+VERSION=${VERSION:-8.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -38,9 +42,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -75,11 +76,16 @@ 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 {} \;
-
-patch -p1 < $CWD/findreadline.patch
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+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
diff --git a/games/openclonk/openclonk.info b/games/openclonk/openclonk.info
index ce873397d77d..8207826b0cd5 100644
--- a/games/openclonk/openclonk.info
+++ b/games/openclonk/openclonk.info
@@ -1,8 +1,8 @@
PRGNAM="openclonk"
-VERSION="7.0"
+VERSION="8.0"
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.0/openclonk-8.0.tar.gz"
+MD5SUM="c991e79195a3b11e962398dc55948e6b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="freealut libupnp"