From 0cf2f20608308acdf3cb922c3736446bbd8f3388 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 14 Jul 2018 20:58:29 +0100
Subject: gentoo resync : 14.07.2018

---
 .../files/scourge-0.21.1-automake-1.13.patch       | 11 -------
 .../files/scourge-0.21.1-freetype_pkgconfig.patch  | 34 ----------------------
 .../scourge/files/scourge-0.21.1-gcc47.patch       | 12 --------
 .../scourge/files/scourge-0.21.1-gcc6.patch        | 34 ----------------------
 4 files changed, 91 deletions(-)
 delete mode 100644 games-roguelike/scourge/files/scourge-0.21.1-automake-1.13.patch
 delete mode 100644 games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch
 delete mode 100644 games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch
 delete mode 100644 games-roguelike/scourge/files/scourge-0.21.1-gcc6.patch

(limited to 'games-roguelike/scourge/files')

diff --git a/games-roguelike/scourge/files/scourge-0.21.1-automake-1.13.patch b/games-roguelike/scourge/files/scourge-0.21.1-automake-1.13.patch
deleted file mode 100644
index 5c2bc202f384..000000000000
--- a/games-roguelike/scourge/files/scourge-0.21.1-automake-1.13.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -4,7 +4,7 @@
- dnl Process this file with autoconf to produce a configure script.
- AC_INIT(src/scourge.h)
- AM_INIT_AUTOMAKE(scourge, "0.21")
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- dnl internationalization macros
- AC_GNU_SOURCE
diff --git a/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch b/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch
deleted file mode 100644
index d41ee1a44439..000000000000
--- a/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: scourge/configure.in
-===================================================================
---- scourge/configure.in	(revision 3411)
-+++ scourge/configure.in	(working copy)
-@@ -56,6 +56,7 @@
- # Set up binreloc (for a relocatable autopackage file)
- AM_BINRELOC
- 
-+PKG_PROG_PKG_CONFIG
- dnl --------------------------------------------------------------------------
- dnl General options
- dnl --------------------------------------------------------------------------
-@@ -413,19 +414,9 @@
-   FREETYPE_LIBS=`/sw/lib/freetype2/bin/freetype-config --libs`
-   have_FREETYPE=yes
- else
--AC_MSG_CHECKING([for freetype-config library])
--
--AC_PATH_PROG(FREETYPE, freetype-config, no)
--
--if test "$FREETYPE" = "no"; then
--  AC_MSG_ERROR(Cannot find freetype2: Is freetype-config in path?)
--  have_FREETYPE=no
--else
--  FREETYPE_CFLAGS=`freetype-config --cflags`
--  FREETYPE_LIBS=`freetype-config --libs`
--  have_FREETYPE=yes
-+  PKG_CHECK_MODULES(FREETYPE, freetype2, have_FREETYPE=yes, 
-+    AC_MSG_ERROR(Cannot find freetype2))
- fi
--fi
- 
- LIBS="$saved_LIBS"
- TR_LIBS="$TR_LIBS $FREETYPE_LIBS"
diff --git a/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch b/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch
deleted file mode 100644
index 6f3f7b3e2a65..000000000000
--- a/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/squirrel/squtils.h	2012-08-30 18:06:43.474037926 +0200
-+++ b/src/squirrel/squtils.h	2012-08-30 18:14:13.300261523 +0200
-@@ -8,6 +8,9 @@
- #define SQ_FREE(__ptr,__size) sq_vm_free(__ptr,__size);
- #define SQ_REALLOC(__ptr,__oldsize,__size) sq_vm_realloc(__ptr,__oldsize,__size);
- 
-+void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
-+void sq_vm_free(void *p,SQUnsignedInteger size);
-+
- //sqvector mini vector class, supports objects by value
- template<typename T> class sqvector
- {
diff --git a/games-roguelike/scourge/files/scourge-0.21.1-gcc6.patch b/games-roguelike/scourge/files/scourge-0.21.1-gcc6.patch
deleted file mode 100644
index fed15f45ed7e..000000000000
--- a/games-roguelike/scourge/files/scourge-0.21.1-gcc6.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Bug: https://bugs.gentoo.org/610492
-Upstream ticket: https://sourceforge.net/p/scourge/patches/3/
-
---- a/src/equip.cpp
-+++ b/src/equip.cpp
-@@ -595,7 +595,7 @@
- 		}
- 	}
- 	if ( !found ) {
--		specialSkill = false;
-+		specialSkill = NULL;
- 		canvas->setTooltip( "" );
- 	}
- 	glDisable( GL_BLEND );
---- a/src/render/map.cpp
-+++ b/src/render/map.cpp
-@@ -3154,7 +3154,7 @@
- 			if ( shape )
- 				return shape;
- 		}
--		return false;
-+		return NULL;
- 	}
- 	if ( y1 == y2 ) {
- 		if ( x1 > x2 ) SWAP( x1, x2 );
-@@ -3163,7 +3163,7 @@
- 			if ( shape )
- 				return shape;
- 		}
--		return false;
-+		return NULL;
- 	}
- 
- 
-- 
cgit v1.2.3