[frogatto] 02/05: reduce this patch, and add a short (non-standard) description

[Martin Quinson]

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

mquinson pushed a commit to branch master
in repository frogatto.

commit 4865598e9fe7b21bed125aa8dc2f3aeff43f9b35
Author: Martin Quinson <martin.quinson at loria.fr>
Date:   Thu Aug 18 23:50:44 2016 +0200

    reduce this patch, and add a short (non-standard) description
---
 debian/patches/gcc6 | 38 +++++++-------------------------------
 1 file changed, 7 insertions(+), 31 deletions(-)

diff --git a/debian/patches/gcc6 b/debian/patches/gcc6
index 48174f0..280e58b 100644
--- a/debian/patches/gcc6
+++ b/debian/patches/gcc6
@@ -1,3 +1,10 @@
+Gcc 6 reports a warning on narrowing conversions. Turn this warning
+off, and don't build with -Werror as it fails for some other reasons.
+
+Upstream is not interested in this patch because they work on a
+reimplementation of the game engine. Maintaining this one is not in
+their top priorities.
+
 ---
  src/debug_console.cpp |    2 +-
  src/dialog.cpp        |    4 ++--
@@ -15,37 +22,6 @@
  
  	static texture get(const std::string& str, int options=0);
  	static texture get(const std::string& str, const std::string& algorithm);
---- a/src/debug_console.cpp
-+++ b/src/debug_console.cpp
-@@ -257,7 +257,7 @@
- 
- 	int ypos = 100;
- 	foreach(const graphics::texture& t, messages()) {
--		const SDL_Rect area = {0, ypos-2, t.width() + 10, t.height() + 5};
-+		const SDL_Rect area = {0, (Sint16)(ypos-2), (Uint16)(t.width() + 10), (Uint16)(t.height() + 5)};
- 		graphics::draw_rect(area, graphics::color_black(), 128);
- 		graphics::blit_texture(t, 5, ypos);
- 		ypos += t.height() + 5;
---- a/src/dialog.cpp
-+++ b/src/dialog.cpp
-@@ -252,7 +252,7 @@
- void dialog::handle_draw() const
- {
- 	if(clear_bg()) {
--		SDL_Rect rect = {x(),y(),width(),height()};
-+		SDL_Rect rect = {(Sint16)x(),(Sint16)y(),(Uint16)width(),(Uint16)height()};
- 		SDL_Color col = {0,0,0,0};
- 		graphics::draw_rect(rect,col,clear_bg_);
- 
-@@ -272,7 +272,7 @@
- 	}
- 
- 	if(background_framed_gui_element_.empty() == false) {
--		SDL_Rect rect = {x(),y(),width(),height()};
-+		SDL_Rect rect = {(Sint16)x(),(Sint16)y(),(Uint16)width(),(Uint16)height()};
- 		SDL_Color col = {0,0,0,0};
- 		graphics::draw_rect(rect, col, 204);
- 		const_framed_gui_element_ptr window(framed_gui_element::get(background_framed_gui_element_));
 --- a/Makefile
 +++ b/Makefile
 @@ -34,7 +34,7 @@

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