summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <tristan@gentoo.org>2008-05-02 22:35:13 +0000
committerTristan Heaven <tristan@gentoo.org>2008-05-02 22:35:13 +0000
commit372d532fc993a91c26116a8c9c12e0c416eb517a (patch)
tree2b6b35cb6a6885493875058cd3fffa1028b77a51 /games-puzzle/quadra
parentbump to 1.9.2; 1.9.1-r1 stable on amd64/x86; remove old (diff)
downloadhistorical-372d532fc993a91c26116a8c9c12e0c416eb517a.tar.gz
historical-372d532fc993a91c26116a8c9c12e0c416eb517a.tar.bz2
historical-372d532fc993a91c26116a8c9c12e0c416eb517a.zip
Fix building with gcc-4.3
Package-Manager: portage-2.1.5_rc6
Diffstat (limited to 'games-puzzle/quadra')
-rw-r--r--games-puzzle/quadra/ChangeLog6
-rw-r--r--games-puzzle/quadra/Manifest15
-rw-r--r--games-puzzle/quadra/files/quadra-1.1.8-gcc43.patch114
-rw-r--r--games-puzzle/quadra/quadra-1.1.8.ebuild13
4 files changed, 139 insertions, 9 deletions
diff --git a/games-puzzle/quadra/ChangeLog b/games-puzzle/quadra/ChangeLog
index d876c096728a..d15f6af14005 100644
--- a/games-puzzle/quadra/ChangeLog
+++ b/games-puzzle/quadra/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-puzzle/quadra
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/ChangeLog,v 1.18 2008/02/29 19:35:24 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/ChangeLog,v 1.19 2008/05/02 22:35:13 nyhm Exp $
+
+ 02 May 2008; Tristan Heaven <nyhm@gentoo.org>
+ +files/quadra-1.1.8-gcc43.patch, quadra-1.1.8.ebuild:
+ Fix building with gcc-4.3
29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> quadra-1.1.8.ebuild:
Remove icon extension from desktop entry to match Icon Theme Specification.
diff --git a/games-puzzle/quadra/Manifest b/games-puzzle/quadra/Manifest
index 0e065bb5c2f0..4592fb182a08 100644
--- a/games-puzzle/quadra/Manifest
+++ b/games-puzzle/quadra/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX libpng-1.2.5.patch 319 RMD160 8f777f0452e7d6df56c0bd024711ee895ad842ae SHA1 3549909150df804ad74466149b0122baf0f4d716 SHA256 7b00007124b62a247e748f37b85b97d35fb50e31fd18742ea6c217e2dc4543c9
AUX quadra-1.1.8-amd64.patch 1075 RMD160 3f88f9078fe2daed39b20c0bd51109759a2b17c5 SHA1 722d51a6ff42d4ddf3b3d2e1838bffcce20af21b SHA256 9c8fe51ab59a6234d3f9dd0c4ab0722327e142e99fd3f9a0007009579205893e
AUX quadra-1.1.8-asneeded.patch 579 RMD160 91c6f340686e8981576a823fb77f080a3475a76f SHA1 a7006149cd39a1e3a6da8a7df80733933581fc89 SHA256 62eb778b58482853ec303149cd53ee3540852ef04b4e9c4bc5b13189e0f60555
AUX quadra-1.1.8-gcc3.patch 3221 RMD160 058b31005f511039a1cf7ffa4de2d4b79ba686c8 SHA1 a043a1cd04ae98e8880d060b69879568004549a4 SHA256 093d65e718a1cb346b1011bc5627784a16e0128424b8d7e2af697991e37f04ed
AUX quadra-1.1.8-gcc42.patch 7471 RMD160 3aa3fb25624dc564b7ffb4a6105e00e65f5625e6 SHA1 6e448257043fbb1ba82653344919c947a0a365cf SHA256 deb7a7950ef89ade43d3fa17b1f841c532fa77d4ffd896a439dbc3f0ec369b6d
+AUX quadra-1.1.8-gcc43.patch 2305 RMD160 b53a7fd8285f59209e12793bd4c1cb93b7e9a68a SHA1 3f250a6bdc45c2f831f4ca7456fd3aa9ed921cb1 SHA256 fa50f82c598cf233d1ea3c49d1cc8f6943d81a335659ebbeff749b4dabd910a9
DIST quadra-1.1.8.tar.gz 3379618 RMD160 e57f25a714d5f447f3dcb34c34af9fa22718560d SHA1 3c97ffbbf180b4d952f8aedd183b0fd4a4809957 SHA256 6ebf81d4ffe1cedbebfdcc2cb44fdac875da8ccbd3d113ca5cb62169bf63d201
-EBUILD quadra-1.1.8.ebuild 1713 RMD160 1300152600276dfb2e16c1543a234c0a497d1b70 SHA1 09a853d5d660751f953d3570bf82d3aacf28aeca SHA256 6268c0db7d6f07e88e34316a0d8f001ea722739887f92f8a7005de45b36fdc78
-MISC ChangeLog 2682 RMD160 6e38c326e142f6903ba2bf12ab9aaf0a28a524fe SHA1 ba28be9f0f58a25c1dbde7b8d554f8c8edca7a76 SHA256 3bcf8aff8496ad7d37c6dc5feda9887cfdcdbfe204a71acd1360f3e14e01b2ba
+EBUILD quadra-1.1.8.ebuild 1780 RMD160 bbd5cc63792dc11553774379fe2a0fa920d07932 SHA1 af7ed78951a0ca82bcc16b2775513e466e82b3cf SHA256 a6b54ba5e5b5b5f61dcda2fd7e130df74e36297baf8195a3e2810f2597820c81
+MISC ChangeLog 2814 RMD160 dacf8d64a29dff085abae3990ba74f27bbdf0c3c SHA1 eb02392472de8e59ff08125b373b80087db9fa54 SHA256 7a07f3ceadad90e50df160a4650f271651b5231c7cd8512cff0765d44764bdbc
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgblyYACgkQdz7hIScOURFq8wCghzWRCQ8QM1y8YihwwC1si/8E
+kQMAoOZ7R70dnQn9IEdjrpN1IxmNuRfj
+=bBtl
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/quadra/files/quadra-1.1.8-gcc43.patch b/games-puzzle/quadra/files/quadra-1.1.8-gcc43.patch
new file mode 100644
index 000000000000..59c0c7425a56
--- /dev/null
+++ b/games-puzzle/quadra/files/quadra-1.1.8-gcc43.patch
@@ -0,0 +1,114 @@
+--- include/net_list.h
++++ include/net_list.h
+@@ -29,6 +29,7 @@
+ #include "net_stuff.h"
+ #include "stats.h"
+ #include "game.h"
++#include <cstring>
+
+ class Canvas;
+
+--- include/packets.h
++++ include/packets.h
+@@ -27,6 +27,7 @@
+ #include "game.h"
+ #include "config.h"
+ #include "track.h"
++#include <cstring>
+
+ enum Packet_type {
+ P_CHAT,
+--- skelton/common/http_request.cpp
++++ skelton/common/http_request.cpp
+@@ -18,7 +18,8 @@
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+-#include <stdio.h>
++#include <cstdio>
++#include <cstring>
+ #include "error.h"
+ #include "net.h"
+ #include "http_request.h"
+--- skelton/common/res_compress.cpp
++++ skelton/common/res_compress.cpp
+@@ -21,6 +21,7 @@
+ #include "zlib.h"
+ #undef FAR
+ #include "res_compress.h"
++#include <cstring>
+
+ RCSID("$Id: quadra-1.1.8-gcc43.patch,v 1.1 2008/05/02 22:35:13 nyhm Exp $")
+
+--- skelton/common/reswriter.cpp
++++ skelton/common/reswriter.cpp
+@@ -18,7 +18,8 @@
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+-#include <stdio.h>
++#include <cstdio>
++#include <cstring>
+ #include "res.h"
+ #include "resfile.h"
+
+--- skelton/include/net_buf.h
++++ skelton/include/net_buf.h
+@@ -23,6 +23,7 @@
+
+ #include "types.h"
+ #include "net.h"
++#include <cstring>
+
+ class Net_buf {
+ public:
+--- skelton/svgalib/main.cpp
++++ skelton/svgalib/main.cpp
+@@ -27,8 +27,9 @@
+ #ifndef NDEBUG
+ #include <mcheck.h>
+ #endif
+-#include <stdlib.h>
+-#include <signal.h>
++#include <cstdlib>
++#include <csignal>
++#include <cstring>
+
+ #include "debug.h"
+ #include "types.h"
+--- skelton/svgalib/sound.cpp
++++ skelton/svgalib/sound.cpp
+@@ -18,7 +18,8 @@
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+-#include <stdio.h>
++#include <cstdio>
++#include <cstring>
+
+ #include <mcheck.h>
+ #include <linux/soundcard.h>
+--- skelton/svgalib/video_x11.cpp
++++ skelton/svgalib/video_x11.cpp
+@@ -20,7 +20,8 @@
+
+ #ifdef UGS_LINUX_X11
+
+-#include <signal.h>
++#include <csignal>
++#include <cstring>
+ #include <unistd.h>
+ #include <sys/shm.h>
+ #define Font XFont
+--- skelton/tools/wadder/wadder.cpp
++++ skelton/tools/wadder/wadder.cpp
+@@ -100,7 +100,8 @@
+
+ */
+
+-#include <stdio.h>
++#include <cstdio>
++#include <cstring>
+ #include "stringtable.h"
+ #include "res.h"
+
diff --git a/games-puzzle/quadra/quadra-1.1.8.ebuild b/games-puzzle/quadra/quadra-1.1.8.ebuild
index d5606ed5aa6b..10a0e8996252 100644
--- a/games-puzzle/quadra/quadra-1.1.8.ebuild
+++ b/games-puzzle/quadra/quadra-1.1.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/quadra-1.1.8.ebuild,v 1.18 2008/02/29 19:35:24 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/quadra-1.1.8.ebuild,v 1.19 2008/05/02 22:35:13 nyhm Exp $
inherit eutils games
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 x86"
IUSE="svga"
RDEPEND="x11-libs/libXpm
- >=media-libs/libpng-1.2.1
+ media-libs/libpng
svga? ( media-libs/svgalib )"
DEPEND="${RDEPEND}
x11-proto/xextproto"
@@ -27,7 +27,8 @@ src_unpack() {
"${FILESDIR}"/libpng-1.2.5.patch \
"${FILESDIR}"/${P}-amd64.patch \
"${FILESDIR}"/${P}-asneeded.patch \
- "${FILESDIR}"/${P}-gcc42.patch
+ "${FILESDIR}"/${P}-gcc42.patch \
+ "${FILESDIR}"/${P}-gcc43.patch
sed -i \
-e 's:-pedantic::' config/vars.mk \
|| die "sed config/vars.mk failed"
@@ -51,14 +52,14 @@ src_compile() {
}
src_install() {
- dogamesbin ${PN}
+ dogamesbin ${PN} || die "dogamesbin failed"
if use svga; then
dogameslib.so ${PN}-svga.so || die "dogameslib.so failed"
fi
insinto "${GAMES_DATADIR}"/${PN}
- doins ${PN}.res
+ doins ${PN}.res || die "doins failed"
doicon images/${PN}.xpm
- make_desktop_entry ${PN} "Quadra" ${PN}
+ make_desktop_entry ${PN} Quadra
dodoc ChangeLog NEWS README
dohtml help/*