SF.net SVN: gar:[22703] csw/mgar/pkg/freeciv/trunk

[jake_goerzen at users.sourceforge.net]

Revision: 22703
          http://sourceforge.net/p/gar/code/22703
Author:   jake_goerzen
Date:     2013-12-17 00:00:16 +0000 (Tue, 17 Dec 2013)
Log Message:
-----------
freeciv: update to 2.4.1

Modified Paths:
--------------
    csw/mgar/pkg/freeciv/trunk/Makefile
    csw/mgar/pkg/freeciv/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/freeciv/trunk/files/0001-use-finite-instead-of-isfinite-function.patch

Modified: csw/mgar/pkg/freeciv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freeciv/trunk/Makefile	2013-12-16 14:15:30 UTC (rev 22702)
+++ csw/mgar/pkg/freeciv/trunk/Makefile	2013-12-17 00:00:16 UTC (rev 22703)
@@ -1,5 +1,5 @@
 NAME = freeciv
-VERSION = 2.3.4
+VERSION = 2.4.1
 GARTYPE = v2
 
 DESCRIPTION = Free turn-based multiplayer strategy game
@@ -8,7 +8,7 @@
 endef
 
 MASTER_SITES += $(SF_MIRRORS)
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
+DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=138322
@@ -32,7 +32,7 @@
 
 GARCOMPILER = GNU
 
-PATCHFILES += 0001-use-finite-instead-of-isfinite.patch
+PATCHFILES += 0001-use-finite-instead-of-isfinite-function.patch
 
 TEST_SCRIPTS =
 

Modified: csw/mgar/pkg/freeciv/trunk/checksums
===================================================================
--- csw/mgar/pkg/freeciv/trunk/checksums	2013-12-16 14:15:30 UTC (rev 22702)
+++ csw/mgar/pkg/freeciv/trunk/checksums	2013-12-17 00:00:16 UTC (rev 22703)
@@ -1 +1 @@
-36dc4dade12a85ed06b93730c4ee2c1a  freeciv-2.3.4.tar.gz
+9f280f320be0d597a29efe040f1b0025  freeciv-2.4.1.tar.bz2

Added: csw/mgar/pkg/freeciv/trunk/files/0001-use-finite-instead-of-isfinite-function.patch
===================================================================
--- csw/mgar/pkg/freeciv/trunk/files/0001-use-finite-instead-of-isfinite-function.patch	                        (rev 0)
+++ csw/mgar/pkg/freeciv/trunk/files/0001-use-finite-instead-of-isfinite-function.patch	2013-12-17 00:00:16 UTC (rev 22703)
@@ -0,0 +1,25 @@
+From 5888e2f90246e7aa88109239c7501360ba648ed7 Mon Sep 17 00:00:00 2001
+From: Jake Goerzen <jgoerzen at opencsw.org>
+Date: Tue, 17 Dec 2013 00:55:56 +0100
+Subject: [PATCH] use finite instead of isfinite function
+
+---
+ client/cityrepdata.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/client/cityrepdata.c b/client/cityrepdata.c
+index 7d0061b..e01e50c 100644
+--- a/client/cityrepdata.c
++++ b/client/cityrepdata.c
+@@ -950,7 +950,7 @@ static void split_string(struct datum_vector *data, const char *str)
+ 
+     errno = 0;
+     value = strtof(str, &endptr);
+-    if (errno != 0 || endptr == str || !isfinite(value)) {
++    if (errno != 0 || endptr == str || !finite(value)) {
+       /* that wasn't a sensible number; go on */
+       str++;
+     } else {
+-- 
+1.8.4.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.