r16066 - in packages/trunk/0ad/debian: . patches

[Ludovic Rousseau]

Author: rousseau
Date: 2017-11-25 13:27:58 +0000 (Sat, 25 Nov 2017)
New Revision: 16066

Added:
   packages/trunk/0ad/debian/patches/armhf-wchar-signedness.patch
Modified:
   packages/trunk/0ad/debian/changelog
Log:
Add missing file patches/armhf-wchar-signedness.patch


Modified: packages/trunk/0ad/debian/changelog
===================================================================
--- packages/trunk/0ad/debian/changelog	2017-11-24 12:43:13 UTC (rev 16065)
+++ packages/trunk/0ad/debian/changelog	2017-11-25 13:27:58 UTC (rev 16066)
@@ -1,11 +1,11 @@
 0ad (0.0.22-3.1) unstable; urgency=medium
 
-  * Non-maintainer upload.
+  * Non-maintainer upload with maintainers permission.
   * Add armhf back to architecture list.
   * Fix "0ad FTBFS with on armhf with gcc 7: error: call of overloaded
     'abs(unsigned int)' is ambiguous" (Closes: #879071)
 
- -- Peter Michael Green <plugwash at debian.org>  Sun, 19 Nov 2017 02:03:24 +0000
+ -- Peter Michael Green <plugwash at debian.org>  Tue, 21 Nov 2017 00:15:10 +0000
 
 0ad (0.0.22-3) unstable; urgency=medium
 

Added: packages/trunk/0ad/debian/patches/armhf-wchar-signedness.patch
===================================================================
--- packages/trunk/0ad/debian/patches/armhf-wchar-signedness.patch	                        (rev 0)
+++ packages/trunk/0ad/debian/patches/armhf-wchar-signedness.patch	2017-11-25 13:27:58 UTC (rev 16066)
@@ -0,0 +1,22 @@
+Description: fix build failure on armhf due to unsigned wchar_t 
+   * Fix "0ad FTBFS with on armhf with gcc 7: error: call of overloaded
+     'abs(unsigned int)' is ambiguous" (Closes: #879071)
+ The root cause of this failure is that wchar_t is unsigned on
+ armhf. Subtracting a signed 32-bit number from an unsigned one results
+ in an unsigned result which std::abs (understandablly)  does not support.
+ Casting both arguments of the subtraction to int fixes the build failure
+Author: Peter Michael Green <plugwash at debian.org>
+Bug-Debian: https://bugs.debian.org/879071
+Last-Update: 2017-11-21
+
+--- 0ad-0.0.22.orig/source/gui/CDropDown.cpp
++++ 0ad-0.0.22/source/gui/CDropDown.cpp
+@@ -352,7 +352,7 @@ InReaction CDropDown::ManuallyHandleEven
+ 					int diff = 0;
+ 					for (size_t j = 0; j < m_InputBuffer.length(); ++j)
+ 					{
+-						diff = std::abs(pList->m_Items[i].GetRawString().LowerCase()[j] - (int)m_InputBuffer[j]);
++						diff = std::abs((int)(pList->m_Items[i].GetRawString().LowerCase()[j]) - (int)m_InputBuffer[j]);
+ 						if (diff == 0)
+ 							indexOfDifference = j+1;
+ 						else