games-board/qgo: Fix narrowing conversion error, bug 598406

Closes: https://bugs.gentoo.org/598406
Package-Manager: Portage-2.3.10, Repoman-2.3.3

diff --git a/games-board/qgo/files/qgo-1.5.4_p20100322-gcc6.patch b/games-board/qgo/files/qgo-1.5.4_p20100322-gcc6.patch
new file mode 100644 (file)
index 0000000..52b4ec2
--- /dev/null
+++ b/games-board/qgo/files/qgo-1.5.4_p20100322-gcc6.patch
@@ -0,0 +1,12 @@
+diff -ruN qgo-1.5.4_p20100322.orig/src/network/cyberoroconnection.cpp qgo-1.5.4_p20100322/src/network/cyberoroconnection.cpp
+--- qgo-1.5.4_p20100322.orig/src/network/cyberoroconnection.cpp        2010-02-26 19:43:41.000000000 +0100
++++ qgo-1.5.4_p20100322/src/network/cyberoroconnection.cpp     2017-10-02 20:33:32.661506058 +0200
+@@ -534,7 +534,7 @@
+       }
+       
+       // this is the initial packet
+-      char packet[8] = { 0x0a, 0xfa, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00 };
++      unsigned char packet[8] = { 0x0a, 0xfa, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00 };
+       if(write((const char *)packet, 8) < 0)
+               qWarning("*** failed sending init packet to reconnected host");
+       return 0;

diff --git a/games-board/qgo/qgo-1.5.4_p20100322-r1.ebuild b/games-board/qgo/qgo-1.5.4_p20100322-r1.ebuild
index fa8cca440e9a8d9aa4daae9090d842064283c7ea..7c65e182f4709d85fe643f3be47f23c762400d96 100644 (file)
--- a/games-board/qgo/qgo-1.5.4_p20100322-r1.ebuild
+++ b/games-board/qgo/qgo-1.5.4_p20100322-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,7 @@ PATCHES=(
        "${FILESDIR}"/${P}-gcc45.patch
        "${FILESDIR}"/${P}-qt47.patch
        "${FILESDIR}"/${P}-buffer.patch
+       "${FILESDIR}"/${P}-gcc6.patch
 )
 
 src_prepare() {

diff --git a/games-board/qgo/qgo-1.5.4_p20100322.ebuild b/games-board/qgo/qgo-1.5.4_p20100322.ebuild
index 26945ecb19f698b7a44a4af231d7e4cf0ef6f40f..e0a6618cbb4abaac38188009d49ac9c37d62fed4 100644 (file)
--- a/games-board/qgo/qgo-1.5.4_p20100322.ebuild
+++ b/games-board/qgo/qgo-1.5.4_p20100322.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -33,7 +33,8 @@ src_prepare() {
        epatch \
                "${FILESDIR}"/${P}-gcc45.patch \
                "${FILESDIR}"/${P}-qt47.patch \
-               "${FILESDIR}"/${P}-buffer.patch
+               "${FILESDIR}"/${P}-buffer.patch \
+               "${FILESDIR}"/${P}-gcc6.patch
 }
 
 src_configure() {