mr_bones_ 15/05/04 21:21:32 Modified: glob2-0.9.4.4-underlinking.patch glob2-0.9.4.4-scons-blows.patch glob2-0.9.4.4-gcc44.patch Added: glob2-0.9.4.4-gcc49.patch Log: add patch from zimous to fix building with gcc49 (bug #538580) (Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.2 games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch?r1=1.1&r2=1.2 Index: glob2-0.9.4.4-underlinking.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glob2-0.9.4.4-underlinking.patch 27 Oct 2013 16:49:33 -0000 1.1 +++ glob2-0.9.4.4-underlinking.patch 4 May 2015 21:21:32 -0000 1.2 @@ -1,6 +1,5 @@ -diff -burN glob2-0.9.4.4.orig/SConstruct glob2-0.9.4.4/SConstruct ---- glob2-0.9.4.4.orig/SConstruct 2009-08-30 21:23:30.000000000 +0200 -+++ glob2-0.9.4.4/SConstruct 2013-10-24 21:03:46.755492770 +0200 +--- glob2-0.9.4.4.orig/SConstruct ++++ glob2-0.9.4.4/SConstruct @@ -110,6 +110,16 @@ print "Could not find libz or zlib1.dll" missing.append("zlib") 1.2 games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch?r1=1.1&r2=1.2 Index: glob2-0.9.4.4-scons-blows.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glob2-0.9.4.4-scons-blows.patch 19 Nov 2010 23:08:31 -0000 1.1 +++ glob2-0.9.4.4-scons-blows.patch 4 May 2015 21:21:32 -0000 1.2 @@ -1,5 +1,5 @@ ---- SConstruct.orig 2010-11-19 17:56:30.206360948 -0500 -+++ SConstruct 2010-11-19 17:58:48.914746243 -0500 +--- SConstruct.orig ++++ SConstruct @@ -1,6 +1,7 @@ EnsureSConsVersion(0, 96, 92) import sys 1.2 games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch?r1=1.1&r2=1.2 Index: glob2-0.9.4.4-gcc44.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glob2-0.9.4.4-gcc44.patch 4 Sep 2009 20:23:59 -0000 1.1 +++ glob2-0.9.4.4-gcc44.patch 4 May 2015 21:21:32 -0000 1.2 @@ -1,5 +1,5 @@ ---- libgag/include/StreamBackend.h.old 2009-07-13 10:52:36.000000000 +0200 -+++ libgag/include/StreamBackend.h 2009-07-13 10:52:57.000000000 +0200 +--- libgag/include/StreamBackend.h.old ++++ libgag/include/StreamBackend.h @@ -28,6 +28,9 @@ #ifdef putc #undef putc 1.1 games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch?rev=1.1&content-type=text/plain Index: glob2-0.9.4.4-gcc49.patch =================================================================== >From https://bugs.gentoo.org/show_bug.cgi?id=538580 Works around this build failure: In file included from src/AICastor.cpp:26:0: src/Game.h: In member function 'void AICastor::computeBuildingNeighbourMap(int, int)': src/Game.h:152:9: error: 'struct Game::BuildProject' is private struct BuildProject ^ src/AICastor.cpp:2296:23: error: within this context for (std::list<Game::BuildProject>::iterator bpi=game->buildProjects.begin(); bpi!=game->buildProjects.end(); bpi++) ^ scons: *** [src/AICastor.o] Error 1 scons: building terminated because of errors. patch submitted by zimous --- glob2-0.9.4.4.orig/src/Game.h +++ glob2-0.9.4.4/src/Game.h @@ -149,6 +149,7 @@ BOTTOM_TO_TOP }; +public: struct BuildProject { int posX; @@ -159,6 +160,7 @@ int unitWorkingFuture; }; +private: ///Initiates Game void init(GameGUI *gui, MapEdit* edit);