gentoo resync : 17.07.2021

4 files changed, 48 insertions, 100 deletions

diff --git a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch
deleted file mode 100644
index 5c77527dc598..000000000000
--- a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/properties.h
-+++ b/properties.h
-@@ -33,9 +33,7 @@
- #include <map>
- #include <string>
- 
--#ifdef WIN32
- using namespace std;
--#endif
- 
- #include "defs.h"
- 
---- a/anim.h
-+++ b/anim.h
-@@ -27,9 +27,7 @@
- // Language Includes
- #include <list>
- 
--#ifdef WIN32
- using namespace std;
--#endif
- 
- // Application Includes
- #include "graph.h"
---- a/exception.h
-+++ b/exception.h
-@@ -27,10 +27,9 @@
- 
- // Language Includes
- #include <string>
-+#include <iostream>
- 
--#ifdef WIN32
- using namespace std;
--#endif
- 
- #define CatchEx(aEx)		catch( CXLException aEx )
- #define ThrowEx(aError)		throw CXLException(aError,__FILE__,__LINE__)
---- a/gamelogic.cpp
-+++ b/gamelogic.cpp
-@@ -154,7 +154,7 @@
- 		levelFile = NULL;
- 	}
- 
--	currentMap = NULL;
-+	currentMap = gameLevels.begin();
- 
- 	playerName = new char[32+1];
- 	strcpy( playerName, "nobody" );
diff --git a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch
deleted file mode 100644
index 594298c93d44..000000000000
--- a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/gamelogic.cpp
-+++ b/gamelogic.cpp
-@@ -25,6 +25,7 @@
- #include<fstream>
- #include<cstdio>
- #include<cctype>
-+#include <cstdlib>
- 
- #ifndef WIN32
- #include<unistd.h>
---- a/levelmap.cpp
-+++ b/levelmap.cpp
-@@ -21,6 +21,7 @@
- ////////////////////////////////////////////////////////////////////////

- 

- // Language Includes

-+#include <cstdlib>
- #include <cstdio>

- #include <cctype>

- #include <cstring>

---- a/mapedit.cpp
-+++ b/mapedit.cpp
-@@ -26,6 +26,8 @@
- #include<cstdio>

- #include<list>

- #include<vector>

-+#include <cstdlib>
-+#include <cstring>
- 

- #ifndef WIN32

- #include<unistd.h>

---- a/modlist.cpp
-+++ b/modlist.cpp
-@@ -22,6 +22,7 @@
- 

- #include <iostream>

- #include <fstream>

-+#include <cstdlib>

- 

- #ifdef WIN32

- #include <afxwin.h>

---- a/tile_spinner.cpp
-+++ b/tile_spinner.cpp
-@@ -24,6 +24,7 @@
- 
- 
- // Application Includes
-+#include <cstdlib>
- #include "audio.h"
- #include "properties.h"
- #include "defs.h"
diff --git a/games-puzzle/xlogical/files/xlogical-1.0.8-gcc11.patch b/games-puzzle/xlogical/files/xlogical-1.0.8-gcc11.patch
new file mode 100644
index 000000000000..f225d41fea0e
--- /dev/null
+++ b/games-puzzle/xlogical/files/xlogical-1.0.8-gcc11.patch
@@ -0,0 +1,12 @@
+--- a/sdl_audio.cpp
++++ b/sdl_audio.cpp
+@@ -60,3 +60,3 @@
+ 

+-	for( end=aPath+len; end >= 0; end-=1 )

++	for( end=aPath+len; end >= aPath; end-=1 )

+ 	{

+@@ -64,3 +64,3 @@
+ 	}

+-	for( start=end; start >= 0; start-=1 )

++	for( start=end; start >= aPath; start-=1 )

+ 	{

diff --git a/games-puzzle/xlogical/files/xlogical-1.0.8-gcc4.3.patch b/games-puzzle/xlogical/files/xlogical-1.0.8-gcc4.3.patch
new file mode 100644
index 000000000000..967754265f46
--- /dev/null
+++ b/games-puzzle/xlogical/files/xlogical-1.0.8-gcc4.3.patch
@@ -0,0 +1,36 @@
+--- a/gamelogic.cpp
++++ b/gamelogic.cpp
+@@ -27,2 +27,3 @@
+ #include<cctype>
++#include<cstdlib>
+ 
+@@ -156,3 +157,3 @@
+ 
+-	currentMap = NULL;
++	currentMap = (list< class Clevel_map *>::iterator)NULL;
+ 
+--- a/levelmap.cpp
++++ b/levelmap.cpp
+@@ -28,2 +28,3 @@
+ #include <iostream>

++#include <cstdlib>

+ 

+--- a/mapedit.cpp
++++ b/mapedit.cpp
+@@ -28,2 +28,4 @@
+ #include<vector>

++#include<cstring>

++#include<cstdlib>

+ 

+--- a/modlist.cpp
++++ b/modlist.cpp
+@@ -24,2 +24,3 @@
+ #include <fstream>

++#include <cstdlib>

+ 

+--- a/tile_spinner.cpp
++++ b/tile_spinner.cpp
+@@ -25,2 +25,3 @@
+ 
++#include <cstdlib>
+ // Application Includes