[SCM] Simple and fast multimedia library for C++ branch, master, updated. upstream/1.6+repack1-123-g8299f07
Dmitrijs Ledkovs
xnox at debian.org
Sun May 27 19:31:59 UTC 2012
The following commit has been merged in the master branch:
commit afb79c7df2b6b731ba41a3b270aba8c29590f36e
Author: Dmitrijs Ledkovs <xnox at debian.org>
Date: Sun May 27 18:12:11 2012 +0100
Fix FTBFS with gcc-4.7, thanks to Matthias Klose. (Closes: #672086)
diff --git a/debian/changelog b/debian/changelog
index ec780c0..8139f16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
libsfml (1.6+dfsg1-3) unstable; urgency=low
* Thanks to Konstantinos Margaritis for NMU.
-
+ * Fix FTBFS with gcc-4.7, thanks to Matthias Klose. (Closes: #672086)
+
-- Dmitrijs Ledkovs <xnox at debian.org> Sun, 27 May 2012 17:46:23 +0100
libsfml (1.6+dfsg1-2.1) unstable; urgency=low
diff --git a/debian/patches/debian/fix-includes.diff b/debian/patches/debian/fix-includes.diff
new file mode 100644
index 0000000..a2f5fe2
--- /dev/null
+++ b/debian/patches/debian/fix-includes.diff
@@ -0,0 +1,38 @@
+From: Christoph Egger <christoph at debian.org>
+Subject: [PATCH] debian/fix-includes
+
+SFML needs sme modified includes to build against gcc-4.6
+
+Signed-off-by: Christoph Egger <christoph at debian.org>
+
+---
+ include/SFML/System/Resource.hpp | 1 +
+ include/SFML/System/ResourcePtr.inl | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/include/SFML/System/Resource.hpp b/include/SFML/System/Resource.hpp
+index 8f5088d..db651b0 100755
+--- a/include/SFML/System/Resource.hpp
++++ b/include/SFML/System/Resource.hpp
+@@ -29,6 +29,7 @@
+ // Headers
+ ////////////////////////////////////////////////////////////
+ #include <set>
++#include <cstddef>
+
+
+ namespace sf
+diff --git a/include/SFML/System/ResourcePtr.inl b/include/SFML/System/ResourcePtr.inl
+index dbfcd0d..7bda5f1 100755
+--- a/include/SFML/System/ResourcePtr.inl
++++ b/include/SFML/System/ResourcePtr.inl
+@@ -22,6 +22,7 @@
+ //
+ ////////////////////////////////////////////////////////////
+
++#include <cstddef>
+
+ ////////////////////////////////////////////////////////////
+ /// Default constructor
+--
+tg: (3e3a7f4..) debian/fix-includes (depends on: debian/scriptheader-in-example-makefiles)
diff --git a/debian/patches/debian/gcc-4.6.diff b/debian/patches/debian/gcc-4.6.diff
index 82c2e06..9b2dad8 100644
--- a/debian/patches/debian/gcc-4.6.diff
+++ b/debian/patches/debian/gcc-4.6.diff
@@ -18,7 +18,7 @@ Signed-off-by: Evgeni Golov <evgeni at debian.org>
include/SFML/System/ResourcePtr.inl | 1 +
src/SFML/Graphics/Font.cpp | 1 +
src/SFML/Graphics/Image.cpp | 1 +
- 10 files changed, 10 insertions(+), 0 deletions(-)
+ 10 files changed, 10 insertions(+)
diff --git a/include/SFML/Audio/Music.hpp b/include/SFML/Audio/Music.hpp
index 0b8f70d..3320676 100755
@@ -104,6 +104,18 @@ index b0ca81b..6b9c483 100755
#include <SFML/System/Resource.hpp>
#include <SFML/System/Unicode.hpp>
#include <SFML/Graphics/Drawable.hpp>
+diff --git a/include/SFML/System/ResourcePtr.inl b/include/SFML/System/ResourcePtr.inl
+index dbfcd0d..7bda5f1 100755
+--- a/include/SFML/System/ResourcePtr.inl
++++ b/include/SFML/System/ResourcePtr.inl
+@@ -22,6 +22,7 @@
+ //
+ ////////////////////////////////////////////////////////////
+
++#include <cstddef>
+
+ ////////////////////////////////////////////////////////////
+ /// Default constructor
diff --git a/src/SFML/Graphics/Font.cpp b/src/SFML/Graphics/Font.cpp
index 36c4c28..350c0cc 100755
--- a/src/SFML/Graphics/Font.cpp
@@ -129,4 +141,4 @@ index 14346fb..8b18fb7 100755
#include <SFML/Graphics/ImageLoader.hpp>
#include <SFML/Graphics/RenderWindow.hpp>
--
-tg: (3794d17..) debian/gcc-4.6 (depends on: master)
+tg: (ff6621b..) debian/gcc-4.6 (depends on: master)
diff --git a/debian/patches/debian/gcc-4.7.diff b/debian/patches/debian/gcc-4.7.diff
new file mode 100644
index 0000000..be7182c
--- /dev/null
+++ b/debian/patches/debian/gcc-4.7.diff
@@ -0,0 +1,26 @@
+From: Matthias Klose <doko at debian.org>
+Subject: [PATCH] debian/gcc-4.7
+
+Fix build failure with GCC 4.7. Closes: #672086.
+
+Signed-off-by: Dmitrijs Ledkovs <xnox at debian.org>
+Signed-off-by: Matthias Klose <doko at debian.org>
+
+---
+ src/SFML/Window/Linux/Joystick.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/SFML/Window/Linux/Joystick.cpp b/src/SFML/Window/Linux/Joystick.cpp
+index 829a741..c2dabf2 100755
+--- a/src/SFML/Window/Linux/Joystick.cpp
++++ b/src/SFML/Window/Linux/Joystick.cpp
+@@ -27,6 +27,7 @@
+ ////////////////////////////////////////////////////////////
+ #include <SFML/Window/Joystick.hpp>
+ #include <sstream>
++#include <unistd.h>
+
+
+ namespace sf
+--
+tg: (ff6621b..) debian/gcc-4.7 (depends on: master)
diff --git a/debian/patches/debian/interlinking.diff b/debian/patches/debian/interlinking.diff
index ce79671..f2f9030 100644
--- a/debian/patches/debian/interlinking.diff
+++ b/debian/patches/debian/interlinking.diff
@@ -75,4 +75,4 @@ index 0dd689c..a05a54b 100755
$(OBJ): %.o: %.cpp
$(CPP) -o $@ -c $< $(CFLAGS)
--
-tg: (2bed856..) debian/interlinking (depends on: debian/destdir-install-symlinks)
+tg: (78d04e9..) debian/interlinking (depends on: debian/destdir-install-symlinks)
diff --git a/debian/patches/debian/kfreebsd.diff b/debian/patches/debian/kfreebsd.diff
index 6653a93..a4b947b 100644
--- a/debian/patches/debian/kfreebsd.diff
+++ b/debian/patches/debian/kfreebsd.diff
@@ -8,7 +8,7 @@ Signed-off-by: Christoph Egger <Christoph.Egger at gmx.de>
---
include/SFML/Config.hpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/SFML/Config.hpp b/include/SFML/Config.hpp
index 84ec60f..7db03a9 100755
@@ -24,4 +24,4 @@ index 84ec60f..7db03a9 100755
// FreeBSD
#define SFML_SYSTEM_FREEBSD
--
-tg: (92298c7..) debian/kfreebsd (depends on: master)
+tg: (e3ae217..) debian/kfreebsd (depends on: master)
diff --git a/debian/patches/debian/repacking.diff b/debian/patches/debian/repacking.diff
index ec20c85..5e7cb2e 100644
--- a/debian/patches/debian/repacking.diff
+++ b/debian/patches/debian/repacking.diff
@@ -129,4 +129,4 @@ index a05a54b..5f9708e 100755
$(OBJ): %.o: %.cpp
$(CPP) -o $@ -c $< $(CFLAGS)
--
-tg: (cced581..) debian/repacking (depends on: debian/interlinking)
+tg: (3bc53c8..) debian/repacking (depends on: debian/interlinking)
diff --git a/debian/patches/debian/scriptheader-in-example-makefiles.diff b/debian/patches/debian/scriptheader-in-example-makefiles.diff
index bbcdcda..14f6930 100644
--- a/debian/patches/debian/scriptheader-in-example-makefiles.diff
+++ b/debian/patches/debian/scriptheader-in-example-makefiles.diff
@@ -21,7 +21,7 @@ Signed-off-by: Christoph Egger <Christoph.Egger at gmx.de>
samples/voip/Makefile | 2 ++
samples/window/Makefile | 2 ++
samples/wxwidgets/Makefile | 2 ++
- 13 files changed, 26 insertions(+), 0 deletions(-)
+ 13 files changed, 26 insertions(+)
diff --git a/samples/Makefile b/samples/Makefile
index 938152a..7080454 100755
@@ -154,4 +154,4 @@ index e6586ec..558e565 100755
OBJ = Main.o wxSFMLCanvas.o
--
-tg: (92298c7..) debian/scriptheader-in-example-makefiles (depends on: master)
+tg: (cae8bed..) debian/scriptheader-in-example-makefiles (depends on: master)
diff --git a/debian/patches/series b/debian/patches/series
index 38902a0..6ef1535 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
-debian/fix-includes.diff
+debian/fix-includes.diff -p1
debian/gcc-4.6.diff -p1
+debian/gcc-4.7.diff -p1
debian/interlinking.diff -p1
debian/kfreebsd.diff -p1
debian/repacking.diff -p1
--
Simple and fast multimedia library for C++
More information about the Pkg-games-commits
mailing list