| 1 |
commit: fe21daa00cecd075617683145692cde6319c6654 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 2 18:37:37 2017 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 2 18:38:11 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe21daa0 |
| 7 |
|
| 8 |
games-board/qgo: Fix narrowing conversion error, bug 598406 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/598406 |
| 11 |
Package-Manager: Portage-2.3.10, Repoman-2.3.3 |
| 12 |
|
| 13 |
games-board/qgo/files/qgo-1.5.4_p20100322-gcc6.patch | 12 ++++++++++++ |
| 14 |
games-board/qgo/qgo-1.5.4_p20100322-r1.ebuild | 3 ++- |
| 15 |
games-board/qgo/qgo-1.5.4_p20100322.ebuild | 5 +++-- |
| 16 |
3 files changed, 17 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..52b4ec2faaf |
| 21 |
--- /dev/null |
| 22 |
+++ b/games-board/qgo/files/qgo-1.5.4_p20100322-gcc6.patch |
| 23 |
@@ -0,0 +1,12 @@ |
| 24 |
+diff -ruN qgo-1.5.4_p20100322.orig/src/network/cyberoroconnection.cpp qgo-1.5.4_p20100322/src/network/cyberoroconnection.cpp |
| 25 |
+--- qgo-1.5.4_p20100322.orig/src/network/cyberoroconnection.cpp 2010-02-26 19:43:41.000000000 +0100 |
| 26 |
++++ qgo-1.5.4_p20100322/src/network/cyberoroconnection.cpp 2017-10-02 20:33:32.661506058 +0200 |
| 27 |
+@@ -534,7 +534,7 @@ |
| 28 |
+ } |
| 29 |
+ |
| 30 |
+ // this is the initial packet |
| 31 |
+- char packet[8] = { 0x0a, 0xfa, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00 }; |
| 32 |
++ unsigned char packet[8] = { 0x0a, 0xfa, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00 }; |
| 33 |
+ if(write((const char *)packet, 8) < 0) |
| 34 |
+ qWarning("*** failed sending init packet to reconnected host"); |
| 35 |
+ return 0; |
| 36 |
|
| 37 |
diff --git a/games-board/qgo/qgo-1.5.4_p20100322-r1.ebuild b/games-board/qgo/qgo-1.5.4_p20100322-r1.ebuild |
| 38 |
index fa8cca440e9..7c65e182f47 100644 |
| 39 |
--- a/games-board/qgo/qgo-1.5.4_p20100322-r1.ebuild |
| 40 |
+++ b/games-board/qgo/qgo-1.5.4_p20100322-r1.ebuild |
| 41 |
@@ -1,4 +1,4 @@ |
| 42 |
-# Copyright 1999-2016 Gentoo Foundation |
| 43 |
+# Copyright 1999-2017 Gentoo Foundation |
| 44 |
# Distributed under the terms of the GNU General Public License v2 |
| 45 |
|
| 46 |
EAPI=6 |
| 47 |
@@ -24,6 +24,7 @@ PATCHES=( |
| 48 |
"${FILESDIR}"/${P}-gcc45.patch |
| 49 |
"${FILESDIR}"/${P}-qt47.patch |
| 50 |
"${FILESDIR}"/${P}-buffer.patch |
| 51 |
+ "${FILESDIR}"/${P}-gcc6.patch |
| 52 |
) |
| 53 |
|
| 54 |
src_prepare() { |
| 55 |
|
| 56 |
diff --git a/games-board/qgo/qgo-1.5.4_p20100322.ebuild b/games-board/qgo/qgo-1.5.4_p20100322.ebuild |
| 57 |
index 26945ecb19f..e0a6618cbb4 100644 |
| 58 |
--- a/games-board/qgo/qgo-1.5.4_p20100322.ebuild |
| 59 |
+++ b/games-board/qgo/qgo-1.5.4_p20100322.ebuild |
| 60 |
@@ -1,4 +1,4 @@ |
| 61 |
-# Copyright 1999-2014 Gentoo Foundation |
| 62 |
+# Copyright 1999-2017 Gentoo Foundation |
| 63 |
# Distributed under the terms of the GNU General Public License v2 |
| 64 |
|
| 65 |
EAPI=5 |
| 66 |
@@ -33,7 +33,8 @@ src_prepare() { |
| 67 |
epatch \ |
| 68 |
"${FILESDIR}"/${P}-gcc45.patch \ |
| 69 |
"${FILESDIR}"/${P}-qt47.patch \ |
| 70 |
- "${FILESDIR}"/${P}-buffer.patch |
| 71 |
+ "${FILESDIR}"/${P}-buffer.patch \ |
| 72 |
+ "${FILESDIR}"/${P}-gcc6.patch |
| 73 |
} |
| 74 |
|
| 75 |
src_configure() { |
Archives