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 17B321580B1 for ; Tue, 31 Aug 2021 08:12:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 660B5E093D; Tue, 31 Aug 2021 08:12:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 4BC85E093D for ; Tue, 31 Aug 2021 08:12:07 +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 4C066340B10 for ; Tue, 31 Aug 2021 08:12:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9CABA7A for ; Tue, 31 Aug 2021 08:12:04 +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: <1630397512.9f145ea15cb30f7ce44772895cc03da3aa0c089b.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-int16.patch games-arcade/fishsupper/fishsupper-0.1.6-r2.ebuild games-arcade/fishsupper/fishsupper-0.1.6-r3.ebuild X-VCS-Directories: games-arcade/fishsupper/ games-arcade/fishsupper/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 9f145ea15cb30f7ce44772895cc03da3aa0c089b X-VCS-Branch: master Date: Tue, 31 Aug 2021 08:12:04 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cd98c80e-05e7-4d87-8a37-f62dfdd79b28 X-Archives-Hash: cb65b85199be72e2166fca6702234a46 commit: 9f145ea15cb30f7ce44772895cc03da3aa0c089b Author: Alexey Sokolov asokolov org> AuthorDate: Tue Aug 31 08:11:52 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Tue Aug 31 08:11:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f145ea1 games-arcade/fishsupper: fix build, bump EAPI Closes: https://github.com/gentoo/gentoo/pull/22160 Closes: https://bugs.gentoo.org/739090 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Alexey Sokolov asokolov.org> Signed-off-by: David Seifert gentoo.org> games-arcade/fishsupper/files/fishsupper-0.1.6-int16.patch | 14 ++++++++++++++ ...shsupper-0.1.6-r2.ebuild => fishsupper-0.1.6-r3.ebuild} | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/games-arcade/fishsupper/files/fishsupper-0.1.6-int16.patch b/games-arcade/fishsupper/files/fishsupper-0.1.6-int16.patch new file mode 100644 index 00000000000..3e4f6edbf63 --- /dev/null +++ b/games-arcade/fishsupper/files/fishsupper-0.1.6-int16.patch @@ -0,0 +1,14 @@ +Fix build with clang +https://bugs.gentoo.org/739090 + +--- a/src/SFont_gl.cpp ++++ b/src/SFont_gl.cpp +@@ -223,7 +223,7 @@ void Mafferyew::SFont_gl::create_font_char(SDL_Surface* image, + 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000); + #endif + +- SDL_Rect src_rect = { begin_x, 1, font_char_w, font_height }; ++ SDL_Rect src_rect = { (Sint16)begin_x, 1, (Uint16)font_char_w, (Uint16)font_height }; + SDL_BlitSurface(image, &src_rect, converted, 0); + + GLuint texture; diff --git a/games-arcade/fishsupper/fishsupper-0.1.6-r2.ebuild b/games-arcade/fishsupper/fishsupper-0.1.6-r3.ebuild similarity index 95% rename from games-arcade/fishsupper/fishsupper-0.1.6-r2.ebuild rename to games-arcade/fishsupper/fishsupper-0.1.6-r3.ebuild index 1ffdfa94712..09a8ec5b5f2 100644 --- a/games-arcade/fishsupper/fishsupper-0.1.6-r2.ebuild +++ b/games-arcade/fishsupper/fishsupper-0.1.6-r3.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools desktop @@ -27,6 +27,7 @@ PATCHES=( "${FILESDIR}"/${P}-ovflfix.patch "${FILESDIR}"/${P}-asneeded.patch "${FILESDIR}"/${P}-gcc6.patch + "${FILESDIR}"/${P}-int16.patch ) src_prepare() {