[scottfree] 09/11: Add a missing return value (for clang)

Stephen Kitt skitt at moszumanska.debian.org
Fri Jan 20 11:54:48 UTC 2017


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

skitt pushed a commit to branch master
in repository scottfree.

commit e877880841884a6d692da4054da3f4d3c58775b9
Author: Stephen Kitt <steve at sk2.org>
Date:   Fri Jan 20 12:51:34 2017 +0100

    Add a missing return value (for clang)
---
 debian/changelog             |  2 ++
 debian/patches/03_clang.diff | 15 +++++++++++++++
 debian/patches/series        |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 614a21f..2cdd9f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ scottfree (1.14-10) UNRELEASED; urgency=low
   * Rewrite debian/copyright in machine-readable format.
   * Build docbook.6 from docbook.sgml.
   * Update the URL for the games, and add it as the homepage.
+  * Fix a missing return value (allows building with clang, thanks to
+    Nicolas Sévelin-Radiguet for the patch; Closes: #760675).
 
  -- Evgeni Golov <evgeni at debian.org>  Mon, 15 Jul 2013 22:22:03 +0200
 
diff --git a/debian/patches/03_clang.diff b/debian/patches/03_clang.diff
new file mode 100644
index 0000000..e8dd4cf
--- /dev/null
+++ b/debian/patches/03_clang.diff
@@ -0,0 +1,15 @@
+Description: Provide an explicit return value
+Author: Nicolas Sévelin-Radiguet <nicosr at free.fr>
+Origin: https://bugs.debian.org/760675
+
+--- a/ScottCurses.c
++++ b/ScottCurses.c
+@@ -1164,7 +1164,7 @@
+ 					if(f2==2)
+ 						doagain=1;
+ 					if(vb!=0 && doagain==0)
+-						return;
++						return 0;
+ 				}
+ 			}
+ 		}
diff --git a/debian/patches/series b/debian/patches/series
index 04aff3b..4661ade 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 01_makefile.diff
 02_scottcurses_includes.diff
-
+03_clang.diff

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



More information about the Pkg-games-commits mailing list