From c719fdcee603a5a706a45d10cb598762d56a727d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Sep 2021 20:21:45 +0100 Subject: gentoo resync : 25.09.2021 --- games-puzzle/quadra/Manifest | 8 ++-- .../quadra/files/quadra-1.2.0-format.patch | 11 ------ games-puzzle/quadra/files/quadra-1.3.0-clang.patch | 10 +++++ games-puzzle/quadra/metadata.xml | 1 + games-puzzle/quadra/quadra-1.2.0-r1.ebuild | 46 ---------------------- games-puzzle/quadra/quadra-1.3.0.ebuild | 37 +++++++++++++++++ 6 files changed, 52 insertions(+), 61 deletions(-) delete mode 100644 games-puzzle/quadra/files/quadra-1.2.0-format.patch create mode 100644 games-puzzle/quadra/files/quadra-1.3.0-clang.patch delete mode 100644 games-puzzle/quadra/quadra-1.2.0-r1.ebuild create mode 100644 games-puzzle/quadra/quadra-1.3.0.ebuild (limited to 'games-puzzle/quadra') diff --git a/games-puzzle/quadra/Manifest b/games-puzzle/quadra/Manifest index 7ec5f369a003..8c0aada38fc9 100644 --- a/games-puzzle/quadra/Manifest +++ b/games-puzzle/quadra/Manifest @@ -1,4 +1,4 @@ -AUX quadra-1.2.0-format.patch 491 BLAKE2B 21341a7d0a6fa1556d9d79d3fa55f2cb1fc4cf6244dc8fbdc937acb9250bec258818ffd6644d1f40a5fc0db07e64555121f2d0ce5c9ef9ffeadf2da6ebe78412 SHA512 a0a05c3ced44a88d7766a0ef2053dce378df4e6cec74acc7d074a27bffc48d6c43977289e779bc526d730b9d5c8acc18c1cc46c865f3ea7de0a6226937a08ffe -DIST quadra-1.2.0.tar.gz 5103875 BLAKE2B 7b0bce4e8be77de2e357cd14f60ebdbf3ef72f2262013954bca9a8d1a9a2833e00a0fe59f818b78603628999e7e1204c6974a5d9f74f4ea9bb288325d518744c SHA512 1c3e1020a584fa83595b7b183d5346f8e357ddef6b29c0b4a3797e2ace50c6e9ff14f132b8299ca582db739f4d699fa8ab94be93ef86e5a01389f958ce91e837 -EBUILD quadra-1.2.0-r1.ebuild 916 BLAKE2B 93ae5d77d1550e6093955fd293ee12ca3b794d8237ffe34d760e99192418a1e1a35c9a6e875be5d0e5810fb2592f5d1fbe04ccb1da4f394f5609bc176c3e1262 SHA512 0291db9fde214222cdea677e5a287c71d2186d7ee84579c7655a8c45acaaf4544f2cfd39d7372e1e9b29e0ff09ad1a2455095ef55ade8ce52d835528aa7e83cd -MISC metadata.xml 330 BLAKE2B 799dbb0f33e86286293c94fa4869d686437e5de04fe4b3123db1f2a21ce649f2e2d6e869eaa339aed76ac5fe1c535c5673f47f50901da7be22c737b9aedb0d14 SHA512 aea863a0f9ad666c5a1058158e66a5ed2c365104a9afe9665b90550042ea202a3b76226b255aa36e8d9561d10b8dc8422363667437350ea71595fac92959994d +AUX quadra-1.3.0-clang.patch 339 BLAKE2B 1afe7cbe54ddf043cefbe1ed7755006499dbf47a2e506165474b5a3b93f1a747e6dcf6dedfcc59c4ee81e51a872227754398dcb87bc836facae7eadce2f4a19d SHA512 2f9133f0a9996fd0e5e32fa3b79566f08963875b2d73501389074afe5832673c106244cd76ec4463a260f0fe0cef5daae569812de294f5b51d688de5116b372f +DIST quadra-1.3.0.tar.gz 3399868 BLAKE2B a4d7cba4a499e86d80efc8df44a0cdc9bd482d88c135768e36ce9399c5bc2d62ae5211a7c60c1638ea8247633d016376bac4768281a8ca0dba698f6e13ed86c3 SHA512 4f1cf2ed56cb0b5bf4fa2f02e19d4cd733589a5abe121d52bb857af3e6360fd0be0799f87a38cc44aa3899e3f491ebd8d4101e99816255f05d98bbb2b7cc9297 +EBUILD quadra-1.3.0.ebuild 725 BLAKE2B 14b08f17376e57d80d2f77d3f8180049ba482c48ed43efa7d2a8e9304a8e17a46f932a53c965d5ab9f965995ed03cda7525a34ac73d8f8f228f5d9e15ba41e69 SHA512 94b9abf1c6991bc14dacc7923ae3cf2bb8d38528514a49b03a81c6bd7dd7508f35d141b9e2d05e7f7d364f68abb159634c04ff531c0d3a891e2eab1e7994ea5b +MISC metadata.xml 388 BLAKE2B 28653556e2d130a8d2c6edfdb13a3cad65116d084f1d7cab07fea5def3728d789f6c4a042cfd696214272bdd3e3a61279ad982294a47be1f35ab3e13b553706d SHA512 bd8d7ac04aa3a837c6bd0bc2db4f532a7400a3aee6c338af15b40213acb291326a8c56cc5557db9042752d2c53d3cc46c14aa0a1ec6ecae29ab353172f14b8b2 diff --git a/games-puzzle/quadra/files/quadra-1.2.0-format.patch b/games-puzzle/quadra/files/quadra-1.2.0-format.patch deleted file mode 100644 index ca56f5b4cc00..000000000000 --- a/games-puzzle/quadra/files/quadra-1.2.0-format.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/source/net_list.cpp.old 2015-12-08 21:41:16.782404098 +0100 -+++ b/source/net_list.cpp 2015-12-08 21:41:33.153114600 +0100 -@@ -693,7 +693,7 @@ - //Drawn at a total higher or equal to end_value: suspense! - // or maybe timer just elapsed and the game is drawn - // (still suspense! :)) -- sprintf(st, ST_GAMETIED); -+ sprintf(st, "%s", ST_GAMETIED); - message(-1, st); - { Sfx stmp(sons.levelup, 0, 0, -1, 18050); } - { Sfx stmp(sons.levelup, 0, 0, -1, 18100); } diff --git a/games-puzzle/quadra/files/quadra-1.3.0-clang.patch b/games-puzzle/quadra/files/quadra-1.3.0-clang.patch new file mode 100644 index 000000000000..07fda7ba02dd --- /dev/null +++ b/games-puzzle/quadra/files/quadra-1.3.0-clang.patch @@ -0,0 +1,10 @@ +https://bugs.gentoo.org/730862 +--- a/source/update.cc ++++ b/source/update.cc +@@ -87,4 +87,4 @@ + buf.resize(0); +- buf.append("GET "UPDATE_PATH" HTTP/1.0\r\n"); +- buf.append("Host: "UPDATE_HOST"\r\n"); ++ buf.append("GET " UPDATE_PATH " HTTP/1.0\r\n"); ++ buf.append("Host: " UPDATE_HOST "\r\n"); + buf.append("Connection: close\r\n"); diff --git a/games-puzzle/quadra/metadata.xml b/games-puzzle/quadra/metadata.xml index efa3557c2acc..9f1c6d74cd3a 100644 --- a/games-puzzle/quadra/metadata.xml +++ b/games-puzzle/quadra/metadata.xml @@ -7,5 +7,6 @@ quadra + quadra-game/quadra diff --git a/games-puzzle/quadra/quadra-1.2.0-r1.ebuild b/games-puzzle/quadra/quadra-1.2.0-r1.ebuild deleted file mode 100644 index c811bb17564e..000000000000 --- a/games-puzzle/quadra/quadra-1.2.0-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop - -DESCRIPTION="A tetris clone with multiplayer support" -HOMEPAGE="https://github.com/quadra-game/quadra" -SRC_URI="https://github.com/${PN}-game/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXxf86vm - x11-libs/libXext - media-libs/libpng:0= - sys-libs/zlib -" -DEPEND="${RDEPEND} - sys-devel/bc - x11-base/xorg-proto -" - -src_prepare() { - default - sed -i \ - -e "/^libgamesdir:=/s:/games:/${PN}:" \ - -e "/^datagamesdir:=/s:/games:/${PN}:" \ - config/config.mk.in || die - eapply "${FILESDIR}"/${P}-format.patch -} - -src_install() { - dobin ${PN} - insinto /usr/share/${PN} - doins ${PN}.res - doicon images/${PN}.xpm - make_desktop_entry ${PN} Quadra - - HTML_DOCS="help/*" einstalldocs -} diff --git a/games-puzzle/quadra/quadra-1.3.0.ebuild b/games-puzzle/quadra/quadra-1.3.0.ebuild new file mode 100644 index 000000000000..f06e6e9da9b9 --- /dev/null +++ b/games-puzzle/quadra/quadra-1.3.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools desktop + +DESCRIPTION="Tetris clone with multiplayer support" +HOMEPAGE="https://github.com/quadra-game/quadra" +SRC_URI="https://github.com/quadra-game/quadra/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-libs/boost:= + media-libs/libpng:= + media-libs/libsdl2[sound,video] + sys-libs/zlib" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-clang.patch +) + +src_prepare() { + default + sed -i -e "/^datagamesdir/s|\/games|\/${PN}|" Makefile.am || die + eautoreconf +} + +src_install() { + default + dodoc NEWS.md + make_desktop_entry ${PN} ${PN^} +} -- cgit v1.2.3