[bzflag] 05/14: Add clang-FTBFS.patch.

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository bzflag.

commit a70bcd66b4ec5af950c5206116c6fc6fb63a5653
Author: Markus Koschany <apo at debian.org>
Date:   Sun Nov 1 16:02:40 2015 +0100

    Add clang-FTBFS.patch.
    
    Thanks: Alexander for the report and patch.
    Closes: #753262
---
 debian/patches/clang-FTBFS.patch | 45 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 2 files changed, 46 insertions(+)

diff --git a/debian/patches/clang-FTBFS.patch b/debian/patches/clang-FTBFS.patch
new file mode 100644
index 0000000..207f3eb
--- /dev/null
+++ b/debian/patches/clang-FTBFS.patch
@@ -0,0 +1,45 @@
+From: Alexander <sanek23994 at gmail.com>
+Date: Sun, 1 Nov 2015 15:57:12 +0100
+Subject: clang FTBFS
+
+Fix FTBFS with the clang compiler.
+
+Forwarded: not needed, fixed upstream in r22804
+---
+ include/VotingArbiter.h | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/include/VotingArbiter.h b/include/VotingArbiter.h
+index cbf9e02..606220e 100644
+--- a/include/VotingArbiter.h
++++ b/include/VotingArbiter.h
+@@ -86,9 +86,9 @@ protected:
+ public:
+ 
+   /* default constructor */
+-  VotingArbiter(unsigned short int voteTime, unsigned short int vetoTime,
+-		unsigned short int votesRequired, float votePercentage,
+-		unsigned short int voteRepeatTime);
++  VotingArbiter(unsigned short int voteTime=60, unsigned short int vetoTime=20,
++		unsigned short int votesRequired=2, float votePercentage=50.1,
++		unsigned short int voteRepeatTime=300);
+   /* default copy constructor */
+   VotingArbiter(const VotingArbiter& arbiter);
+   ~VotingArbiter(void);
+@@ -231,11 +231,11 @@ public:
+ };
+ 
+ 
+-inline VotingArbiter::VotingArbiter(unsigned short int voteTime=60,
+-				    unsigned short int vetoTime=20,
+-				    unsigned short int votesRequired=2,
+-				    float votePercentage=50.1,
+-				    unsigned short int voteRepeatTime=300)
++inline VotingArbiter::VotingArbiter(unsigned short int voteTime,
++				    unsigned short int vetoTime,
++				    unsigned short int votesRequired,
++				    float votePercentage,
++				    unsigned short int voteRepeatTime)
+   : _votingBooth(NULL),
+     _maxVotes(votesRequired+1),
+     _voteTime(voteTime),
diff --git a/debian/patches/series b/debian/patches/series
index 2728e06..80d77cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 06_PATH_MAX.diff
 07_hurd_autotools_support.diff
 Update-Portuguese-translation-for-bzflag.patch
+clang-FTBFS.patch

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