[frogatto] 01/01: Fix gcc7 FTBFS

[Dmitry Oboukhov]

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

unera pushed a commit to branch master
in repository frogatto.

commit e80de8e7b76c924332e96a90b7953ee758e41391
Author: Dmitry E. Oboukhov <unera at debian.org>
Date:   Wed Aug 16 11:32:27 2017 +0300

    Fix gcc7 FTBFS
    
    forbids comparison between pointer and integer.
---
 debian/changelog            |  7 +++++++
 debian/patches/ftbfs-871230 | 31 +++++++++++++++++++++++++++++++
 debian/patches/series       |  1 +
 3 files changed, 39 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ee6652e..af6c090 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+frogatto (1.3.1+dfsg-4) unstable; urgency=medium
+
+  * Fix gcc7 FTBFS (forbids comparison between pointer and integer),
+    closes: #871230.
+
+ -- Dmitry E. Oboukhov <unera at debian.org>  Wed, 16 Aug 2017 11:23:08 +0300
+
 frogatto (1.3.1+dfsg-3) unstable; urgency=low
 
   [ Martin Quinson ]
diff --git a/debian/patches/ftbfs-871230 b/debian/patches/ftbfs-871230
new file mode 100644
index 0000000..7634182
--- /dev/null
+++ b/debian/patches/ftbfs-871230
@@ -0,0 +1,31 @@
+Description: Fix FTBFS #871230
+ frogatto (1.3.1+dfsg-4) unstable; urgency=medium
+ .
+   [Dmitry E. Oboukhov]
+   * Fix FTBFS (ISO C++ forbids comparison between pointer and integer),
+     closes: 871230.
+Author: Dmitry E. Oboukhov <unera at debian.org>
+Bug-Debian: https://bugs.debian.org/871230
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: other
+Bug-Debian: https://bugs.debian.org/871230
+Forwarded: no
+Reviewed-By: Dmitry E. Oboukhov <unera at debian.org>
+Last-Update: Wed Aug 16 11:07:16 MSK 2017
+
+--- frogatto-1.3.1+dfsg.orig/src/surface_cache.cpp
++++ frogatto-1.3.1+dfsg/src/surface_cache.cpp
+@@ -116,7 +116,7 @@ surface get_no_cache(const std::string&
+ 	}
+ #endif // ANDROID
+ 	//std::cerr << "loading image '" << fname << "'\n";
+-	if(surf.get() == false || surf->w == 0) {
++	if((!surf.get()) || !surf->w) {
+ 		if(key != "") {
+ 			std::cerr << "failed to load image '" << key << "'\n";
+ 		}
diff --git a/debian/patches/series b/debian/patches/series
index b59a560..b24e206 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+ftbfs-871230
 fonts_dfsg
 boost153.patch
 gcc6

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