Ticket #26537: wesnoth.diff

Portfile

@@ -4 +4 @@
 
 name                    wesnoth
 version                 1.8.4
+revision                1
 categories              games
 platforms               darwin
 maintainers             nodetwo.com:jordan
@@ -44 +45 @@
                         port:zlib
 
 patchfiles              patch-configure.ac.diff \
-                        patch-m4-boost.m4.diff
+                        patch-m4-boost.m4.diff \
+                        patch-m4-boost.m4.2.diff \
+                        patch-src-gettext.hpp.diff
 
 use_autoreconf          yes
 
@@ -58 +61 @@
                         --disable-strict-compilation \
                         --with-boost=${prefix}
 
-configure.cppflags-append   -DBOOST_IOSTREAMS_USE_DEPRECATED
-
 platform macosx {
     pre-destroot {
         xinstall -d ${destroot}${applications_dir}/Wesnoth.app/Contents/MacOS

files/patch-src-gettext.hpp.diff

@@ +1 @@
+https://gna.org/bugs/?16694
+--- src/gettext.hpp.orig        2010/09/19 12:04:53     46601
++++ src/gettext.hpp     2010/09/19 12:04:56     46602
+@@ -37,6 +37,11 @@
+ 
+ #include <libintl.h>
+ 
++#ifdef setlocale
++// Someone in libintl world decided it was a good idea to define a "setlocale" macro.
++#undef setlocale
++#endif
++
+ const char* egettext(const char*);
+ const char* sgettext(const char*);
+ const char* dsgettext(const char * domainname, const char *msgid);

files/patch-configure.ac.diff

@@ -1 +1 @@
 https://gna.org/bugs/?16696
---- configure.ac.orig   2010-08-08 10:53:09.000000000 -0500
-+++ configure.ac        2010-09-14 15:16:43.000000000 -0500
-@@ -114,14 +114,8 @@
-        CXXFLAGS="-Werror -Wno-unused-parameter -Wno-strict-aliasing $CXXFLAGS"
+--- configure.ac.orig   2010/09/19 12:04:49     46600
++++ configure.ac        2010/09/19 12:04:53     46601
+@@ -115,7 +115,7 @@
  fi
  
--# Make tests default in svn version
+ # Make tests default in svn version
 -svn_in_version=`expr match "$WESNOTH_VERSION" '.*svn'`
--test_build=yes
--if test $svn_in_version = 0 
--then
-        #disabling building tests for release version
-        test_build=no
--fi
- 
- AC_ARG_ENABLE([tests],
-                      AS_HELP_STRING([--enable-tests], [build unit tests]),
++svn_in_version=`expr "$WESNOTH_VERSION" : '.*svn'`
+ test_build=yes
+ if test $svn_in_version = 0 
+ then

files/patch-m4-boost.m4.2.diff

@@ +1 @@
+https://gna.org/bugs/?16693
+--- m4/boost.m4.orig    2010/09/19 11:59:47     46599
++++ m4/boost.m4 2010/09/19 12:04:49     46600
+@@ -463,7 +463,7 @@
+ AC_DEFUN([BOOST_IOSTREAMS],
+ [BOOST_FIND_LIB([iostreams], [$1],
+                 [boost/iostreams/device/file_descriptor.hpp],
+-                [boost::iostreams::file_descriptor fd(0); fd.close();])
++                [boost::iostreams::file_descriptor fd; fd.close();])
+ ])# BOOST_IOSTREAMS
+ 
+