From 514d1bbe260df2521fe60f1a3ec87cfcfde1a829 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 17 Jul 2021 19:04:28 +0100 Subject: gentoo resync : 17.07.2021 --- games-puzzle/xlogical/Manifest | 12 ++-- .../xlogical/files/xlogical-1.0.7-gcc41.patch | 49 -------------- .../xlogical/files/xlogical-1.0.7-gcc43.patch | 51 -------------- .../xlogical/files/xlogical-1.0.8-gcc11.patch | 12 ++++ .../xlogical/files/xlogical-1.0.8-gcc4.3.patch | 36 ++++++++++ games-puzzle/xlogical/metadata.xml | 15 ++-- games-puzzle/xlogical/xlogical-1.0.7-r1.ebuild | 79 ---------------------- games-puzzle/xlogical/xlogical-1.0.8.ebuild | 61 +++++++++++++++++ 8 files changed, 119 insertions(+), 196 deletions(-) delete mode 100644 games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch delete mode 100644 games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch create mode 100644 games-puzzle/xlogical/files/xlogical-1.0.8-gcc11.patch create mode 100644 games-puzzle/xlogical/files/xlogical-1.0.8-gcc4.3.patch delete mode 100644 games-puzzle/xlogical/xlogical-1.0.7-r1.ebuild create mode 100644 games-puzzle/xlogical/xlogical-1.0.8.ebuild (limited to 'games-puzzle/xlogical') diff --git a/games-puzzle/xlogical/Manifest b/games-puzzle/xlogical/Manifest index dbc9cc26265d..c28459d74b24 100644 --- a/games-puzzle/xlogical/Manifest +++ b/games-puzzle/xlogical/Manifest @@ -1,6 +1,6 @@ -AUX xlogical-1.0.7-gcc41.patch 833 BLAKE2B 6a43b04affe9cc4cd9456d52b369636b68276e86a31644edec85aefb2771d6fed90108da86f2f9759329c77a53e2176979fad353c929ad7f99e30bfa5ba10f27 SHA512 aeb239382a019a7fd186030543231c29b260af3faeeda67da72a56b8a778ba5f70b16b6e1dbd3c04c1251816b91aae9c23d39dc877fd63e7ae7032431c02533d -AUX xlogical-1.0.7-gcc43.patch 935 BLAKE2B cea7455abc9c6c953c179984b43b124157320c7dc3e5b891940811bc5b3732acb592b914e64bedb2a93f8bce73f381cfecd8eb927bf2b88d18ea2dc698085fa2 SHA512 4a1c4e259cc798a5debe917ea4981f36f04d073ce33ed317008318a891fa5d68938e4b63e8c3166f31132251f2ed2696e46eb0799afbd808eace68c2895c0f96 -DIST xlogical-1.0-7.tar.bz2 1853575 BLAKE2B 6f78f92a14313cf65f171b99c28a4377f7685bf73705a91b92fcf370ad1f3555b7aefe99e6004aa32c62cf8b71f2d754d64acadf3bda345cc8cf3e3f91647d02 SHA512 b47aadff91a7d3057fe8657bdda5c16a910f84f6d324bee82f1beba55de7faf6a599231c8d53ed68cc30f9edfe18f57f31dfc9fe06b8e03fa6120905f37c290d -DIST xlogical_gfx.zip 347801 BLAKE2B b9c2f963e8ddc5af9fcd7adac691a71c6ee12bc3b3164ce243d076f85c36044b4aa523d27c5dd1480388ff97356ddabd3c7f2c4d223aeeff1a8660fc7c595995 SHA512 14322ae1c8fb7f50513ef47e05372c5dc1ec1b658b33c53477e6b05bbee1de0250b21127891f205d16adc386e7ce37c4b834a62794ee105754b97e49eb5d2a42 -EBUILD xlogical-1.0.7-r1.ebuild 1644 BLAKE2B 8e43a6cea8ade6ade4ee77a612e9df5c88856e69a4861833dad50ce9c1c3f0283841be9e3a83b711101aed79c2ed17805f9cb1d0561f572105dee460767cf6f5 SHA512 9b9e27d903513c632542dd5dffd8bfc416ea319688999b7f47a8a571be7363e375737b79cdcd618bcaca1c46a9c247c4b1b898632b28b499f2c3d312880b030e -MISC metadata.xml 554 BLAKE2B f7cc61f4cc79271b95e37334918f71934f91954f5a70d1601e817f6f134cd36117ed155b91a7929da537fcb7d423a627c1990c3c57f92a60fcbd6b3668329b8a SHA512 538cff1d408baf95b2d172490a3a038a8fd79edef5b8c1b64e3c495307b632870548dc0f33b6ed6bc77599d20e883a73a2c2d658b6ca85e131e404bc72e018ee +AUX xlogical-1.0.8-gcc11.patch 270 BLAKE2B 05fce1cafbe6725fe0c17031dc07656047952c78062601130059f7b7ed47afd44ee959d5ba53feba215b6ad41feaed9c6cb865b89512994ce2d7471001e61375 SHA512 b4c0c3b8ae5032af69a0b6864d34393be4e948f797bed057635efc938d1187c0a927d968c428b820602bb1d5698708f4c12da039f78327b585d35059d1e88a5b +AUX xlogical-1.0.8-gcc4.3.patch 628 BLAKE2B 283c6bc0ec032d4dddee928e41c9dd894e9ed96fb53aa653d1985ae7c654020e1fe510749444cb865ccd289813ee19bd03d555ecf4f2d081a038c5a329f6a2d0 SHA512 dab1685a0abfda4e17534327d46f89372132b4dc7be87873b23a9bfa41ebbab4868c46dff574deee6c5895722c05b6019547825b33ef76ccdc7dcd404c03e925 +DIST xlogical-1.0-8.tar.bz2 1789699 BLAKE2B 5d33cc7345c43a21bea8e899e36c87ccf57752f8b96aaa52b61a9042f6531adf6944dff9e57684a86a0f759a8e4e24253618fc2c2e3cdd3c70d20a9cb0a27398 SHA512 3cbba38c430b1f2a6786d1d6893249812e75941fd7ab336ca5d111ec526ef61bb7e09d5365dbcaae23f32a336d8ab840c0e343656054d252043c6c7962b39d18 +DIST xlogical.png 4477 BLAKE2B 276abddabc3b26c7b9a3322e34079073a517ae1c7477307ff3429739eb3a88f9cc23dc0e3c637cf0a7aed13c9cf5cf12b40cb8858eaa0c67246d5d1bf746dedf SHA512 761953cc61bf1cea1b0d306006b71cabee800c6ea74aae4ed31f2fcf2e5cb9fa672c6c226c5444ab6b0af858a54522dafe0a1eb0351bb0c9f359fa447d0fbfa0 +EBUILD xlogical-1.0.8.ebuild 1293 BLAKE2B 8c6542f285e8001cc21a4ced370e4e77d7f98cdd57e7bc444d8073a475e70f278877b986f24151a6f43289fae12039b0838745032644846e0b9fe00747d827e3 SHA512 9c710905c63dcddab00947dd4025feebf4bce4c7fa87bb49a21f602baf0ae45a71eb978a76a0b843227f2a6c45445cf93a18bb96957e4fe3ed62e382caf3a40c +MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254 diff --git a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch deleted file mode 100644 index 5c77527dc598..000000000000 --- a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/properties.h -+++ b/properties.h -@@ -33,9 +33,7 @@ - #include - #include - --#ifdef WIN32 - using namespace std; --#endif - - #include "defs.h" - ---- a/anim.h -+++ b/anim.h -@@ -27,9 +27,7 @@ - // Language Includes - #include - --#ifdef WIN32 - using namespace std; --#endif - - // Application Includes - #include "graph.h" ---- a/exception.h -+++ b/exception.h -@@ -27,10 +27,9 @@ - - // Language Includes - #include -+#include - --#ifdef WIN32 - using namespace std; --#endif - - #define CatchEx(aEx) catch( CXLException aEx ) - #define ThrowEx(aError) throw CXLException(aError,__FILE__,__LINE__) ---- a/gamelogic.cpp -+++ b/gamelogic.cpp -@@ -154,7 +154,7 @@ - levelFile = NULL; - } - -- currentMap = NULL; -+ currentMap = gameLevels.begin(); - - playerName = new char[32+1]; - strcpy( playerName, "nobody" ); diff --git a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch deleted file mode 100644 index 594298c93d44..000000000000 --- a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/gamelogic.cpp -+++ b/gamelogic.cpp -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - #ifndef WIN32 - #include ---- a/levelmap.cpp -+++ b/levelmap.cpp -@@ -21,6 +21,7 @@ - //////////////////////////////////////////////////////////////////////// - - // Language Includes -+#include - #include - #include - #include ---- a/mapedit.cpp -+++ b/mapedit.cpp -@@ -26,6 +26,8 @@ - #include - #include - #include -+#include -+#include - - #ifndef WIN32 - #include ---- a/modlist.cpp -+++ b/modlist.cpp -@@ -22,6 +22,7 @@ - - #include - #include -+#include - - #ifdef WIN32 - #include ---- a/tile_spinner.cpp -+++ b/tile_spinner.cpp -@@ -24,6 +24,7 @@ - - - // Application Includes -+#include - #include "audio.h" - #include "properties.h" - #include "defs.h" diff --git a/games-puzzle/xlogical/files/xlogical-1.0.8-gcc11.patch b/games-puzzle/xlogical/files/xlogical-1.0.8-gcc11.patch new file mode 100644 index 000000000000..f225d41fea0e --- /dev/null +++ b/games-puzzle/xlogical/files/xlogical-1.0.8-gcc11.patch @@ -0,0 +1,12 @@ +--- a/sdl_audio.cpp ++++ b/sdl_audio.cpp +@@ -60,3 +60,3 @@ + +- for( end=aPath+len; end >= 0; end-=1 ) ++ for( end=aPath+len; end >= aPath; end-=1 ) + { +@@ -64,3 +64,3 @@ + } +- for( start=end; start >= 0; start-=1 ) ++ for( start=end; start >= aPath; start-=1 ) + { diff --git a/games-puzzle/xlogical/files/xlogical-1.0.8-gcc4.3.patch b/games-puzzle/xlogical/files/xlogical-1.0.8-gcc4.3.patch new file mode 100644 index 000000000000..967754265f46 --- /dev/null +++ b/games-puzzle/xlogical/files/xlogical-1.0.8-gcc4.3.patch @@ -0,0 +1,36 @@ +--- a/gamelogic.cpp ++++ b/gamelogic.cpp +@@ -27,2 +27,3 @@ + #include ++#include + +@@ -156,3 +157,3 @@ + +- currentMap = NULL; ++ currentMap = (list< class Clevel_map *>::iterator)NULL; + +--- a/levelmap.cpp ++++ b/levelmap.cpp +@@ -28,2 +28,3 @@ + #include ++#include + +--- a/mapedit.cpp ++++ b/mapedit.cpp +@@ -28,2 +28,4 @@ + #include ++#include ++#include + +--- a/modlist.cpp ++++ b/modlist.cpp +@@ -24,2 +24,3 @@ + #include ++#include + +--- a/tile_spinner.cpp ++++ b/tile_spinner.cpp +@@ -25,2 +25,3 @@ + ++#include + // Application Includes diff --git a/games-puzzle/xlogical/metadata.xml b/games-puzzle/xlogical/metadata.xml index e2b7cea129a5..26079e608bed 100644 --- a/games-puzzle/xlogical/metadata.xml +++ b/games-puzzle/xlogical/metadata.xml @@ -1,15 +1,8 @@ - - games@gentoo.org - Gentoo Games Project - - -XLogical is a puzzle game based on the Logical! game that was originally -released by Rainbow Arts on the Commodore Amiga computer. - - - Use alternate graphics which are closer to the original Amiga version - + + games@gentoo.org + Gentoo Games Project + diff --git a/games-puzzle/xlogical/xlogical-1.0.7-r1.ebuild b/games-puzzle/xlogical/xlogical-1.0.7-r1.ebuild deleted file mode 100644 index 835489919edc..000000000000 --- a/games-puzzle/xlogical/xlogical-1.0.7-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools desktop edos2unix - -MY_PV=$(ver_rs 2 '-') -MY_P=${PN}-${MY_PV} -DESCRIPTION="SDL logical clone" -HOMEPAGE="https://changeling.ixionstudios.com/xlogical/" -SRC_URI="https://changeling.ixionstudios.com/xlogical/downloads/${MY_P}.tar.bz2 - alt_gfx? ( https://changeling.ixionstudios.com/xlogical/downloads/${PN}_gfx.zip )" -S="${WORKDIR}"/${PN}-$(ver_cut 1-2) - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="alt_gfx" - -DEPEND=" - media-libs/libsdl[sound,video] - media-libs/sdl-image[jpeg] - media-libs/sdl-mixer[mod] -" -RDEPEND=" - ${DEPEND} - acct-group/gamestat -" -BDEPEND="alt_gfx? ( app-arch/unzip )" - -PATCHES=( - "${FILESDIR}"/${P}-gcc41.patch - "${FILESDIR}"/${P}-gcc43.patch -) - -src_unpack() { - unpack ${MY_P}.tar.bz2 - - if use alt_gfx ; then - cd "${S}"/images || die - unpack xlogical_gfx.zip - fi -} - -src_prepare() { - sed -i '/^CXXFLAGS/d' Makefile.am || die - - edos2unix properties.h anim.h exception.h - - default - - mv configure.in configure.ac || die - eautoreconf -} - -src_configure() { - # localstatedir is only used for the score file - # NOTE: Check on bumps! - econf --localstatedir="/var/games" -} - -src_install() { - dobin ${PN} - - insinto /usr/share/${PN} - doins -r ${PN}.{properties,levels} music sound images - find "${ED}" -name "Makefile*" -exec rm -f '{}' + || die - - insinto /var/games/${PN} - doins ${PN}.scores - - fowners root:gamestat /var/games/${PN}/${PN}.scores - fperms 660 /var/games/${PN}/${PN}.scores - fperms g+s /usr/bin/${PN} - - dodoc AUTHORS ChangeLog NEWS README TODO - make_desktop_entry ${PN} "Xlogical" -} diff --git a/games-puzzle/xlogical/xlogical-1.0.8.ebuild b/games-puzzle/xlogical/xlogical-1.0.8.ebuild new file mode 100644 index 000000000000..d0cd804016ba --- /dev/null +++ b/games-puzzle/xlogical/xlogical-1.0.8.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools desktop + +MY_P="${PN}-$(ver_rs 2 -)" + +DESCRIPTION="Puzzle game based on the Logical! game released on the Commodore Amiga" +HOMEPAGE="https://changeling.ixionstudios.com/xlogical/" +SRC_URI=" + https://changeling.ixionstudios.com/xlogical/downloads/${MY_P}.tar.bz2 + https://dev.gentoo.org/~ionen/distfiles/${PN}.png" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + acct-group/gamestat + media-libs/libsdl[sound,video] + media-libs/sdl-image[jpeg] + media-libs/sdl-mixer[mod]" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-gcc4.3.patch + "${FILESDIR}"/${P}-gcc11.patch +) + +src_prepare() { + default + + sed -e "/^CXXFLAGS/d" \ + -e "s|@localstatedir@/xlogical|${EPREFIX}/var/games|" \ + -i Makefile.am || die + + eautoreconf +} + +src_install() { + dobin ${PN} + + insinto /usr/share/${PN} + doins -r ${PN}.{properties,levels} images music sound + find "${ED}" -name "Makefile*" -delete || die + + insinto /var/games + doins ${PN}.scores + + fowners :gamestat /usr/bin/${PN} /var/games/${PN}.scores + fperms g+s /usr/bin/${PN} + fperms 660 /var/games/${PN}.scores + + einstalldocs + + doicon "${DISTDIR}"/${PN}.png + make_desktop_entry ${PN} "XLogical" +} -- cgit v1.2.3