diff options
| -rw-r--r-- | games/wesnoth/README | 2 | ||||
| -rw-r--r-- | games/wesnoth/doinst.sh | 1 | ||||
| -rw-r--r-- | games/wesnoth/slack-desc | 2 | ||||
| -rw-r--r-- | games/wesnoth/wesnoth-libpng-1.4.0.patch | 14 | ||||
| -rw-r--r-- | games/wesnoth/wesnoth.SlackBuild | 56 | ||||
| -rw-r--r-- | games/wesnoth/wesnoth.info | 8 |
6 files changed, 24 insertions, 59 deletions
diff --git a/games/wesnoth/README b/games/wesnoth/README index 58fd4b3869..a695eed5ba 100644 --- a/games/wesnoth/README +++ b/games/wesnoth/README @@ -8,7 +8,7 @@ single-player campaigns and different kind of multi-player matches. If you want to compile the wesnothd server and campaign server you can run the script as follows: SERVER=yes ./wesnoth.SlackBuild -please note that the server UID and GID are not required at compile time but +Please note that the server UID and GID are not required at compile time but will be required at runtime under the UID/GID specified in the buildscript. You can create the user and group for the wesnoth server as follows: diff --git a/games/wesnoth/doinst.sh b/games/wesnoth/doinst.sh index 2f4077c014..0dfdc8b1c6 100644 --- a/games/wesnoth/doinst.sh +++ b/games/wesnoth/doinst.sh @@ -1,4 +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/wesnoth/slack-desc b/games/wesnoth/slack-desc index 9d403dea85..d5d660afd8 100644 --- a/games/wesnoth/slack-desc +++ b/games/wesnoth/slack-desc @@ -3,7 +3,7 @@ # 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 ':'. +# customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| wesnoth: Wesnoth (The Battle for Wesnoth) diff --git a/games/wesnoth/wesnoth-libpng-1.4.0.patch b/games/wesnoth/wesnoth-libpng-1.4.0.patch deleted file mode 100644 index 73eb1149ec..0000000000 --- a/games/wesnoth/wesnoth-libpng-1.4.0.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur wesnoth-1.8.1.orig/src/tools/exploder_utils.cpp wesnoth-1.8.1/src/tools/exploder_utils.cpp ---- wesnoth-1.8.1.orig/src/tools/exploder_utils.cpp 2010-01-01 15:16:49.000000000 +0200 -+++ wesnoth-1.8.1/src/tools/exploder_utils.cpp 2010-04-08 17:38:03.066201123 +0300 -@@ -174,8 +174,8 @@ - //TODO: review whether providing NULL error handlers is something - //sensible - png_struct* png_ptr = png_create_write_struct -- (PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(png_voidp_NULL), -- png_error_ptr_NULL, png_error_ptr_NULL); -+ (PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(NULL), -+ NULL, NULL); - if(!png_ptr) - throw exploder_failure("Unable to initialize the png write structure"); - diff --git a/games/wesnoth/wesnoth.SlackBuild b/games/wesnoth/wesnoth.SlackBuild index 53a85de209..ca347bde3c 100644 --- a/games/wesnoth/wesnoth.SlackBuild +++ b/games/wesnoth/wesnoth.SlackBuild @@ -3,8 +3,8 @@ # SlackBuild script for "Battle of Wesnoth". # Copyright 2007-2010 Michiel van Wessem, Manchester, United Kingdom -# Copyright 2010 Willy Sudiarto Raharjo (willysr@slackware-id.org) -# All rights reserved. +# Copyright 2010-2012 Willy Sudiarto Raharjo (willysr@slackware-id.org) +# All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are @@ -26,7 +26,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=wesnoth -VERSION=${VERSION:-1.8.6} +VERSION=${VERSION:-1.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -63,14 +63,9 @@ fi if [ "$SERVER" = "yes" ]; then BUILDSERVER="\ - --enable-campaign-server \ - --enable-bandwidth-monitor \ - --with-server-uid=${SERVER_UID:-"229"} \ - --with-server-gid=${server_GID:-"229"} " -elif [ "$SERVER" = "no" ]; then - BUILDSERVER="\ - --disable-campaign-server \ - --disable-bandwidth-monitor " + -DENABLE_CAMPAIGN_SERVER=yes \ + -DSERVER_UID=229 \ + -DSERVER_GID=229 " fi set -e # Exit on all errors. @@ -81,7 +76,7 @@ rm -rf $TMP/$PRGNAM-$VERSION cd $TMP tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION -patch -p1 < $CWD/wesnoth-libpng-1.4.0.patch + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -89,39 +84,24 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Generate configure - while wesnoth now supports scons (yuck) and cmake, -# neither of them really works. Until the point that upstream decides -# what they want to use, we're going to stick with autotools. -./autogen.sh - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --with-icondir=/usr/share/pixmaps \ - --enable-python \ - --enable-editor \ - --enable-tools \ - --enable-server \ - --with-kde \ - --with-gnome \ - $BUILDSERVER \ - --disable-debug \ - --build=$ARCH-slackware-linux +cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMANDIR=/usr/man \ + -DENABLE_TOOLS=On \ + $BUILDSERVER \ +. make -make install-strip DESTDIR=$PKG +make install DESTDIR=$PKG 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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING INSTALL README changelog copyright \ +cp -a COPYING INSTALL RELEASE_NOTES changelog copyright \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/games/wesnoth/wesnoth.info b/games/wesnoth/wesnoth.info index 0d15b69859..5ea61b51b6 100644 --- a/games/wesnoth/wesnoth.info +++ b/games/wesnoth/wesnoth.info @@ -1,10 +1,10 @@ PRGNAM="wesnoth" -VERSION="1.8.6" +VERSION="1.10" HOMEPAGE="http://www.wesnoth.org" -DOWNLOAD="http://kent.dl.sourceforge.net/project/wesnoth/wesnoth-1.8/wesnoth-1.8.6/wesnoth-1.8.6.tar.bz2" -MD5SUM="f1c3179869b01b61e253e74aeb241034" +DOWNLOAD="http://downloads.sourceforge.net/wesnoth/wesnoth-1.10.tar.bz2" +MD5SUM="707daa13e2f5b3976d9b169aab62dc29" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackware-id.org" -APPROVED="dsomero" +APPROVED="rworkman" |