[libsfml] 05/06: Drop 07_abi.patch - equivalent applied upstream

[James Cowgill]

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

jcowgill pushed a commit to branch master
in repository libsfml.

commit 6e441a03e6371ce69267726034adb0e102c3339d
Author: James Cowgill <jcowgill at debian.org>
Date:   Thu Nov 3 21:21:16 2016 +0000

    Drop 07_abi.patch - equivalent applied upstream
---
 debian/patches/07_abi.patch | 31 -------------------------------
 debian/patches/series       |  1 -
 2 files changed, 32 deletions(-)

diff --git a/debian/patches/07_abi.patch b/debian/patches/07_abi.patch
deleted file mode 100644
index d0cb727..0000000
--- a/debian/patches/07_abi.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Add sf::GlResource::ensureGlContext to maintain ABI
-Author: James Cowgill <jcowgill at debian.org>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/include/SFML/Window/GlResource.hpp
-+++ b/include/SFML/Window/GlResource.hpp
-@@ -79,6 +79,9 @@ protected:
-     private:
-         Context* m_context; ///< Temporary context, in case we needed to create one
-     };
-+
-+    // Dummy function to maintain SFML 2.4 ABI
-+    static SFML_DEPRECATED void ensureGlContext();
- };
- 
- } // namespace sf
---- a/src/SFML/Window/GlResource.cpp
-+++ b/src/SFML/Window/GlResource.cpp
-@@ -42,6 +42,12 @@ namespace
- 
- namespace sf
- {
-+// Dummy function to maintain SFML 2.4 ABI
-+void GlResource::ensureGlContext()
-+{
-+}
-+
-+
- ////////////////////////////////////////////////////////////
- GlResource::GlResource()
- {
diff --git a/debian/patches/series b/debian/patches/series
index 4aafa6a..06d8ed1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
 04_remove-googleapi-css.patch
 05_build-doc-once.patch
 06_pkgconfig-freebsd.patch
-07_abi.patch

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