[gentoo-commits] repo/gentoo:master commit in: games-puzzle/quadra/files/, games-puzzle/quadra/

[Ionen Wolkens]

commit: f55bc6eb137f1b3a55780484e301ad92d4b7c978
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Sep 22 21:42:31 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Sep 22 22:25:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f55bc6eb

games-puzzle/quadra: drop 1.2.0-r1

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-puzzle/quadra/Manifest   |  1 -
 .../quadra/files/quadra-1.2.0-format.patch | 11 --
 games-puzzle/quadra/quadra-1.2.0-r1.ebuild | 46 --
 3 files changed, 58 deletions(-)

diff --git a/games-puzzle/quadra/Manifest b/games-puzzle/quadra/Manifest
index e4a6ef335a1..38a2bebbbd8 100644
--- a/games-puzzle/quadra/Manifest
+++ b/games-puzzle/quadra/Manifest
@@ -1,2 +1 @@
-DIST quadra-1.2.0.tar.gz 5103875 BLAKE2B 
7b0bce4e8be77de2e357cd14f60ebdbf3ef72f2262013954bca9a8d1a9a2833e00a0fe59f818b78603628999e7e1204c6974a5d9f74f4ea9bb288325d518744c
 SHA512 
1c3e1020a584fa83595b7b183d5346f8e357ddef6b29c0b4a3797e2ace50c6e9ff14f132b8299ca582db739f4d699fa8ab94be93ef86e5a01389f958ce91e837
 DIST quadra-1.3.0.tar.gz 3399868 BLAKE2B 
a4d7cba4a499e86d80efc8df44a0cdc9bd482d88c135768e36ce9399c5bc2d62ae5211a7c60c1638ea8247633d016376bac4768281a8ca0dba698f6e13ed86c3
 SHA512 
4f1cf2ed56cb0b5bf4fa2f02e19d4cd733589a5abe121d52bb857af3e6360fd0be0799f87a38cc44aa3899e3f491ebd8d4101e99816255f05d98bbb2b7cc9297

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 ca56f5b4cc0..000
--- 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/quadra-1.2.0-r1.ebuild 
b/games-puzzle/quadra/quadra-1.2.0-r1.ebuild
deleted file mode 100644
index c811bb17564..000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/quadra/files/, games-puzzle/quadra/

[Ionen Wolkens]

commit: 348cbf9ba12fe9537527bfdbd6ee55397590e07f
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Sep 18 20:41:29 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Sep 18 20:49:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=348cbf9b

games-puzzle/quadra: clang build fix

Closes: https://bugs.gentoo.org/730862
Signed-off-by: Ionen Wolkens  gentoo.org>

 games-puzzle/quadra/files/quadra-1.3.0-clang.patch | 10 ++
 games-puzzle/quadra/quadra-1.3.0.ebuild|  4 
 2 files changed, 14 insertions(+)

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 000..07fda7ba02d
--- /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/quadra-1.3.0.ebuild 
b/games-puzzle/quadra/quadra-1.3.0.ebuild
index d682ec7d3d4..f06e6e9da9b 100644
--- a/games-puzzle/quadra/quadra-1.3.0.ebuild
+++ b/games-puzzle/quadra/quadra-1.3.0.ebuild
@@ -20,6 +20,10 @@ RDEPEND="
sys-libs/zlib"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+   "${FILESDIR}"/${P}-clang.patch
+)
+
 src_prepare() {
default
sed -i -e "/^datagamesdir/s|\/games|\/${PN}|" Makefile.am || die