diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-04 22:28:33 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-04 22:28:33 +0100 |
| commit | a978c074e4272bb901fbe4a10de0a7b2af574f17 (patch) | |
| tree | 8c764c1cc0576389ce22abd317bceba71ea5732d /games-arcade/holotz-castle | |
| parent | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff) | |
gentoo resync : 04.05.2021
Diffstat (limited to 'games-arcade/holotz-castle')
| -rw-r--r-- | games-arcade/holotz-castle/Manifest | 3 | ||||
| -rw-r--r-- | games-arcade/holotz-castle/files/holotz-castle-1.3.14-gcc-11.patch | 30 | ||||
| -rw-r--r-- | games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild | 7 |
3 files changed, 36 insertions, 4 deletions
diff --git a/games-arcade/holotz-castle/Manifest b/games-arcade/holotz-castle/Manifest index 61fa0df300c8..f4c57eb2aa87 100644 --- a/games-arcade/holotz-castle/Manifest +++ b/games-arcade/holotz-castle/Manifest @@ -1,6 +1,7 @@ AUX holotz-castle-1.3.14-build.patch 2278 BLAKE2B 1fc9e92fcbce33277a9535becb700d8159db7dd66581efe87ed272399b67c704535422c6d3484d3e7480cb1934aaf5dd2704e401d9a867867817c02827ac540a SHA512 fd19155ff5f372306b987a4998b0ef9a3ae194bdc75c99d5f276cae50910fef5998dfd244c6ca4cae0b33741334d072876bff7710fabf365712531502345d101 +AUX holotz-castle-1.3.14-gcc-11.patch 679 BLAKE2B 22de663f4fef24146be4a5f102e507f45a92e5f5280c5a6b298878852704f212eccddbdc4c867f711cc97ed946a6eef0bacc04f7fd2147037505bb2b922f25e5 SHA512 77a7c5bcafcba9ce3e9466bb12414f80ce24185bdb1e10d79cb31f2a509f49ac03661eecfed2520425ffa98e266a449c1d8d7e418812979a1ba25aa70f0734eb AUX holotz-castle-1.3.14-gcc44.patch 292 BLAKE2B 9a287237f52ef832839280134263a10c95752bdd131dc9340c1b2731c844f1af9e40785f1219816d1ac5bbdfde1e58013de8c960c3db400c50ab23a17bcdeece SHA512 89ea8aa06c23adc21a88031f02da88476e086ab9ee3147bee1a545cbc6a9b631de2d8b504b0b1b3081a3a62c11df7720ac124ceda788518937652f2ca5a2a118 AUX holotz-castle-1.3.14-underlink.patch 540 BLAKE2B 443ee944d5f92d81fca16dd7d1ed450edb1e8bc9f93e97fc89dc40b30c8e99dcbd7035b20a11868c9575e3af3304369086c07dcbf012a4bc5d4c6cebca298705 SHA512 29d01cd2404018def02cc7bc44afb9752f7b6fe58f1f8dcf01ce6d41865eae663e26fa159206f55a1d70320aaf5a1556012c0fd0199fdb001f9257571b93d46d DIST holotz-castle-1.3.14-src.tar.gz 3691364 BLAKE2B 82ec9336410634d5649eaabe55f69b4cce94d983b1713aa2e7472cec59cd7c1b843a4512a2e11b79c74cc869d96259ea9e21e4bd6d88ddbeeaf8437b63ab13b8 SHA512 129f15a51b13bc80ca068b1ec18cc4ae8bb5b80f11f852b81bff4492dab5bf4edbae714fcaafb197cdedf2b079070ab2f8750790b0b1680204ee7520f1d74576 -EBUILD holotz-castle-1.3.14-r1.ebuild 1157 BLAKE2B 09579ecdefcdab731b4002fe3421f8da07d4624017bf8be63400eedb35aceebb80d45341b210fd1cee18ae073221fb9acf4333f2933a473b0d365da1686df5ff SHA512 dc67b5ad93ae62a8f93084b72a64905a10555f6672a5af2dc19f3c5c802ced5e6b968daf35585119dfc454049f1be053ccf6285b4bbc8ce8eb7fffc0d6a26283 +EBUILD holotz-castle-1.3.14-r1.ebuild 1191 BLAKE2B c550862dd39ceb2c5b2715a3ff30ded223f4ac6eb8c895df9af3cf84a171475ec3aa024685fdf571aa488c3ab2a1142ee32111eb12d87dab77a5081a0d90ddea SHA512 752c53c504d9a937ab45c81c8891e98f2afd24572fadf3d47432b2d2d674cf64b8ae51ac906a3cbb32db79e308f6ebe084b5e9ef155697ad001221188d17dd74 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-arcade/holotz-castle/files/holotz-castle-1.3.14-gcc-11.patch b/games-arcade/holotz-castle/files/holotz-castle-1.3.14-gcc-11.patch new file mode 100644 index 000000000000..311c352731d8 --- /dev/null +++ b/games-arcade/holotz-castle/files/holotz-castle-1.3.14-gcc-11.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/739092 +--- a/JLib/JLib/Util/JTextFile.cpp ++++ b/JLib/JLib/Util/JTextFile.cpp +@@ -145,7 +145,7 @@ bool JTextFile::FindNext(const s8 *str, bool jump) + + tmp = strstr(ptr, str); + +- if (tmp > 0) ++ if (tmp) + ptr = tmp; + else + { +@@ -153,7 +153,7 @@ bool JTextFile::FindNext(const s8 *str, bool jump) + { + tmp = strstr(buff, str); + +- if (tmp > 0) ++ if (tmp) + ptr = tmp; + else + return false; +@@ -233,7 +233,7 @@ bool JTextFile::ReadQuotedWord(s8 *str) + ++ptr; + end = ptr; + +- if (0 >= (end = strstr(ptr, "\""))) ++ if ((end = strstr(ptr, "\"")) == NULL) + { + // No hay comillas de cierre + ptr = org; diff --git a/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild b/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild index 16ed5d364bad..6b5db838ab75 100644 --- a/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild +++ b/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit desktop toolchain-funcs DESCRIPTION="2D platform game" @@ -29,10 +29,11 @@ PATCHES=( "${FILESDIR}"/${P}-build.patch "${FILESDIR}"/${P}-gcc44.patch "${FILESDIR}"/${P}-underlink.patch + "${FILESDIR}"/${P}-gcc-11.patch ) src_compile() { - tc-export AR + tc-export AR CXX emake -C JLib emake -C src HC_BASE=/usr/share/${PN}/ } |