[Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-13 Thread bunnybot 
Continuous integration builds have changed state:

Travis build 4470. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/492937714.
Appveyor build 4258. State: failed. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyor_fix-4258.
-- 
https://code.launchpad.net/~widelands-dev/widelands/appveyor-fix/+merge/363152
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/appveyor-fix into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1810062-territorial-calculations into lp:widelands

2019-02-13 Thread bunnybot 
Continuous integration builds have changed state:

Travis build 4468. State: errored. Details: 
https://travis-ci.org/widelands/widelands/builds/492822657.
Appveyor build 4256. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1810062_territorial_calculations-4256.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1810062-territorial-calculations/+merge/361366
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1810062-territorial-calculations.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1815277-persistence-memory-leak into lp:widelands

2019-02-13 Thread Notabilis 
It seems as if I was wrong about my assumption regarding the Eris function, its 
garbage collector should clean everything up. But I will do some more digging, 
maybe I can figure out where the leak is.

If this branch makes it better for you, I have no objection to merging it.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1815277-persistence-memory-leak/+merge/362963
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1815277-persistence-memory-leak into 
lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-13 Thread hessenfarmer 
hessenfarmer has proposed merging lp:~widelands-dev/widelands/appveyor-fix into 
lp:widelands.

Commit message:
Attempt to fix appveyor problems with boost 1.69 and x86 builds by providing a 
modified libintl.h file

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1808481 in widelands: "Boost 1.69 breaks compiling"
  https://bugs.launchpad.net/widelands/+bug/1808481

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/appveyor-fix/+merge/363152

added a copy of modified libintl.h in an appveyor folder in utils 
modified appveyor.yml to copy this file to the relevant include folder.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/appveyor-fix into lp:widelands.
=== modified file 'appveyor.yml'
--- appveyor.yml	2018-12-21 21:00:14 +
+++ appveyor.yml	2019-02-13 19:19:10 +
@@ -7,7 +7,7 @@
 environment:
   appveyor_build_worker_cloud: gce
 init:
-  - cmd: "IF \"%PLATFORM%\" == \"x86\" (set MINGWPATH=C:\\msys64\\mingw32\\bin& set MINGWSUFFIX=i686) ELSE (set MINGWPATH=C:\\msys64\\mingw64\\bin& set MINGWSUFFIX=x86_64)"
+  - cmd: "IF \"%PLATFORM%\" == \"x86\" (set MINGWPATH=C:\\msys64\\mingw32\\bin& set MINGWSUFFIX=i686& set MINGWINCLUDE=C:\\msys64\\mingw32\\include) ELSE (set MINGWPATH=C:\\msys64\\mingw64\\bin& set MINGWSUFFIX=x86_64& set MINGWINCLUDE=C:\\msys64\\mingw64\\include)"
 
 install:
   # Installing various utilities
@@ -21,10 +21,9 @@
   - cmd: "bash --login -c \"pacman -Suuyy --noconfirm\""
   - cmd: "bash --login -c \"pacman -Suuyy --noconfirm\""
   # Installed required libs
-  - cmd: "bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-ninja mingw-w64-%MINGWSUFFIX%-wget mingw-w64-%MINGWSUFFIX%-SDL2_ttf mingw-w64-%MINGWSUFFIX%-SDL2_mixer mingw-w64-%MINGWSUFFIX%-SDL2_image mingw-w64-%MINGWSUFFIX%-glbinding\""
-  # Download and install Boost 1.68 --since 1.69 breaks compiling
-  # https://bugs.launchpad.net/widelands/+bug/1808481
-  - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/%MINGWSUFFIX%/mingw-w64-%MINGWSUFFIX%-boost-1.68.0-2-any.pkg.tar.xz && pacman --noconfirm -U mingw-w64-%MINGWSUFFIX%-boost-1.68.0-2-any.pkg.tar.xz\""
+  - cmd: "bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-ninja mingw-w64-%MINGWSUFFIX%-boost mingw-w64-%MINGWSUFFIX%-SDL2_ttf mingw-w64-%MINGWSUFFIX%-SDL2_mixer mingw-w64-%MINGWSUFFIX%-SDL2_image mingw-w64-%MINGWSUFFIX%-glbinding\""
+  # copy modified libintl.h to solve an issue with boost 1.69
+  - cmd: "bash --login -c \"cp %APPVEYOR_BUILD_FOLDER%\utils\appveyor\libintl.h %MINGWINCLUDE%""
 shallow_clone: true
 
 branches:
@@ -49,8 +48,7 @@
 
 platform:
   - x64
-# Temporarly, disable x86 builds since they are failing.
-#  - x86
+  - x86
 
 configuration:
   - Release

=== added directory 'utils/appveyor'
=== added file 'utils/appveyor/libintl.h'
--- utils/appveyor/libintl.h	1970-01-01 00:00:00 +
+++ utils/appveyor/libintl.h	2019-02-13 19:19:10 +
@@ -0,0 +1,464 @@
+/* Message catalogs for internationalization.
+   Copyright (C) 1995-1997, 2000-2016 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see .  */
+
+#ifndef _LIBINTL_H
+#define _LIBINTL_H 1
+
+#include 
+#if (defined __APPLE__ && defined __MACH__) && 0
+# include 
+#endif
+
+/* The LC_MESSAGES locale category is the category used by the functions
+   gettext() and dgettext().  It is specified in POSIX, but not in ANSI C.
+   On systems that don't define it, use an arbitrary value instead.
+   On Solaris,  defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
+   then includes  (i.e. this file!) and then only defines
+   LC_MESSAGES.  To avoid a redefinition warning, don't define LC_MESSAGES
+   in this case.  */
+#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
+# define LC_MESSAGES 1729
+#endif
+
+/* We define an additional symbol to signal that we use the GNU
+   implementation of gettext.  */
+#define __USE_GNU_GETTEXT 1
+
+/* Provide information about the supported file formats.  Returns the
+   maximum minor revision number supported for a given major revision.  */
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
+  ((major) == 0 || (major) == 1 ? 1 : -1)
+
+/* Resolve a platform specific conflict on DJGPP.  GNU gettext takes
+   precedence over _conio_gettext.  */
+#