From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 59860139694 for ; Sun, 23 Jul 2017 12:32:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6EF81FC041; Sun, 23 Jul 2017 12:32:41 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 82F091FC041 for ; Sun, 23 Jul 2017 12:32:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8C823341871 for ; Sun, 23 Jul 2017 12:32:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0146374A5 for ; Sun, 23 Jul 2017 12:32:39 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1500813150.971bbd8c85e82b4538338f5a5919d6ee5f4776d1.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-roguelike/scourge/, games-roguelike/scourge/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-roguelike/scourge/files/scourge-0.21.1-gcc6.patch games-roguelike/scourge/scourge-0.21.1-r1.ebuild X-VCS-Directories: games-roguelike/scourge/ games-roguelike/scourge/files/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 971bbd8c85e82b4538338f5a5919d6ee5f4776d1 X-VCS-Branch: master Date: Sun, 23 Jul 2017 12:32:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 06330d1c-1c5b-46b9-bc39-9c362ee076b0 X-Archives-Hash: ece1a2db7920129eaf83820283267e6b commit: 971bbd8c85e82b4538338f5a5919d6ee5f4776d1 Author: Peter Levine gmail com> AuthorDate: Sun Jul 23 07:17:15 2017 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sun Jul 23 12:32:30 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=971bbd8c games-roguelike/scourge: Fix building with GCC-6 Bug: https://bugs.gentoo.org/show_bug.cgi?id=610492 Package-Manager: Portage-2.3.6, Repoman-2.3.2 .../scourge/files/scourge-0.21.1-gcc6.patch | 34 ++++++++++++++++++++++ games-roguelike/scourge/scourge-0.21.1-r1.ebuild | 3 +- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/games-roguelike/scourge/files/scourge-0.21.1-gcc6.patch b/games-roguelike/scourge/files/scourge-0.21.1-gcc6.patch new file mode 100644 index 00000000000..fed15f45ed7 --- /dev/null +++ b/games-roguelike/scourge/files/scourge-0.21.1-gcc6.patch @@ -0,0 +1,34 @@ +Bug: https://bugs.gentoo.org/610492 +Upstream ticket: https://sourceforge.net/p/scourge/patches/3/ + +--- a/src/equip.cpp ++++ b/src/equip.cpp +@@ -595,7 +595,7 @@ + } + } + if ( !found ) { +- specialSkill = false; ++ specialSkill = NULL; + canvas->setTooltip( "" ); + } + glDisable( GL_BLEND ); +--- a/src/render/map.cpp ++++ b/src/render/map.cpp +@@ -3154,7 +3154,7 @@ + if ( shape ) + return shape; + } +- return false; ++ return NULL; + } + if ( y1 == y2 ) { + if ( x1 > x2 ) SWAP( x1, x2 ); +@@ -3163,7 +3163,7 @@ + if ( shape ) + return shape; + } +- return false; ++ return NULL; + } + + diff --git a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild index db3edafb19a..6f23afbb419 100644 --- a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild +++ b/games-roguelike/scourge/scourge-0.21.1-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 @@ -31,6 +31,7 @@ S=${WORKDIR}/${PN} PATCHES=( "${FILESDIR}"/${P}-gcc47.patch + "${FILESDIR}"/${P}-gcc6.patch "${FILESDIR}"/${P}-automake-1.13.patch )