Bug#811818: crrcsim: FTBFS with GCC 6: no match for

[Markus Koschany]

Control: tags -1 pending

On Tue, 19 Jan 2016 18:18:28 -0800 Martin Michlmayr  wrote:
> Package: crrcsim
> Version: 0.9.12-6.1
> Severity: important
> User: debian-...@lists.debian.org
> Usertags: ftbfs-gcc-6 gcc-6-no-match
> 
> This package fails to build with GCC 6.  GCC 6 has not been released
> yet, but it's expected that GCC 6 will become the default compiler for
> stretch.

Dear maintainer,

I've uploaded a NMU versioned as 0.9.12-6.2.

Please find attached the debdiff.

Regards,

Markus
diff -Nru crrcsim-0.9.12/debian/changelog crrcsim-0.9.12/debian/changelog
--- crrcsim-0.9.12/debian/changelog 2014-10-06 12:57:04.0 +0200
+++ crrcsim-0.9.12/debian/changelog 2016-09-27 23:04:36.0 +0200
@@ -1,3 +1,14 @@
+crrcsim (0.9.12-6.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add fix-FTBFS-arm64.patch and fix the build failure on arm64.
+(Closes: #800037)
+  * Update Homepage field and point to current address. (Closes: #767856)
+  * Add 08-gcc-6.patch and fix FTBFS with GCC-6. Thanks to Gert Wollny for the
+patch. (Closes: #811818)
+
+ -- Markus Koschany   Tue, 27 Sep 2016 23:04:36 +0200
+
 crrcsim (0.9.12-6.1) unstable; urgency=medium
 
   * Non-maintainer upload
diff -Nru crrcsim-0.9.12/debian/control crrcsim-0.9.12/debian/control
--- crrcsim-0.9.12/debian/control   2014-10-06 12:57:04.0 +0200
+++ crrcsim-0.9.12/debian/control   2016-09-27 23:04:36.0 +0200
@@ -14,7 +14,7 @@
  libjpeg-dev,
  portaudio19-dev,
 Standards-Version: 3.9.5
-Homepage: http://crrcsim.berlios.de
+Homepage: http://sourceforge.net/projects/crrcsim
 Vcs-Git: git://anonscm.debian.org/collab-maint/crrcsim.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/crrcsim.git
 
diff -Nru crrcsim-0.9.12/debian/patches/08-gcc-6.patch 
crrcsim-0.9.12/debian/patches/08-gcc-6.patch
--- crrcsim-0.9.12/debian/patches/08-gcc-6.patch1970-01-01 
01:00:00.0 +0100
+++ crrcsim-0.9.12/debian/patches/08-gcc-6.patch2016-09-27 
23:04:36.0 +0200
@@ -0,0 +1,18 @@
+Description: Correct compilation with gcc-6
+ The patch assumes that a newline was the intended output after the 
+ according message. 
+Author: Gert Wollny  
+Forwarded:no
+Debian-Bug: https://bugs.debian.org/811818
+
+--- a/src/mod_video/crrc_animation.cpp
 b/src/mod_video/crrc_animation.cpp
+@@ -84,7 +84,7 @@
+   else
+   {
+ std::cerr << "createAnimation: unknown animation type '"
+-  << type << "'" << std::cerr;
++  << type << "'" << std::endl;
+   }
+   
+   if (anim != NULL)
diff -Nru crrcsim-0.9.12/debian/patches/fix-FTBFS-arm64.patch 
crrcsim-0.9.12/debian/patches/fix-FTBFS-arm64.patch
--- crrcsim-0.9.12/debian/patches/fix-FTBFS-arm64.patch 1970-01-01 
01:00:00.0 +0100
+++ crrcsim-0.9.12/debian/patches/fix-FTBFS-arm64.patch 2016-09-27 
23:04:36.0 +0200
@@ -0,0 +1,23 @@
+From: Markus Koschany 
+Date: Tue, 27 Sep 2016 23:02:04 +0200
+Subject: fix FTBFS arm64
+
+Debian-Bug: https://bugs.debian.org/800037
+Forwarded: no
+---
+ src/mod_inputdev/inputdev_parallel/inputdev_parallel.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mod_inputdev/inputdev_parallel/inputdev_parallel.cpp 
b/src/mod_inputdev/inputdev_parallel/inputdev_parallel.cpp
+index ef9946a..a76c03c 100644
+--- a/src/mod_inputdev/inputdev_parallel/inputdev_parallel.cpp
 b/src/mod_inputdev/inputdev_parallel/inputdev_parallel.cpp
+@@ -29,7 +29,7 @@
+ #else
+ #  if defined(WIN32)
+ #  elif defined(__powerpc__) || defined(__mips__) || defined(__mipsel__) ||\
+-defined(__s390__) || defined(__s390x__) || defined(__sparc__) || 
defined(__sh__)
++defined(__s390__) || defined(__s390x__) || defined(__sparc__) || 
defined(__sh__) || defined(__aarch64__)
+ #define ioperm(a,b,c) -1
+ #define inb(a) 0
+ #define outb(a,b)
diff -Nru crrcsim-0.9.12/debian/patches/series 
crrcsim-0.9.12/debian/patches/series
--- crrcsim-0.9.12/debian/patches/series2014-10-06 12:57:04.0 
+0200
+++ crrcsim-0.9.12/debian/patches/series2016-09-27 23:04:36.0 
+0200
@@ -5,3 +5,5 @@
 05-fix-man-hyphen-used-as-minus-sign.patch
 06-sys_io_missing.patch
 07-add-libgmp.patch
+08-gcc-6.patch
+fix-FTBFS-arm64.patch


signature.asc
Description: OpenPGP digital signature

Bug#811818: crrcsim: FTBFS with GCC 6: no match for

[Gert Wollny]

Control: tags -1 patch

Dear maintainer,

please find enclosed a patch that fixes building with gcc-6.

Note that the patch makes the assumption that a newline was expected in 
the output instead of std::cerr.


best regards,

Gert

Description: Correct compilation with gcc-6
 The patch assumes that a newline was the intended output after the 
 according message. 
Author: Gert Wollny  
Forwarded:no
Debian-Bug: https://bugs.debian.org/811818

--- a/src/mod_video/crrc_animation.cpp
+++ b/src/mod_video/crrc_animation.cpp
@@ -84,7 +84,7 @@
   else
   {
 std::cerr << "createAnimation: unknown animation type '"
-  << type << "'" << std::cerr;
+  << type << "'" << std::endl;
   }
   
   if (anim != NULL)