[SCM] Simple and fast multimedia library for C++ branch, master, updated. debian/1.6+dfsg1-3-5-gfd0e144
Christoph Egger
christoph at debian.org
Sun Jul 8 19:09:52 UTC 2012
The following commit has been merged in the master branch:
commit fd0e144fcba76465b3624e73ed39d64667148b49
Author: Christoph Egger <christoph at debian.org>
Date: Sun Jul 8 21:09:22 2012 +0200
Remove nonfree Arial.hpp (Closes: 647497)
diff --git a/debian/changelog b/debian/changelog
index 5fa0982..0b541e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libsfml (1.6+dfsg2-1) unstable; urgency=low
+
+ * Remove nonfree Arial.hpp (Closes: 647497)
+
+ -- Christoph Egger <christoph at debian.org> Sun, 08 Jul 2012 20:57:06 +0200
+
libsfml (1.6+dfsg1-3) unstable; urgency=low
* Team Upload.
diff --git a/debian/patches/debian/gcc-4.6.diff b/debian/patches/debian/gcc-4.6.diff
index f1a5021..d3c541b 100644
--- a/debian/patches/debian/gcc-4.6.diff
+++ b/debian/patches/debian/gcc-4.6.diff
@@ -20,10 +20,10 @@ Signed-off-by: Evgeni Golov <evgeni at debian.org>
src/SFML/Graphics/Image.cpp | 1 +
10 files changed, 10 insertions(+)
-diff --git a/include/SFML/Audio/Music.hpp b/include/SFML/Audio/Music.hpp
-index 0b8f70d..3320676 100755
---- a/include/SFML/Audio/Music.hpp
-+++ b/include/SFML/Audio/Music.hpp
+Index: libsfml/include/SFML/Audio/Music.hpp
+===================================================================
+--- libsfml.orig/include/SFML/Audio/Music.hpp 2012-07-08 21:07:35.000000000 +0200
++++ libsfml/include/SFML/Audio/Music.hpp 2012-07-08 21:07:39.650370721 +0200
@@ -28,6 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
@@ -32,10 +32,10 @@ index 0b8f70d..3320676 100755
#include <SFML/Audio/SoundStream.hpp>
#include <string>
#include <vector>
-diff --git a/include/SFML/Audio/Sound.hpp b/include/SFML/Audio/Sound.hpp
-index 7cb8002..5a46481 100755
---- a/include/SFML/Audio/Sound.hpp
-+++ b/include/SFML/Audio/Sound.hpp
+Index: libsfml/include/SFML/Audio/Sound.hpp
+===================================================================
+--- libsfml.orig/include/SFML/Audio/Sound.hpp 2012-07-08 21:07:35.000000000 +0200
++++ libsfml/include/SFML/Audio/Sound.hpp 2012-07-08 21:07:39.650370721 +0200
@@ -28,6 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
@@ -44,10 +44,10 @@ index 7cb8002..5a46481 100755
#include <SFML/System/Resource.hpp>
#include <SFML/System/Vector3.hpp>
#include <SFML/Audio/AudioResource.hpp>
-diff --git a/include/SFML/Audio/SoundBuffer.hpp b/include/SFML/Audio/SoundBuffer.hpp
-index 023e5aa..2db29ad 100755
---- a/include/SFML/Audio/SoundBuffer.hpp
-+++ b/include/SFML/Audio/SoundBuffer.hpp
+Index: libsfml/include/SFML/Audio/SoundBuffer.hpp
+===================================================================
+--- libsfml.orig/include/SFML/Audio/SoundBuffer.hpp 2012-07-08 21:07:35.000000000 +0200
++++ libsfml/include/SFML/Audio/SoundBuffer.hpp 2012-07-08 21:07:39.650370721 +0200
@@ -28,6 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
@@ -56,10 +56,10 @@ index 023e5aa..2db29ad 100755
#include <SFML/System/Resource.hpp>
#include <SFML/Audio/AudioResource.hpp>
#include <string>
-diff --git a/include/SFML/Graphics/PostFX.hpp b/include/SFML/Graphics/PostFX.hpp
-index c875377..be2200a 100755
---- a/include/SFML/Graphics/PostFX.hpp
-+++ b/include/SFML/Graphics/PostFX.hpp
+Index: libsfml/include/SFML/Graphics/PostFX.hpp
+===================================================================
+--- libsfml.orig/include/SFML/Graphics/PostFX.hpp 2012-07-08 21:07:35.000000000 +0200
++++ libsfml/include/SFML/Graphics/PostFX.hpp 2012-07-08 21:07:39.660371117 +0200
@@ -28,6 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
@@ -68,10 +68,10 @@ index c875377..be2200a 100755
#include <SFML/Graphics/Drawable.hpp>
#include <SFML/Graphics/Image.hpp>
#include <istream>
-diff --git a/include/SFML/Graphics/RenderWindow.hpp b/include/SFML/Graphics/RenderWindow.hpp
-index 088e368..b2154cc 100755
---- a/include/SFML/Graphics/RenderWindow.hpp
-+++ b/include/SFML/Graphics/RenderWindow.hpp
+Index: libsfml/include/SFML/Graphics/RenderWindow.hpp
+===================================================================
+--- libsfml.orig/include/SFML/Graphics/RenderWindow.hpp 2012-07-08 21:07:35.000000000 +0200
++++ libsfml/include/SFML/Graphics/RenderWindow.hpp 2012-07-08 21:07:39.660371117 +0200
@@ -28,6 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
@@ -80,10 +80,10 @@ index 088e368..b2154cc 100755
#include <SFML/Graphics/Image.hpp>
#include <SFML/Graphics/RenderTarget.hpp>
#include <SFML/Window/Window.hpp>
-diff --git a/include/SFML/Graphics/Sprite.hpp b/include/SFML/Graphics/Sprite.hpp
-index 9d47bb4..deb6bab 100755
---- a/include/SFML/Graphics/Sprite.hpp
-+++ b/include/SFML/Graphics/Sprite.hpp
+Index: libsfml/include/SFML/Graphics/Sprite.hpp
+===================================================================
+--- libsfml.orig/include/SFML/Graphics/Sprite.hpp 2012-07-08 21:07:35.000000000 +0200
++++ libsfml/include/SFML/Graphics/Sprite.hpp 2012-07-08 21:07:39.660371117 +0200
@@ -28,6 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
@@ -92,10 +92,10 @@ index 9d47bb4..deb6bab 100755
#include <SFML/System/Resource.hpp>
#include <SFML/Graphics/Drawable.hpp>
#include <SFML/Graphics/Rect.hpp>
-diff --git a/include/SFML/Graphics/String.hpp b/include/SFML/Graphics/String.hpp
-index b0ca81b..6b9c483 100755
---- a/include/SFML/Graphics/String.hpp
-+++ b/include/SFML/Graphics/String.hpp
+Index: libsfml/include/SFML/Graphics/String.hpp
+===================================================================
+--- libsfml.orig/include/SFML/Graphics/String.hpp 2012-07-08 21:07:35.000000000 +0200
++++ libsfml/include/SFML/Graphics/String.hpp 2012-07-08 21:07:39.660371117 +0200
@@ -28,6 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
@@ -104,22 +104,22 @@ 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 @@
- //
- ////////////////////////////////////////////////////////////
+Index: libsfml/include/SFML/System/ResourcePtr.inl
+===================================================================
+--- libsfml.orig/include/SFML/System/ResourcePtr.inl 2012-07-08 21:07:35.000000000 +0200
++++ libsfml/include/SFML/System/ResourcePtr.inl 2012-07-08 21:07:39.660371117 +0200
+@@ -34,6 +34,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
-+++ b/src/SFML/Graphics/Font.cpp
+ /// Construct from a raw resource
+Index: libsfml/src/SFML/Graphics/Font.cpp
+===================================================================
+--- libsfml.orig/src/SFML/Graphics/Font.cpp 2012-07-08 21:07:35.000000000 +0200
++++ libsfml/src/SFML/Graphics/Font.cpp 2012-07-08 21:07:39.660371117 +0200
@@ -25,6 +25,7 @@
////////////////////////////////////////////////////////////
// Headers
@@ -128,10 +128,10 @@ index 36c4c28..350c0cc 100755
#include <SFML/Graphics/Font.hpp>
#include <SFML/Graphics/FontLoader.hpp>
#include <iostream>
-diff --git a/src/SFML/Graphics/Image.cpp b/src/SFML/Graphics/Image.cpp
-index 14346fb..8b18fb7 100755
---- a/src/SFML/Graphics/Image.cpp
-+++ b/src/SFML/Graphics/Image.cpp
+Index: libsfml/src/SFML/Graphics/Image.cpp
+===================================================================
+--- libsfml.orig/src/SFML/Graphics/Image.cpp 2012-07-08 21:07:35.000000000 +0200
++++ libsfml/src/SFML/Graphics/Image.cpp 2012-07-08 21:07:39.660371117 +0200
@@ -25,6 +25,7 @@
////////////////////////////////////////////////////////////
// Headers
@@ -140,5 +140,3 @@ index 14346fb..8b18fb7 100755
#include <SFML/Graphics/Image.hpp>
#include <SFML/Graphics/ImageLoader.hpp>
#include <SFML/Graphics/RenderWindow.hpp>
---
-tg: (afb79c7..) debian/gcc-4.6 (depends on: master)
diff --git a/debian/patches/debian/remove-Arial.hpp b/debian/patches/debian/remove-Arial.hpp
new file mode 100644
index 0000000..07d4111
--- /dev/null
+++ b/debian/patches/debian/remove-Arial.hpp
@@ -0,0 +1,23 @@
+Index: libsfml/src/SFML/Graphics/Font.cpp
+===================================================================
+--- libsfml.orig/src/SFML/Graphics/Font.cpp 2012-07-08 21:07:00.520372052 +0200
++++ libsfml/src/SFML/Graphics/Font.cpp 2012-07-08 21:07:00.670366273 +0200
+@@ -173,17 +173,11 @@
+
+ #endif
+
+- // Get the raw data of the Arial font file into an array, so that we can load it into the font
+- static const char DefaultFontData[] =
+- {
+- #include <SFML/Graphics/Arial.hpp>
+- };
+-
+ // Load the default font on first call
+ static bool DefaultFontLoaded = false;
+ if (!DefaultFontLoaded)
+ {
+- DefaultFont.LoadFromMemory(DefaultFontData, sizeof(DefaultFontData), 30);
++ DefaultFont.LoadFromFile("/usr/share/fonts/truetype/freefont/FreeSans.ttf", 30);
+ DefaultFontLoaded = true;
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 227aeaf..8169a25 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ debian/kfreebsd.diff -p1
debian/libpng-1.5.diff -p1
debian/repacking.diff -p1
debian/scriptheader-in-example-makefiles.diff -p1
+debian/remove-Arial.hpp
--
Simple and fast multimedia library for C++
More information about the Pkg-games-commits
mailing list