[supertransball2] 03/13: Add gcc-6-convert-bool.patch

Markus Koschany apo at moszumanska.debian.org
Thu Jul 7 22:47:32 UTC 2016


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

apo pushed a commit to branch master
in repository supertransball2.

commit 797f7ca5c0c977e3d66a7a048079cef67e0df517
Author: Markus Koschany <apo at debian.org>
Date:   Thu Jul 7 23:54:57 2016 +0200

    Add gcc-6-convert-bool.patch
---
 debian/patches/gcc-6-convert-bool.patch | 21 +++++++++++++++++++++
 debian/patches/series                   |  1 +
 2 files changed, 22 insertions(+)

diff --git a/debian/patches/gcc-6-convert-bool.patch b/debian/patches/gcc-6-convert-bool.patch
new file mode 100644
index 0000000..1c30e66
--- /dev/null
+++ b/debian/patches/gcc-6-convert-bool.patch
@@ -0,0 +1,21 @@
+From: Markus Koschany <apo at debian.org>
+Date: Thu, 7 Jul 2016 23:54:34 +0200
+Subject: gcc-6 convert bool
+
+---
+ sources/auxiliar.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sources/auxiliar.cpp b/sources/auxiliar.cpp
+index 4a27ad7..9149073 100644
+--- a/sources/auxiliar.cpp
++++ b/sources/auxiliar.cpp
+@@ -48,7 +48,7 @@ SDL_Surface *load_maskedimage(char *imagefile,char *maskfile,char *path)
+ 	mask=IMG_Load(name);
+ 
+     if (tmp==0 ||
+-		mask==0) return false;
++		mask==0) return nullptr;
+ 
+ 	res=SDL_DisplayFormatAlpha(tmp);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e2a0a2a..481abe6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Fix-unix-paths-and-Makefile.patch
 hardening.patch
+gcc-6-convert-bool.patch

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



More information about the Pkg-games-commits mailing list