Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor_glbinding_with_boost_downgrade into lp:widelands

2018-09-03 Thread hessenfarmer 
SDL_GL_GetProcAddress should deliver the needed pointer but using the line

glbinding::Binding::initialize(SDL_GL_GetProcAddress());

leads to a type mismatch which I don't understand.

I have uploaded a branch with a downgrade of GLbinding as a quickfix.

Let's see if it compiles and works on appveyor now
-- 
https://code.launchpad.net/~widelands-dev/widelands/appveyor_glbinding_with_boost_downgrade/+merge/354171
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/appveyor_glbinding_with_boost_downgrade 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/shipyard_statistics into lp:widelands

2018-09-03 Thread bunnybot 
Continuous integration builds have changed state:

Travis build 3888. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/424126426.
Appveyor build 3686. State: failed. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_shipyard_statistics-3686.
-- 
https://code.launchpad.net/~widelands-dev/widelands/shipyard_statistics/+merge/354208
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/shipyard_statistics 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/shipyard_statistics into lp:widelands

2018-09-03 Thread Toni Förster 
Toni Förster has proposed merging 
lp:~widelands-dev/widelands/shipyard_statistics into lp:widelands with 
lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped as a prerequisite.

Commit message:
change order of working and stats for shipyards
  
Shipyards call 2 programs and productivity is doubled for each building step.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/shipyard_statistics/+merge/354208

Currently it takes 16 steps to complete a ship. But 20 to reach 100% 
productivity. That somehow doesn't feel right; having built an entire ship but 
only 80% productivity.

Now 2 programs are called. One step in building a ship gains 10% in 
productivity.

-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/shipyard_statistics into lp:widelands.
=== modified file 'data/tribes/buildings/productionsites/atlanteans/shipyard/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/shipyard/init.lua	2018-09-03 23:08:52 +
+++ data/tribes/buildings/productionsites/atlanteans/shipyard/init.lua	2018-09-03 23:08:53 +
@@ -63,8 +63,8 @@
  -- TRANSLATORS: Completed/Skipped/Did not start working because ...
  descname = _"working",
  actions = {
-"sleep=2",
-"call=ship",
+"call=ship on failure fail",
+"call=ship_preparation",
 "return=no_stats"
  }
   },
@@ -73,9 +73,14 @@
  descname = _"constructing a ship",
  actions = {
 "checkmap=seafaring",
+"sleep=2",
 "construct=atlanteans_shipconstruction buildship 6",
+ }
+  },
+  ship_preparation = {
+ descname = _"working",
+ actions = {
 "animate=working 35000",
-"return=completed"
  }
   },
},

=== modified file 'data/tribes/buildings/productionsites/barbarians/shipyard/init.lua'
--- data/tribes/buildings/productionsites/barbarians/shipyard/init.lua	2018-09-03 23:08:52 +
+++ data/tribes/buildings/productionsites/barbarians/shipyard/init.lua	2018-09-03 23:08:53 +
@@ -62,8 +62,8 @@
  -- TRANSLATORS: Completed/Skipped/Did not start working because ...
  descname = _"working",
  actions = {
-"sleep=2",
-"call=ship",
+"call=ship on failure fail",
+"call=ship_preparation",
 "return=no_stats"
  }
   },
@@ -72,9 +72,14 @@
  descname = _"constructing a ship",
  actions = {
 "checkmap=seafaring",
+"sleep=2",
 "construct=barbarians_shipconstruction buildship 6",
+ }
+  },
+  ship_preparation = {
+ descname = _"working",
+ actions = {
 "animate=working 35000",
-"return=completed"
  }
   },
},

=== modified file 'data/tribes/buildings/productionsites/empire/shipyard/init.lua'
--- data/tribes/buildings/productionsites/empire/shipyard/init.lua	2018-09-03 23:08:52 +
+++ data/tribes/buildings/productionsites/empire/shipyard/init.lua	2018-09-03 23:08:53 +
@@ -62,8 +62,8 @@
  -- TRANSLATORS: Completed/Skipped/Did not start working because ...
  descname = _"working",
  actions = {
-"sleep=2",
-"call=ship",
+"call=ship on failure fail",
+"call=ship_preparation",
 "return=no_stats"
  }
   },
@@ -72,9 +72,14 @@
  descname = _"constructing a ship",
  actions = {
 "checkmap=seafaring",
+"sleep=2",
 "construct=empire_shipconstruction buildship 6",
+ }
+  },
+  ship_preparation = {
+ descname = _"working",
+ actions = {
 "animate=working 35000",
-"return=completed"
  }
   },
},

