[fife] 08/25: Drop gcc6.diff. Fixed upstream.

[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 22796490410229ab64f6fbd94ab3fff20906d902
Author: Markus Koschany <apo at debian.org>
Date:   Wed Sep 21 20:08:32 2016 +0200

    Drop gcc6.diff. Fixed upstream.
---
 debian/patches/gcc6.diff | 27 ---------------------------
 debian/patches/series    |  1 -
 2 files changed, 28 deletions(-)

diff --git a/debian/patches/gcc6.diff b/debian/patches/gcc6.diff
deleted file mode 100644
index 2a6d80d..0000000
--- a/debian/patches/gcc6.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Fix FTBFS with GCC 6
- Removed the explicit provided type, so the compiler can deduce it by itself.
-Bug: https://github.com/fifengine/fifengine/issues/887
-Bug-Debian: https://bugs.debian.org/811858
-Origin: upstream, https://github.com/fifengine/fifengine/commit/d117c71876fa8b02e8e85230e436681ce4527b2f
-Author: Kilian Köppchen <kiliankoeppchen at googlemail.com>
-Last-Update: 2016-05-28
---- a/engine/core/view/renderers/targetrenderer.cpp
-+++ b/engine/core/view/renderers/targetrenderer.cpp
-@@ -136,7 +136,7 @@
- 		rj.discard = false;
- 
- 		std::pair<RenderJobMap::iterator, bool> ret =
--			m_targets.insert(std::make_pair<std::string, RenderJob>(name, rj));
-+			m_targets.insert(std::make_pair(name, rj));
- 
- 		return ret.first->second.target;
- 	}
-@@ -149,7 +149,7 @@
- 		rj.discard = false;
- 
- 		std::pair<RenderJobMap::iterator, bool> ret =
--			m_targets.insert(std::make_pair<std::string, RenderJob>(image->getName(), rj));
-+			m_targets.insert(std::make_pair(image->getName(), rj));
- 
- 		return ret.first->second.target;
- 	}
diff --git a/debian/patches/series b/debian/patches/series
index e92c076..34abff9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 spelling.diff
-gcc6.diff

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