From 7d876c8a4c0a637675bcc015571a80edb7a985ae Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 27 Jan 2019 03:15:28 +0100 Subject: [PATCH] liquidwar: update to 5.6.5 Also make the `--disable-asm` correct. --- ...flfix.patch => liquidwar-5.6.5-ovflfix.patch} | 4 ++-- srcpkgs/liquidwar/template | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) rename srcpkgs/liquidwar/patches/{liquidwar-5.6.4-ovflfix.patch => liquidwar-5.6.5-ovflfix.patch} (85%) diff --git a/srcpkgs/liquidwar/patches/liquidwar-5.6.4-ovflfix.patch b/srcpkgs/liquidwar/patches/liquidwar-5.6.5-ovflfix.patch similarity index 85% rename from srcpkgs/liquidwar/patches/liquidwar-5.6.4-ovflfix.patch rename to srcpkgs/liquidwar/patches/liquidwar-5.6.5-ovflfix.patch index 446385624cf..f19b6539513 100644 --- a/srcpkgs/liquidwar/patches/liquidwar-5.6.4-ovflfix.patch +++ b/srcpkgs/liquidwar/patches/liquidwar-5.6.5-ovflfix.patch @@ -9,8 +9,8 @@ data->port = port; data->busy_players = busy_players; data->max_players = max_players; -- strncpy (data->password, password, URL_SIZE); -- strncpy (data->comment, comment, URL_SIZE); +- strncpy (data->password, password, PASSWORD_SIZE); +- strncpy (data->comment, comment, COMMENT_SIZE); + strncpy (data->password, password, sizeof(data->password)); + strncpy (data->comment, comment, sizeof(data->comment)); } diff --git a/srcpkgs/liquidwar/template b/srcpkgs/liquidwar/template index d20589a3d56..126f908e7d2 100644 --- a/srcpkgs/liquidwar/template +++ b/srcpkgs/liquidwar/template @@ -1,23 +1,23 @@ # Template file for 'liquidwar' pkgname=liquidwar -version=5.6.4 -revision=2 +version=5.6.5 +revision=1 build_style="gnu-configure" make_build_args="GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar" make_install_args="GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar" make_install_target="install_nolink" -maintainer="Orphaned " hostmakedepends="python" makedepends="allegro4-devel" -license="GPL" -homepage="http://www.ufoot.org/liquidwar" short_desc="A unique multiplayer wargame" +maintainer="Orphaned " +license="GPL-2.0-or-later" +homepage="http://www.ufoot.org/liquidwar" distfiles="http://www.ufoot.org/download/${pkgname}/v5/${version}/${pkgname}-${version}.tar.gz" -checksum=32c52e4588e8e723f907ef43703b4ddf009e8ff1f29555c09bcc1f70bf5b93a3 +checksum=dad0aa84dd416cad055421ed9b40df39efae78d3df759c0583c64c54f7f2ff5f pre_configure() { - # The assembly only exists for 32 bit platforms - if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then + # The assembly only exists for 32 bit x86 + if [ "$XBPS_TARGET_MACHINE" != "i686" ]; then configure_args+=" --disable-asm" fi }