=== modified file 'data/tribes/buildings/productionsites/frisians/shipyard/init.lua'
--- data/tribes/buildings/productionsites/frisians/shipyard/init.lua	2018-09-03 23:08:52 +
+++ data/tribes/buildings/productionsites/frisians/shipyard/init.lua	2018-09-03 23:08:53 +
@@ -56,8 +56,8 @@
  -- TRANSLATORS: Completed/Skipped/Did not start working because ...
  descname = _"working",
  actions = {
-"sleep=2",
-"call=ship",
+"call=ship on failure fail",
+"call=ship_preparation",
 "return=no_stats"
  }
   },
@@ -66,9 +66,15 @@
  descname = _"constructing a ship",
  actions = {
 "checkmap=seafaring",
+"sleep=2",
 "construct=frisians_shipconstruction buildship 6",
-"sleep=35000",
-"return=completed"
+ }
+  },
+  ship_preparation = {
+ descname = _"working",
+ actions = {

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1772168-unused-key-in-luatable into lp:widelands

2018-09-03 Thread bunnybot 
Continuous integration builds have changed state:

Travis build 3887. State: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/424046125.
Appveyor build 3685. State: failed. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1772168_unused_key_in_luatable-3685.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1772168-unused-key-in-luatable/+merge/354202
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1772168-unused-key-in-luatable 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-1669103-no-automatic-dismantlesitewindow into lp:widelands

2018-09-03 Thread bunnybot 
Continuous integration builds have changed state:

Travis build 3885. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/423896050.
Appveyor build 3683. State: failed. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1669103_no_automatic_dismantlesitewindow-3683.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow/+merge/354179
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow 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

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/mines-worldsavior into lp:widelands

2018-09-03 Thread Toni Förster 
Review: Approve

LGTM
-- 
https://code.launchpad.net/~widelands-dev/widelands/mines-worldsavior/+merge/350716
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/mines-worldsavior.

___
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-1772168-unused-key-in-luatable into lp:widelands

2018-09-03 Thread GunChleoc 
GunChleoc has proposed merging 
lp:~widelands-dev/widelands/bug-1772168-unused-key-in-luatable into 
lp:widelands.

Commit message:
New function get_vector() in LuaTable for reading hotspots. This fixes 'Error: 
Unused key "1"/"2" in Lua table.' for loading ware hotspots.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1772168 in widelands: "Some 'Error: Unused key "1"/"2" in Lua table."
  https://bugs.launchpad.net/widelands/+bug/1772168

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1772168-unused-key-in-luatable/+merge/354202
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1772168-unused-key-in-luatable into 
lp:widelands.
=== modified file 'src/graphic/animation.cc'
--- src/graphic/animation.cc	2018-07-08 16:10:50 +
+++ src/graphic/animation.cc	2018-09-03 17:58:19 +
@@ -42,17 +42,6 @@
 #include "sound/sound_handler.h"
 
 namespace {
-
-// Parses an array { 12, 23 } into a point.
-void get_point(const LuaTable& table, Vector2i* p) {
-	std::vector pts = table.array_entries();
-	if (pts.size() != 2) {
-		throw wexception("Expected 2 entries, but got %" PRIuS ".", pts.size());
-	}
-	p->x = pts[0];
-	p->y = pts[1];
-}
-
 /**
  * Implements the Animation interface for an animation that is unpacked on disk, that
  * is every frame and every pc color frame is an singular file on disk.
@@ -107,10 +96,8 @@
 };
 
 NonPackedAnimation::NonPackedAnimation(const LuaTable& table)
-   : frametime_(FRAME_LENGTH), hasplrclrs_(false), scale_(1), play_once_(false) {
+   : frametime_(FRAME_LENGTH), hotspot_(table.get_vector("hotspot")), hasplrclrs_(false), scale_(1), play_once_(false) {
 	try {
-		get_point(*table.get_table("hotspot"), _);
-
 		if (table.has_key("sound_effect")) {
 			std::unique_ptr sound_effects = table.get_table("sound_effect");
 

=== modified file 'src/logic/map_objects/tribes/worker_descr.cc'
--- src/logic/map_objects/tribes/worker_descr.cc	2018-05-07 05:35:32 +
+++ src/logic/map_objects/tribes/worker_descr.cc	2018-09-03 17:58:19 +
@@ -40,8 +40,7 @@
  const EditorGameBase& egbase)
: BobDescr(init_descname, init_type, MapObjectDescr::OwnerType::kTribe, table),
  ware_hotspot_(table.has_key("ware_hotspot") ?
-  Vector2i(table.get_table("ware_hotspot")->get_int(1),
-   table.get_table("ware_hotspot")->get_int(2)) :
+  table.get_vector("ware_hotspot") :
   Vector2i(0, 15)),
  default_target_quantity_(table.has_key("default_target_quantity") ?
  table.get_int("default_target_quantity") :

=== modified file 'src/scripting/lua_table.h'
--- src/scripting/lua_table.h	2018-04-07 16:59:00 +
+++ src/scripting/lua_table.h	2018-09-03 17:58:19 +
@@ -27,6 +27,7 @@
 
 #include 
 
+#include "base/vector.h"
 #include "scripting/lua.h"
 #include "scripting/lua_coroutine.h"
 #include "scripting/lua_errors.h"
@@ -112,6 +113,19 @@
 		return rv;
 	}
 
+	// Parses a Lua subtable into a Vector2i or Vector2f
+	template  Vector2 get_vector(const KeyType& key) const {
+		Vector2 result = Vector2::zero();
+		std::unique_ptr table(get_table(key));
+		std::vector pts = table->array_entries();
+		if (pts.size() != 2) {
+			throw wexception("Expected 2 entries, but got %" PRIuS ".", pts.size());
+		}
+		result.x = pts[0];
+		result.y = pts[1];
+		return result;
+	}
+
 	template  std::unique_ptr get_table(const KeyType& key) const {
 		get_existing_table_value(key);
 		if (!lua_istable(L_, -1)) {

___
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/appveyor_glbinding_with_boost_downgrade into lp:widelands

2018-09-03 Thread hessenfarmer 
the new initilaize function expects a pointer to the current process.

probably 
glbinding::Binding::initialize(SDL_GL_GetProcAddress());

might work will test this tonight. In any case you Need to adress the other 2 
issues as well. to have Access to setCallbackAfter you Need to include 
glbinding.h in the System_headers.h section dealing with glbinding.
for the asString Problem I don#t have a proper solution yet. At least my 
solution in the appveyor fix branch is compiling.

Perhaps we should switch to use glew in appveyor until we have fixed this?
-- 
https://code.launchpad.net/~widelands-dev/widelands/appveyor_glbinding_with_boost_downgrade/+merge/354171
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/appveyor_glbinding_with_boost_downgrade 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

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor_glbinding_with_boost_downgrade into lp:widelands

2018-09-03 Thread hessenfarmer 
to fix boost it might be sufficient to Change the followinbg line

https://bazaar.launchpad.net/~widelands-dev/widelands/trunk/view/head:/src/network/crypto.cc#L3

to

#include  
-- 
https://code.launchpad.net/~widelands-dev/widelands/appveyor_glbinding_with_boost_downgrade/+merge/354171
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/appveyor_glbinding_with_boost_downgrade 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_glbinding into lp:widelands

2018-09-03 Thread bunnybot 
Continuous integration builds have changed state:

Travis build 3883. State: errored. Details: 
https://travis-ci.org/widelands/widelands/builds/423832145.
Appveyor build 3681. State: failed. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyor_glbinding-3681.
-- 
https://code.launchpad.net/~widelands-dev/widelands/appveyor_glbinding/+merge/354169
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/appveyor_glbinding 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_glbinding_with_boost_downgrade into lp:widelands

2018-09-03 Thread bunnybot 
Continuous integration builds have changed state:

Travis build 3882. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/423830568.
Appveyor build 3680. State: failed. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyor_glbinding_with_boost_downgrade-3680.
-- 
https://code.launchpad.net/~widelands-dev/widelands/appveyor_glbinding_with_boost_downgrade/+merge/354171
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/appveyor_glbinding_with_boost_downgrade 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-1669103-no-automatic-dismantlesitewindow into lp:widelands

2018-09-03 Thread GunChleoc 
GunChleoc has proposed merging 
lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow into 
lp:widelands.

Commit message:
Close the building window when dismantling a building.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1669103 in widelands: "Confirming Dismantle building opens dismantle 
site window"
  https://bugs.launchpad.net/widelands/+bug/1669103

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow/+merge/354179
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow into 
lp:widelands.
=== modified file 'src/logic/player.cc'
--- src/logic/player.cc	2018-07-26 11:24:49 +
+++ src/logic/player.cc	2018-09-03 10:38:29 +
@@ -743,8 +743,10 @@
 			workers = building->get_workers();
 		}
 
-		// Register whether the window was open
-		Notifications::publish(NoteBuilding(building->serial(), NoteBuilding::Action::kStartWarp));
+		if (index_of_new_building != INVALID_INDEX) {
+			// For enhancing, register whether the window was open
+			Notifications::publish(NoteBuilding(building->serial(), NoteBuilding::Action::kStartWarp));
+		}
 		building->remove(egbase());  //  no fire or stuff
 		//  Hereafter the old building does not exist and building is a dangling
 		//  pointer.

___
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/empire04_bug_fix_enhance into lp:widelands

2018-09-03 Thread bunnybot 
Refusing to merge, since Travis is not green. Use @bunnybot merge force for 
merging anyways.

Travis build 3839. State: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/420888461.
-- 
https://code.launchpad.net/~widelands-dev/widelands/empire04_bug_fix_enhance/+merge/353742
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/empire04_bug_fix_enhance 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

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/empire04_bug_fix_enhance into lp:widelands

2018-09-03 Thread GunChleoc 
Let's have it now then. An additional objective for opening the farm window can 
always be added later - I have created a bug: 
https://bugs.launchpad.net/widelands/+bug/1790462

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/empire04_bug_fix_enhance/+merge/353742
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/empire04_bug_fix_enhance 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

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/empire04_bug_fix_enhance into lp:widelands

2018-09-03 Thread hessenfarmer 
Thanks for the Review. 
will try to solve the 2 small issues identified (farm not dismantable, 
objective for clicking the farm) this evening. After a short Regression test I 
will ask bunnybot for merging. 
-- 
https://code.launchpad.net/~widelands-dev/widelands/empire04_bug_fix_enhance/+merge/353742
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/empire04_bug_fix_enhance 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

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor_glbinding_with_boost_downgrade into lp:widelands

2018-09-03 Thread hessenfarmer 
As far as I understood the changes in GLbinding there are more issues than that.

there is a new Header file glbinding.h which needs to be included in the System 
headers.

they have removed the asString function from the AbstractValue declaration.

Boost in Appveyor worked well in Version 1.67 so we could probably downgrade to 
1.67 only 

-- 
https://code.launchpad.net/~widelands-dev/widelands/appveyor_glbinding_with_boost_downgrade/+merge/354171
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/appveyor_glbinding_with_boost_downgrade 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_glbinding_with_boost_downgrade into lp:widelands

2018-09-03 Thread GunChleoc 
GunChleoc has proposed merging 
lp:~widelands-dev/widelands/appveyor_glbinding_with_boost_downgrade into 
lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1789835 in widelands: "Appveyor glbinding incompatible with WL code"
  https://bugs.launchpad.net/widelands/+bug/1789835

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/appveyor_glbinding_with_boost_downgrade/+merge/354171

Same as https://code.launchpad.net/~widelands-dev/widelands/appveyor_glbinding 
but with Boost downgrade too
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/appveyor_glbinding_with_boost_downgrade into 
lp:widelands.
=== modified file 'appveyor.yml'
--- appveyor.yml	2018-07-23 16:16:32 +
+++ appveyor.yml	2018-09-03 07:34:44 +
@@ -20,6 +20,8 @@
   - cmd: "bash --login -c \"pacman -Su --noconfirm\""
   # Installed required libs
   - 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\""
+  # Downgrade Boost, because CMake can't find the new version yet
+  - cmd: "bash --login -c \"pacman --noconfirm -U http://repo.msys2.org/mingw/%MINGWSUFFIX%/mingw-w64-%MINGWSUFFIX%-boost-1.66.0-2-any.pkg.tar.xz\";
 
 shallow_clone: true
 

=== modified file 'src/graphic/gl/initialize.cc'
--- src/graphic/gl/initialize.cc	2018-08-28 07:53:33 +
+++ src/graphic/gl/initialize.cc	2018-09-03 07:34:44 +
@@ -48,7 +48,10 @@
 	SDL_GL_MakeCurrent(sdl_window, gl_context);
 
 #ifdef USE_GLBINDING
-	glbinding::Binding::initialize();
+	// Documentation:
+	// https://github.com/cginternals/glbinding
+	// https://glbinding.org/
+	glbinding::Binding::initialize(glbinding::getCurrentContext());
 
 	// The undocumented command line argument --debug_gl_trace will set
 	// Trace::kYes. This will log every OpenGL call that is made, together with

___
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_glbinding into lp:widelands

2018-09-03 Thread GunChleoc 
GunChleoc has proposed merging lp:~widelands-dev/widelands/appveyor_glbinding 
into lp:widelands.

Commit message:
Another attempt at fixing AppVeyor

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1789835 in widelands: "Appveyor glbinding incompatible with WL code"
  https://bugs.launchpad.net/widelands/+bug/1789835

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/appveyor_glbinding/+merge/354169
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/appveyor_glbinding into lp:widelands.
=== modified file 'src/graphic/gl/initialize.cc'
--- src/graphic/gl/initialize.cc	2018-08-28 07:53:33 +
+++ src/graphic/gl/initialize.cc	2018-09-03 06:58:32 +
@@ -48,7 +48,10 @@
 	SDL_GL_MakeCurrent(sdl_window, gl_context);
 
 #ifdef USE_GLBINDING
-	glbinding::Binding::initialize();
+	// Documentation:
+	// https://github.com/cginternals/glbinding
+	// https://glbinding.org/
+	glbinding::Binding::initialize(glbinding::getCurrentContext());
 
 	// The undocumented command line argument --debug_gl_trace will set
 	// Trace::kYes. This will log every OpenGL call that is made, together with

___
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