Revision: 26116
http://sourceforge.net/p/gar/code/26116
Author: jake_goerzen
Date: 2017-03-08 23:10:04 +0000 (Wed, 08 Mar 2017)
Log Message:
-----------
freeciv/trunk: update to version 2.5.6
Modified Paths:
--------------
csw/mgar/pkg/freeciv/trunk/Makefile
csw/mgar/pkg/freeciv/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/freeciv/trunk/files/0003-adjust-path-to-include-MagickWand.h.patch
Modified: csw/mgar/pkg/freeciv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freeciv/trunk/Makefile 2017-03-06 20:47:23 UTC (rev 26115)
+++ csw/mgar/pkg/freeciv/trunk/Makefile 2017-03-08 23:10:04 UTC (rev 26116)
@@ -1,5 +1,5 @@
NAME = freeciv
-VERSION = 2.4.4
+VERSION = 2.5.6
GARTYPE = v2
DESCRIPTION = Free turn-based multiplayer strategy game
@@ -19,12 +19,11 @@
RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibbz2-1-0
RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibz1
-RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibintl9
RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibsdl1-2-0
RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibreadline6
RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWfreeciv += CSWsdlmixer
RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibgdk-pixbuf2-0-0
RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibgtk-x11-2-0-0
RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibgdk-x11-2-0-0
@@ -33,15 +32,20 @@
RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibcurl4
RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibfreetype6
RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibsqlite3-0
-RUNTIME_DEP_PKGS_CSWfreeciv += CSWsdlimage
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibsdl-image1-2-0
RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibpq5
-RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibpng15-15
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibpng16-16
RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibmysqlclient18
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibsdl-ttf2-0-0
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibsdl-gfx15
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibsdl-mixer1-2-0
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibmagickwand7q16hdri0
GARCOMPILER = GNU
PATCHFILES += 0001-use-finite-instead-of-isfinite-function.patch
PATCHFILES += 0002-restore-previous-version-tile.h.patch
+PATCHFILES += 0003-adjust-path-to-include-MagickWand.h.patch
TEST_SCRIPTS =
@@ -48,7 +52,11 @@
CONFIGURE_ARGS += $(DIRPATHS)
CONFIGURE_ARGS += --enable-fcdb=all
CONFIGURE_ARGS += --enable-client=gtk2,sdl,xaw
+CONFIGURE_ARGS += --with-magickwand=/opt/csw/include/ImageMagick-7
+EXTRA_INC = /opt/csw/include/ImageMagick-7/MagickWand
+EXTRA_INC += /opt/csw/include/ImageMagick-7/MagickCore
+
# Disable linker map forcing SUNW_1.22.2 as the linked MySQL needs SUNW_1.22.5
LINKER_MAPS =
Modified: csw/mgar/pkg/freeciv/trunk/checksums
===================================================================
--- csw/mgar/pkg/freeciv/trunk/checksums 2017-03-06 20:47:23 UTC (rev
26115)
+++ csw/mgar/pkg/freeciv/trunk/checksums 2017-03-08 23:10:04 UTC (rev
26116)
@@ -1 +1 @@
-038c53184497fcf31bcd268418dbe4f6 freeciv-2.4.4.tar.bz2
+ef89d67af05787a262e1fc1666c56a5a freeciv-2.5.6.tar.bz2
Added:
csw/mgar/pkg/freeciv/trunk/files/0003-adjust-path-to-include-MagickWand.h.patch
===================================================================
---
csw/mgar/pkg/freeciv/trunk/files/0003-adjust-path-to-include-MagickWand.h.patch
(rev 0)
+++
csw/mgar/pkg/freeciv/trunk/files/0003-adjust-path-to-include-MagickWand.h.patch
2017-03-08 23:10:04 UTC (rev 26116)
@@ -0,0 +1,25 @@
+From 581a3ecf70a159224d173c7f220075feb5be84fe Mon Sep 17 00:00:00 2001
+From: Jake Goerzen <jgoer...@opencsw.org>
+Date: Mon, 6 Mar 2017 22:41:33 +0100
+Subject: [PATCH] adjust path to include MagickWand.h
+
+---
+ common/mapimg.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/common/mapimg.c b/common/mapimg.c
+index ad57fd0..026a5e5 100644
+--- a/common/mapimg.c
++++ b/common/mapimg.c
+@@ -18,7 +18,7 @@
+ #include <stdarg.h>
+
+ #ifdef HAVE_MAPIMG_MAGICKWAND
+- #include <wand/MagickWand.h>
++ #include <MagickWand.h>
+ #endif /* HAVE_MAPIMG_MAGICKWAND */
+
+ /* utility */
+--
+2.4.0
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
