[critterding] 14/24: Refresh patches.

[Gabriele Giacone]

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

gg0-guest pushed a commit to branch master
in repository critterding.

commit e997408fc4ce9a2e3ca7bc193acdf3de996daf44
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sat Aug 2 13:26:40 2014 +0200

    Refresh patches.
---
 debian/patches/00fontandiconpath | 36 ++++++++++++------------------------
 debian/patches/01formatsecurity  | 16 ++++++++++++++++
 debian/patches/series            |  1 +
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/debian/patches/00fontandiconpath b/debian/patches/00fontandiconpath
index 7ef9950..a058e8c 100644
--- a/debian/patches/00fontandiconpath
+++ b/debian/patches/00fontandiconpath
@@ -1,26 +1,14 @@
-Description: This patch replace font and icon relative paths with
- absolute ones.
+Description: This patch replace font path with system one.
 Author: Gabriele Giacone <1o5g4r8o at gmail.com>
 
---- critterding-1.0-beta12.1.orig/src/gui/textprinter.cpp
-+++ critterding-1.0-beta12.1/src/gui/textprinter.cpp
-@@ -185,7 +185,7 @@ void Textprinter::setUpFonts()
- 	char const *fontFilePath;
- 
- 	string fontpath = Settings::Instance()->binarypath;
--	string defaultf = "../share/critterding/font.ttf";
-+	string defaultf = "/usr/share/critterding/font.ttf";
- 	string systemf = "/usr/share/fonts/TTF/DejaVuSans.ttf";
- 
- 	string usepath = fontpath;
---- critterding-1.0-beta12.1.orig/src/gl/glwindow.cpp
-+++ critterding-1.0-beta12.1/src/gl/glwindow.cpp
-@@ -47,7 +47,7 @@ void GLWindow::create(const char* title,
- // 	SDL_WM_SetIcon(SDL_LoadBMP("other files/critterding icon.png"), 0);
- // 	SDL_WM_SetIcon(SDL_LoadBMP("other files/cd.bmp"), 0);
- 	string pixmappath = Settings::Instance()->binarypath;
--	pixmappath.append( "../share/critterding/pixmaps/cd.bmp" );
-+	pixmappath.append( "/usr/share/critterding/pixmaps/cd.bmp" );
- 	SDL_WM_SetIcon(SDL_LoadBMP(pixmappath.c_str()), 0);
- // 	SDL_WM_SetIcon(SDL_LoadBMP("/projects/lessons/lesson20/data/image2.bmp"), 0);
- 
+--- a/src/gui/textprinter.cpp
++++ b/src/gui/textprinter.cpp
+@@ -113,7 +113,7 @@ void Textprinter::print(const Vector2i&
+ void Textprinter::setUpFonts(BeFilesystem& filesystem)
+ {
+ 	BeFile befileFont;
+-	if ( filesystem.load( befileFont, "font.ttf" ) )
++	if ( filesystem.load( befileFont, "/usr/share/critterding/font.ttf" ) )
+ 	{
+ 		
+ 		// clear if exists
diff --git a/debian/patches/01formatsecurity b/debian/patches/01formatsecurity
new file mode 100644
index 0000000..ddd1dc2
--- /dev/null
+++ b/debian/patches/01formatsecurity
@@ -0,0 +1,16 @@
+Description: Fix -Werror=format-security
+Author: Gabriele Giacone <1o5g4r8o at gmail.com>
+
+Index: critterding.git/src/common/be_physics_debug_renderer.cpp
+===================================================================
+--- critterding.git.orig/src/common/be_physics_debug_renderer.cpp
++++ critterding.git/src/common/be_physics_debug_renderer.cpp
+@@ -111,7 +111,7 @@ void	BePhysicsDebugRenderer::draw3dText(
+ 
+ void	BePhysicsDebugRenderer::reportErrorWarning(const char* warningString)
+ {
+-	printf(warningString);
++	printf("%s\n", warningString);
+ }
+ 
+ void	BePhysicsDebugRenderer::drawContactPoint(const btVector3& pointOnB,const btVector3& normalOnB,btScalar distance,int lifeTime,const btVector3& color)
diff --git a/debian/patches/series b/debian/patches/series
index ef20dbc..045d366 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 00fontandiconpath
+01formatsecurity

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/critterding.git