diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-09-25 20:21:45 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-09-25 20:21:45 +0100 |
| commit | c719fdcee603a5a706a45d10cb598762d56a727d (patch) | |
| tree | 620cbf137661399a3fb1eff92914204f9a970713 /games-puzzle/amoebax | |
| parent | cc4618c9ba3d974948ebf340b542d8cb01db2f55 (diff) | |
gentoo resync : 25.09.2021
Diffstat (limited to 'games-puzzle/amoebax')
| -rw-r--r-- | games-puzzle/amoebax/Manifest | 3 | ||||
| -rw-r--r-- | games-puzzle/amoebax/amoebax-0.2.1-r2.ebuild | 32 | ||||
| -rw-r--r-- | games-puzzle/amoebax/files/amoebax-0.2.1-clang.patch | 14 |
3 files changed, 32 insertions, 17 deletions
diff --git a/games-puzzle/amoebax/Manifest b/games-puzzle/amoebax/Manifest index ff4a08c99127..71c2bd95da65 100644 --- a/games-puzzle/amoebax/Manifest +++ b/games-puzzle/amoebax/Manifest @@ -1,5 +1,6 @@ AUX amoebax-0.2.1-aclocal.patch 1536 BLAKE2B bb83bfc7e254ca1f649a735121ba8f9bc71abe35c7c935083d50682ee7cbd77b6eeb5f87ac35b5235f46d5abf8b0a995796548401ed2b943b3acf374bd6e18d9 SHA512 f5f501b0bbe76902c65d404e7aebf830d84c329cf8d84ee5c769660bb4a30cbfbae9a0e16eb2697bd693de77ef38811ac52e68fe799add00b97292c2e79a2d27 +AUX amoebax-0.2.1-clang.patch 628 BLAKE2B d9f8f0430d1496d171a8f02d6f574633acd76f4dc452305e2ec860268b3228d2231ee057f9de946f94be59b8d58af79fe0c2c43205bc520dddd50f2ef2a5765e SHA512 2b8611f901da7fd23e6f8511883fae6e3c072fe5f68a6bde988185419781e534544e3f0d3b1cc9550e5901155eaad1939af43e31bbab0c9c0a66807d49021699 AUX amoebax-0.2.1-compile.patch 227 BLAKE2B de56259f5d58fd3509b2fe2b6d51e7ecd3bdebee4196d03ca3529a24e10123f005529b6e0e9fb434a45c7a8caaaf8197ce9e730276bd3631ad5e3c1b47df2ffc SHA512 fe6b2b3b7d61f5548fc9959dce491e25cdf51313bc46141615e3ea5e96edff34084ac8294b0b8ddace6dc6a374a02cd173e3a4308cb9d56018535f62dfa6defe DIST amoebax-0.2.1.tar.bz2 10645579 BLAKE2B 0e8f5d5bb92dd20444bfcb735fdc28142bc359676e057471089b94a6df8a8b45cdecdb1462022909f025310fbc9da1946a50a4d716aa75e34ffc71b4fbc8cfbe SHA512 f8cd20cb35e2456487f55ebc89411ebd47b25cf549d35c36041a27e1d96ef30702151f303dbb457afbf8583f67c53143c30becdea00a26fddad20555e0c7d181 -EBUILD amoebax-0.2.1-r2.ebuild 940 BLAKE2B 0f35ed57c3ee00d4332bfb824ed17a2d1e52e5eb353b8e4f88c317ab4f758cf1510e12040f678c4680f63e796d040510cc30db93450091c87a20ddb619db948a SHA512 91fcaabdada0a4157f9732f00fe8c5c60de7c95676825cc2d239c021aff2e1ccdfe2c5b2661ac04a461b8a3c4fe4b22466394e9b29eacc7dedd3995495dcda79 +EBUILD amoebax-0.2.1-r2.ebuild 831 BLAKE2B 78bb10d93160888539154b8a887e5749c0f1946822bc850af7f7cb0553149db19db711289b257f0baf138ec32f075f4e7c22803c152518172a90881c04dd01f4 SHA512 9c1889f054ec6dd8e828823f1099ef81a4798c9089caa3047962a59704b0b1e25d4d575d15e833afb2cfb25a63e970b1168559551649858c6977450955282c21 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610 diff --git a/games-puzzle/amoebax/amoebax-0.2.1-r2.ebuild b/games-puzzle/amoebax/amoebax-0.2.1-r2.ebuild index a0b1fdd1e35a..8a53eb31d761 100644 --- a/games-puzzle/amoebax/amoebax-0.2.1-r2.ebuild +++ b/games-puzzle/amoebax/amoebax-0.2.1-r2.ebuild @@ -1,40 +1,40 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit autotools -DESCRIPTION="A cute and addictive action-puzzle game, similar to tetris" -HOMEPAGE="http://www.emma-soft.com/games/amoebax/" -SRC_URI="http://www.emma-soft.com/games/amoebax/download/${P}.tar.bz2" +DESCRIPTION="Cute and addictive action-puzzle game, similar to tetris" +HOMEPAGE="https://www.emma-soft.com/games/amoebax/" +SRC_URI="https://www.emma-soft.com/games/amoebax/download/${P}.tar.bz2" LICENSE="Free-Art-1.2 GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -DEPEND="media-libs/libsdl[sound,joystick,video] +DEPEND=" + media-libs/libsdl[sound,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis]" -RDEPEND=${DEPEND} +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-aclocal.patch + "${FILESDIR}"/${P}-clang.patch + "${FILESDIR}"/${P}-compile.patch +) src_prepare() { default - eapply \ - "${FILESDIR}"/${P}-aclocal.patch \ - "${FILESDIR}"/${P}-compile.patch - sed -i \ - -e "/^SUBDIRS/s:doc ::" \ + -e "/^SUBDIRS/s|doc ||" \ Makefile.am || die sed -i \ - -e "/^iconsdir/s:=.*:=/usr/share/pixmaps:" \ - -e "/^desktopdir/s:=.*:=/usr/share/applications:" \ - data/Makefile.am || die - sed -i \ -e '/Encoding/d' \ -e '/Icon/s/.svg//' \ data/amoebax.desktop || die + AT_M4DIR=m4 eautoreconf } diff --git a/games-puzzle/amoebax/files/amoebax-0.2.1-clang.patch b/games-puzzle/amoebax/files/amoebax-0.2.1-clang.patch new file mode 100644 index 000000000000..b649640691bf --- /dev/null +++ b/games-puzzle/amoebax/files/amoebax-0.2.1-clang.patch @@ -0,0 +1,14 @@ +Fixes building with clang: +Gentoo-Bug: https://bugs.gentoo.org/739286 + +--- a/src/NewHighScoreState.cxx ++++ b/src/NewHighScoreState.cxx +@@ -396,7 +396,7 @@ NewHighScoreState::unicodeCharacterPress + // FIXME: We are only interessted with ASCII values. + if ( 0 == (code & 0xff80) ) + { +- char character[2] = {toupper (static_cast<char>(code & 0x7f)), '\0'}; ++ char character[2] = {static_cast<char>(toupper (static_cast<char>(code & 0x7f)), '\0')}; + std::string::size_type characterPos = + m_CursorValues.find (std::string (character)); + if ( std::string::npos != characterPos ) |