[fife] 07/25: Drop remove_glee.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository fife.

commit 84b1f7ca4dfabb033273d76751c9ac61b0dcd899
Author: Markus Koschany <apo at debian.org>
Date:   Wed Sep 21 20:06:47 2016 +0200

    Drop remove_glee.patch
---
 debian/patches/remove_glee.patch | 84 ----------------------------------------
 debian/patches/series            |  1 -
 2 files changed, 85 deletions(-)

diff --git a/debian/patches/remove_glee.patch b/debian/patches/remove_glee.patch
deleted file mode 100644
index a874c23..0000000
--- a/debian/patches/remove_glee.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Description: use packaged version of glee
-Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-10-24
-
-Index: fife/engine/core/video/opengl/fife_opengl.h
-===================================================================
---- fife.orig/engine/core/video/opengl/fife_opengl.h	2013-03-10 18:12:47.000000000 -0700
-+++ fife/engine/core/video/opengl/fife_opengl.h	2013-03-10 18:13:38.401287667 -0700
-@@ -25,7 +25,7 @@
- // Standard C++ library includes
- 
- // 3rd party library includes
--#include "ext/glee/GLee.h"
-+#include <GLee.h>
- 
- // GLee.h includes windows.h when on a windows platform
- // In winnt.h (which is included from windows.h) DELETE
-Index: fife/build/linux2-config.py
-===================================================================
---- fife.orig/build/linux2-config.py	2013-03-10 18:13:25.911301547 -0700
-+++ fife/build/linux2-config.py	2013-03-10 18:13:38.401287667 -0700
-@@ -93,7 +93,7 @@
- 	return libs
- 
- def getOptionalLibs(opengl):
--	libs = [('tinyxml', 'tinyxml.h')]
-+	libs = [('tinyxml', 'tinyxml.h'), ('glee', 'Glee.h')]
- 	
- 	return libs
- 	
-Index: fife/engine/core/ext/glee/GLee.cpp
-===================================================================
---- fife.orig/engine/core/ext/glee/GLee.cpp	2013-03-10 18:12:47.000000000 -0700
-+++ fife/engine/core/ext/glee/GLee.cpp	2013-03-10 18:13:38.461281065 -0700
-@@ -1,3 +1,4 @@
-+#if 0
- /***************************************************************************
- *
- * GLee.c
-@@ -18168,3 +18169,5 @@
-     __GLeeExtList_clean(&extensionNames);
-     return GL_TRUE;
- }
-+
-+#endif 
-Index: fife/build/gnu0-config.py
-===================================================================
---- fife.orig/build/gnu0-config.py	2013-03-10 18:11:02.000000000 -0700
-+++ fife/build/gnu0-config.py	2013-03-10 18:13:59.691293334 -0700
-@@ -93,7 +93,7 @@
- 	return libs
- 
- def getOptionalLibs(opengl):
--	libs = [('tinyxml', 'tinyxml.h')]
-+	libs = [('tinyxml', 'tinyxml.h'), ('glee', 'Glee.h')]
- 	
- 	return libs
- 	
-Index: fife/build/gnukfreebsd8-config.py
-===================================================================
---- fife.orig/build/gnukfreebsd8-config.py	2013-03-10 18:11:02.000000000 -0700
-+++ fife/build/gnukfreebsd8-config.py	2013-03-10 18:13:59.871281344 -0700
-@@ -93,7 +93,7 @@
- 	return libs
- 
- def getOptionalLibs(opengl):
--	libs = [('tinyxml', 'tinyxml.h')]
-+	libs = [('tinyxml', 'tinyxml.h'), ('glee', 'Glee.h')]
- 	
- 	return libs
- 	
-Index: fife/build/gnukfreebsd9-config.py
-===================================================================
---- fife.orig/build/gnukfreebsd9-config.py	2013-03-10 18:11:02.000000000 -0700
-+++ fife/build/gnukfreebsd9-config.py	2013-03-10 18:13:59.991279960 -0700
-@@ -93,7 +93,7 @@
- 	return libs
- 
- def getOptionalLibs(opengl):
--	libs = [('tinyxml', 'tinyxml.h')]
-+	libs = [('tinyxml', 'tinyxml.h'), ('glee', 'Glee.h')]
- 	
- 	return libs
- 	
diff --git a/debian/patches/series b/debian/patches/series
index cff6a85..e92c076 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-remove_glee.patch
 spelling.diff
 gcc6.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/fife.git