Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/
Date: Sat, 07 May 2022 10:54:42
Message-Id: 1651920863.35788251d79b5b511dab4ebd05c4da3377e92b33.soap@gentoo
1 commit: 35788251d79b5b511dab4ebd05c4da3377e92b33
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 7 10:54:23 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat May 7 10:54:23 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35788251
7
8 games-arcade/supertux: fix GCC 12 build
9
10 Closes: https://bugs.gentoo.org/840269
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 .../supertux/files/supertux-0.6.3-missing-include.patch | 10 ++++++++++
14 games-arcade/supertux/supertux-0.6.3.ebuild | 10 ++++------
15 2 files changed, 14 insertions(+), 6 deletions(-)
16
17 diff --git a/games-arcade/supertux/files/supertux-0.6.3-missing-include.patch b/games-arcade/supertux/files/supertux-0.6.3-missing-include.patch
18 new file mode 100644
19 index 000000000000..4515c9a6003f
20 --- /dev/null
21 +++ b/games-arcade/supertux/files/supertux-0.6.3-missing-include.patch
22 @@ -0,0 +1,10 @@
23 +--- a/external/partio_zip/zip_manager.hpp
24 ++++ b/external/partio_zip/zip_manager.hpp
25 +@@ -41,6 +41,7 @@
26 + #ifndef __ZIP__
27 + #define __ZIP__
28 +
29 ++#include <memory>
30 + #include <fstream>
31 + #include <iostream>
32 + #include <map>
33
34 diff --git a/games-arcade/supertux/supertux-0.6.3.ebuild b/games-arcade/supertux/supertux-0.6.3.ebuild
35 index 0a9fb27d74ef..173ea4e074c1 100644
36 --- a/games-arcade/supertux/supertux-0.6.3.ebuild
37 +++ b/games-arcade/supertux/supertux-0.6.3.ebuild
38 @@ -1,10 +1,10 @@
39 -# Copyright 1999-2021 Gentoo Authors
40 +# Copyright 1999-2022 Gentoo Authors
41 # Distributed under the terms of the GNU General Public License v2
42
43 EAPI=8
44
45 #: ${CMAKE_MAKEFILE_GENERATOR:=emake}
46 -inherit cmake flag-o-matic
47 +inherit cmake
48
49 MY_PV="${PV/_rc/-rc.}"
50 MY_P="SuperTux-v${MY_PV}-Source"
51 @@ -12,6 +12,7 @@ MY_P="SuperTux-v${MY_PV}-Source"
52 DESCRIPTION="A game similar to Super Mario Bros"
53 HOMEPAGE="https://supertux.org/"
54 SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
55 +S="${WORKDIR}/${MY_P}"
56
57 LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
58 SLOT="0"
59 @@ -41,16 +42,13 @@ BDEPEND="
60 virtual/pkgconfig
61 "
62
63 -S="${WORKDIR}/${MY_P}"
64 -
65 PATCHES=(
66 "${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
67 "${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
68 + "${FILESDIR}"/${PN}-0.6.3-missing-include.patch
69 )
70
71 src_configure() {
72 - append-cxxflags -std=c++11
73 -
74 local mycmakeargs=(
75 -DWERROR=OFF
76 -DINSTALL_SUBDIR_BIN=bin