summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <tristan@gentoo.org>2008-05-05 19:14:10 +0000
committerTristan Heaven <tristan@gentoo.org>2008-05-05 19:14:10 +0000
commitcbf45e2a472b7ea7561e437f22297c5d81e04a1f (patch)
tree1e27ce116f9488cc758980bcedac9b582215e3dc /games-engines
parentFix building with GCC 4.3 wrt #219875 by Martin Väth. (diff)
downloadhistorical-cbf45e2a472b7ea7561e437f22297c5d81e04a1f.tar.gz
historical-cbf45e2a472b7ea7561e437f22297c5d81e04a1f.tar.bz2
historical-cbf45e2a472b7ea7561e437f22297c5d81e04a1f.zip
Fix building with gcc-4.3
Package-Manager: portage-2.1.5_rc6
Diffstat (limited to 'games-engines')
-rw-r--r--games-engines/qtads/ChangeLog6
-rw-r--r--games-engines/qtads/Manifest15
-rw-r--r--games-engines/qtads/files/qtads-1.6c-gcc43.patch20
-rw-r--r--games-engines/qtads/qtads-1.6c.ebuild9
4 files changed, 43 insertions, 7 deletions
diff --git a/games-engines/qtads/ChangeLog b/games-engines/qtads/ChangeLog
index 8278766ff1a4..9a55b873834c 100644
--- a/games-engines/qtads/ChangeLog
+++ b/games-engines/qtads/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-engines/qtads
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/qtads/ChangeLog,v 1.4 2008/01/02 07:21:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/qtads/ChangeLog,v 1.5 2008/05/05 19:14:09 nyhm Exp $
+
+ 05 May 2008; Tristan Heaven <nyhm@gentoo.org>
+ +files/qtads-1.6c-gcc43.patch, qtads-1.6c.ebuild:
+ Fix building with gcc-4.3
02 Jan 2008; Michael Sterrett <mr_bones_@gentoo.org> qtads-1.6c.ebuild:
use eqmake3 to avoid trying to build against qt4
diff --git a/games-engines/qtads/Manifest b/games-engines/qtads/Manifest
index 16557a31210d..0814b9557002 100644
--- a/games-engines/qtads/Manifest
+++ b/games-engines/qtads/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX qtads-1.6c-gcc43.patch 335 RMD160 131426cf3af61ec1b96ec6c9353f5e803770237d SHA1 462515c89b09d0d7d17a6972834d3fe098355e15 SHA256 3a2ea87047b0479335e476160d1ebc233d3976876bfe6dfd4295baf56b8a4c25
DIST qtads-1.6c.tar.bz2 1007742 RMD160 24dc1a3024b69806fcd084b5b4dd277bd85ac75b SHA1 825439ab277df2db3c786c458c4d5ed6933f90d4 SHA256 732ad938bb403b41482ac62f5ed23a9b62cb1c3a033bfe07312991944914937f
-EBUILD qtads-1.6c.ebuild 1121 RMD160 8555b894c3417cdcc8cb365b9dca50f7d2a2e31a SHA1 77bfe2cf7bb5623526952fd370955def49d74f50 SHA256 f6e9af54a6bbe40ad3828c714302ca62aa48730985c937fad3092a9b0851ee2f
-MISC ChangeLog 717 RMD160 e359b97bf08db7ef41d6b45331f6f249a1ade84d SHA1 ae8d3bd5c0ac120525dd6fcff201ff74f0d81907 SHA256 6c148fbb86d824109a0d6ddd27e8e0b462b0ed5c823531fac2c3b91b89b40aa7
+EBUILD qtads-1.6c.ebuild 1164 RMD160 13602c4be43359b617a47967bb8102c2aa9f8b64 SHA1 07a29fafb40b195b5de0fceb8213db27ef16a537 SHA256 6624eb299952503e6b8b44d89abe5a2bfc8adbd33f3dd9155b7111b94d2cae7e
+MISC ChangeLog 841 RMD160 e37ba55db6474b99d930d4fdb746050ca1548d8a SHA1 4e13bff14b790df6437e1fd018a57e1e2aa695f8 SHA256 0d954c46a60275ff8a81d6b9106d45bcde5e95902b3769ea65deb488abd848eb
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgfXIcACgkQdz7hIScOURHzbgCfSSueO3L6WnQi3Cp6FtyQwNcA
+LmQAnR4vDKtQopISQ3LALLgu2VJxf/l2
+=39XI
+-----END PGP SIGNATURE-----
diff --git a/games-engines/qtads/files/qtads-1.6c-gcc43.patch b/games-engines/qtads/files/qtads-1.6c-gcc43.patch
new file mode 100644
index 000000000000..9c0b04e3ef4d
--- /dev/null
+++ b/games-engines/qtads/files/qtads-1.6c-gcc43.patch
@@ -0,0 +1,20 @@
+--- src/osqt3.cc
++++ src/osqt3.cc
+@@ -43,6 +43,7 @@
+ #include <qfileinfo.h>
+ #include <qdir.h>
+ #include <qtextcodec.h>
++#include <cstring>
+
+ #include "os.h"
+ #include "qtadswarning.h"
+--- src/osqt.cc
++++ src/osqt.cc
+@@ -103,6 +103,7 @@
+ #include <cstring>
+ #include <cstdio>
+ #include <cctype>
++#include <ctime>
+
+ #include "os.h"
+
diff --git a/games-engines/qtads/qtads-1.6c.ebuild b/games-engines/qtads/qtads-1.6c.ebuild
index 6ff5eb5369b4..bed3a621a660 100644
--- a/games-engines/qtads/qtads-1.6c.ebuild
+++ b/games-engines/qtads/qtads-1.6c.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/qtads/qtads-1.6c.ebuild,v 1.5 2008/01/02 07:21:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/qtads/qtads-1.6c.ebuild,v 1.6 2008/05/05 19:14:09 nyhm Exp $
-inherit flag-o-matic qt3 games
+inherit eutils flag-o-matic qt3 games
DESCRIPTION="QT based GUI interpreter for Tads2/Tads3 games"
HOMEPAGE="http://qtads.sourceforge.net/"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qtads/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~ppc x86"
+KEYWORDS="~amd64 ~ppc x86"
IUSE=""
DEPEND="$(qt_min_version 3)"
@@ -18,7 +18,8 @@ DEPEND="$(qt_min_version 3)"
src_unpack() {
unpack ${A}
cd "${S}"
- gunzip qtads.6.gz || die
+ unpack ./qtads.6.gz
+ epatch "${FILESDIR}"/${P}-gcc43.patch
}
src_compile () {