[libsfml] 07/11: Add 07_abi.patch to maintain SFML 2.4 ABI

James Cowgill jcowgill at moszumanska.debian.org
Thu Oct 27 20:51:54 UTC 2016


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

jcowgill pushed a commit to branch master
in repository libsfml.

commit 0cf84c5bc9ec048b5a868cbd18b9a1b71ad530b1
Author: James Cowgill <jcowgill at debian.org>
Date:   Thu Oct 27 18:45:31 2016 +0100

    Add 07_abi.patch to maintain SFML 2.4 ABI
    
    This should be fixed upstream for the final 2.4.1 release.
---
 debian/patches/07_abi.patch | 31 +++++++++++++++++++++++++++++++
 debian/patches/series       |  1 +
 2 files changed, 32 insertions(+)

diff --git a/debian/patches/07_abi.patch b/debian/patches/07_abi.patch
new file mode 100644
index 0000000..d0cb727
--- /dev/null
+++ b/debian/patches/07_abi.patch
@@ -0,0 +1,31 @@
+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 06d8ed1..4aafa6a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 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



More information about the Pkg-games-commits mailing list