diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-07-09 15:43:36 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-09 15:43:36 +0100 |
| commit | 2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch) | |
| tree | 8c816148bcbd22757d892089c989ae614eae4f5a /games-rpg/manaplus | |
| parent | 0f558761aa2dee1017b4751e4017205e015a9560 (diff) | |
gentoo resync : 09.07.2022
Diffstat (limited to 'games-rpg/manaplus')
| -rw-r--r-- | games-rpg/manaplus/Manifest | 5 | ||||
| -rw-r--r-- | games-rpg/manaplus/files/manaplus-1.9.3.23-gcc12-time.patch | 26 | ||||
| -rw-r--r-- | games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild | 8 | ||||
| -rw-r--r-- | games-rpg/manaplus/manaplus-9999.ebuild | 4 |
4 files changed, 37 insertions, 6 deletions
diff --git a/games-rpg/manaplus/Manifest b/games-rpg/manaplus/Manifest index 9426da20ea21..fbe5340c84db 100644 --- a/games-rpg/manaplus/Manifest +++ b/games-rpg/manaplus/Manifest @@ -1,4 +1,5 @@ +AUX manaplus-1.9.3.23-gcc12-time.patch 516 BLAKE2B a0cb41a3fa6e12ea557bd19af336f41fcfb31e374088124a87ce10e092cfc7f0ceb5c7e3be483f86fe76f13c1d78398337fd6f85eb431ab8e20cf92d775c558d SHA512 ddfe951a830a0b320e62a418ae5492044390e8c750d8e125d518f375aa7f79c976160e4cd03303a0033b72a501d62cc5e40f1f7c12670fc67e9a09e71854d885 DIST manaplus-1.9.3.23.tar.xz 15051860 BLAKE2B 6019799f13df0531ffcf662068f3dc85d31193a8db9fe6fa82b0c1c5740c527685efae822b800ca1836ec3ca00405f07ff368ecd3e0932465762e5f9efda7516 SHA512 0e74df08b4e18a826711c090e3ddf38da1b348c34acc1aff675c1f6c4dc523723a07b2b00d135a89ef136f11fe03f0dfc41e5830f0d6c34d5d44eb1414a2d361 -EBUILD manaplus-1.9.3.23-r1.ebuild 3040 BLAKE2B 32f452d1cc17a32764795e0dcb90de18d58758cf70ce0c4f6159fc4ef2b90a77335d3376a3f837260021e30cb75464ac18fa740ea492b0785ce7fc43adfc7310 SHA512 2fc46633da8711a484e8ef2836b8e86e954f82706ef7f8d010ef58f05def2466ec24d0483ee12f0f19b20712e989d54cbe785eabbc1150c6351f6ebd1461bb15 -EBUILD manaplus-9999.ebuild 3040 BLAKE2B 32f452d1cc17a32764795e0dcb90de18d58758cf70ce0c4f6159fc4ef2b90a77335d3376a3f837260021e30cb75464ac18fa740ea492b0785ce7fc43adfc7310 SHA512 2fc46633da8711a484e8ef2836b8e86e954f82706ef7f8d010ef58f05def2466ec24d0483ee12f0f19b20712e989d54cbe785eabbc1150c6351f6ebd1461bb15 +EBUILD manaplus-1.9.3.23-r1.ebuild 3097 BLAKE2B 83f13a85a369a15fb822305848713dc49232f6137bba627db012488a41a975a736505f5d4c0f193c19f69058ba43d88873ed7a2e864c1c6d027e326a63f3468e SHA512 7c2e6060aa6fdfe894e533a443c4710bdfe348e8fa7b56ab444e4b59ba2dfa714d222e7293876ac89f617a2e5a5381989318253eea70ae83b103605febb93b42 +EBUILD manaplus-9999.ebuild 3037 BLAKE2B 6c98b953e8337595921075f8cc70c40a54a6a3c415e6665efd17522aef1ad75d8a4822e54eddd7bed76904c2cf1c595cd521dde495e82677dfd0b585237a59a6 SHA512 43de8bb443ff96a535cf86c5a03992872fc0f40d49c41c36137dcfcb3f952c311811135a19a45cd4b3f9c18cfa4b0a0e28e54dac5a4288955d59e839662735a8 MISC metadata.xml 584 BLAKE2B 8a3a7aded808b8593f7433cc35bcdd676fc4240270df11a58ae92c80c56e97a8e9de9a3d1adb0ad112bc04360719cedfbb6ca66e498a30ba03af4be05c2224ff SHA512 cd328ace8a351048ab3be7120c8890bfeabaa554dcb6da59c4df7061b3faa0587f4256e3fa06e65f754bcdc20a33c5417f14990f8bc4d2f99e82394a4eeaeb6b diff --git a/games-rpg/manaplus/files/manaplus-1.9.3.23-gcc12-time.patch b/games-rpg/manaplus/files/manaplus-1.9.3.23-gcc12-time.patch new file mode 100644 index 000000000000..f8f4030f0b6a --- /dev/null +++ b/games-rpg/manaplus/files/manaplus-1.9.3.23-gcc12-time.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/855212 +https://bugs.gentoo.org/855455 +--- a/src/resources/wallpaper.cpp ++++ b/src/resources/wallpaper.cpp +@@ -38,9 +38,7 @@ + #include <sys/time.h> + #endif // WIN32 + +-#ifdef __clang__ + #include <ctime> +-#endif // __clang__ + + #include "debug.h" + +--- a/src/progs/dyecmd/client.cpp ++++ b/src/progs/dyecmd/client.cpp +@@ -87,9 +87,7 @@ PRAGMA48(GCC diagnostic pop) + #undef ERROR + #endif // WIN32 + +-#ifdef __clang__ + #include <ctime> +-#endif // __clang__ + + #ifdef ANDROID + #ifndef USE_SDL2 diff --git a/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild b/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild index c93acd1164d1..f481e1cd9b21 100644 --- a/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild +++ b/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -30,7 +30,7 @@ RDEPEND=" x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils - mumble? ( media-sound/mumble ) + mumble? ( net-voip/mumble ) nls? ( virtual/libintl ) opengl? ( virtual/opengl ) pugixml? ( dev-libs/pugixml ) @@ -55,6 +55,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig nls? ( sys-devel/gettext )" +PATCHES=( + "${FILESDIR}"/${PN}-1.9.3.23-gcc12-time.patch +) + src_prepare() { default diff --git a/games-rpg/manaplus/manaplus-9999.ebuild b/games-rpg/manaplus/manaplus-9999.ebuild index c93acd1164d1..6c1d04cbb663 100644 --- a/games-rpg/manaplus/manaplus-9999.ebuild +++ b/games-rpg/manaplus/manaplus-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -30,7 +30,7 @@ RDEPEND=" x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils - mumble? ( media-sound/mumble ) + mumble? ( net-voip/mumble ) nls? ( virtual/libintl ) opengl? ( virtual/opengl ) pugixml? ( dev-libs/pugixml ) |