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 13018139694 for ; Sun, 30 Jul 2017 09:10:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C19BF1FC1AC; Sun, 30 Jul 2017 09:10:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 978E51FC1B1 for ; Sun, 30 Jul 2017 09:10:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 7A44D34187A for ; Sun, 30 Jul 2017 09:10:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5707674CE for ; Sun, 30 Jul 2017 09:10:07 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1501405772.be927cf2c7807684a49dd9790b738154d914bb33.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-arcade/fishsupper/, games-arcade/fishsupper/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-arcade/fishsupper/files/fishsupper-0.1.6-gcc6.patch games-arcade/fishsupper/fishsupper-0.1.6.ebuild X-VCS-Directories: games-arcade/fishsupper/ games-arcade/fishsupper/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: be927cf2c7807684a49dd9790b738154d914bb33 X-VCS-Branch: master Date: Sun, 30 Jul 2017 09:10:07 +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: d0a244f7-df6b-4ce5-b2f9-51bf01e1ba34 X-Archives-Hash: 8fde0096d619aa4c9b464a85e4408ff3 commit: be927cf2c7807684a49dd9790b738154d914bb33 Author: Peter Levine gmail com> AuthorDate: Sun Jul 23 02:27:54 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Jul 30 09:09:32 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be927cf2 games-arcade/fishsupper: Fix building with GCC-6 Bug: https://bugs.gentoo.org/show_bug.cgi?id=610660 Package-Manager: Portage-2.3.6, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/5180 .../fishsupper/files/fishsupper-0.1.6-gcc6.patch | 49 ++++++++++++++++++++++ games-arcade/fishsupper/fishsupper-0.1.6.ebuild | 5 ++- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/games-arcade/fishsupper/files/fishsupper-0.1.6-gcc6.patch b/games-arcade/fishsupper/files/fishsupper-0.1.6-gcc6.patch new file mode 100644 index 00000000000..3ca63cb4a68 --- /dev/null +++ b/games-arcade/fishsupper/files/fishsupper-0.1.6-gcc6.patch @@ -0,0 +1,49 @@ +Bug: https://bugs.gentoo.org/610660 + +--- a/src/Settings_screen.cpp ++++ b/src/Settings_screen.cpp +@@ -217,3 +217,7 @@ + + // ************************************************** + ++const float FS::Settings_screen::bold = 1.0; ++const float FS::Settings_screen::faded = 0.2; ++ ++// ************************************************** +--- a/src/Settings_screen.h ++++ b/src/Settings_screen.h +@@ -71,8 +71,8 @@ + static const int tick1_x = 252; + static const int tick_y_offset = 33; + static const int sprite_texture_start = FS_gfx::JOYSTICK; +- static const float bold = 1.0; +- static const float faded = 0.2; ++ static const float bold; ++ static const float faded; + + Settings* settings_ptr; + int current_option; +--- a/src/Star_particle_system.cpp ++++ b/src/Star_particle_system.cpp +@@ -137,6 +137,10 @@ + } // FS::Star_particle_system::launch_new_star + + // ************************************************** ++ ++const float FS::Star_particle_system::lifespan = 1500.0; ++ ++// ************************************************** + // ************************************************** + // ************************************************** + // ************************************************** +--- a/src/Star_particle_system.h ++++ b/src/Star_particle_system.h +@@ -77,7 +77,7 @@ + static const int STAR_WIDTH = 30; + static const int STAR_HEIGHT = 30; + // This is a float so that we get floating-point division in update. +- static const float lifespan = 1500.0; // in ms ++ static const float lifespan; // in ms + + // A particle is basically a lightweight sprite. + // Unlike a usual sprite, we don't need to worry about diff --git a/games-arcade/fishsupper/fishsupper-0.1.6.ebuild b/games-arcade/fishsupper/fishsupper-0.1.6.ebuild index ab2a7c88615..f8bd06bcde9 100644 --- a/games-arcade/fishsupper/fishsupper-0.1.6.ebuild +++ b/games-arcade/fishsupper/fishsupper-0.1.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -22,7 +22,8 @@ DEPEND="${RDEPEND} src_prepare() { epatch "${FILESDIR}"/${P}-ovflfix.patch \ - "${FILESDIR}"/${P}-asneeded.patch + "${FILESDIR}"/${P}-asneeded.patch \ + "${FILESDIR}"/${P}-gcc6.patch eautoreconf }