summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <tristan@gentoo.org>2008-05-02 22:14:08 +0000
committerTristan Heaven <tristan@gentoo.org>2008-05-02 22:14:08 +0000
commitf4820cad401469453edb125263b87f219114d69f (patch)
tree36783985dca9605df6c80b8b44b5f2e9a34fcb4d /games-util
parentVersion bump. (diff)
downloadhistorical-f4820cad401469453edb125263b87f219114d69f.tar.gz
historical-f4820cad401469453edb125263b87f219114d69f.tar.bz2
historical-f4820cad401469453edb125263b87f219114d69f.zip
Fix building with gcc-4.3
Package-Manager: portage-2.1.5_rc6
Diffstat (limited to 'games-util')
-rw-r--r--games-util/agistudio/ChangeLog8
-rw-r--r--games-util/agistudio/Manifest15
-rw-r--r--games-util/agistudio/agistudio-1.2.2.ebuild9
-rw-r--r--games-util/agistudio/files/agistudio-1.2.2-gcc43.patch50
4 files changed, 74 insertions, 8 deletions
diff --git a/games-util/agistudio/ChangeLog b/games-util/agistudio/ChangeLog
index be3ebf203565..8aec56c919be 100644
--- a/games-util/agistudio/ChangeLog
+++ b/games-util/agistudio/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-util/agistudio
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/agistudio/ChangeLog,v 1.8 2007/02/19 17:35:21 nixnut Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/agistudio/ChangeLog,v 1.9 2008/05/02 22:14:08 nyhm Exp $
+
+ 02 May 2008; Tristan Heaven <nyhm@gentoo.org>
+ +files/agistudio-1.2.2-gcc43.patch, agistudio-1.2.2.ebuild:
+ Fix building with gcc-4.3
19 Feb 2007; nixnut <nixnut@gentoo.org> agistudio-1.2.2.ebuild:
Stable on ppc wrt bug 167559
diff --git a/games-util/agistudio/Manifest b/games-util/agistudio/Manifest
index 37f59fb23948..a593e1f025a5 100644
--- a/games-util/agistudio/Manifest
+++ b/games-util/agistudio/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX agistudio-1.2.2-gcc43.patch 876 RMD160 d1059e0cff1a89ca93398fdf828e55b3cc62358e SHA1 eb7eb6dd14262231c81b09d2eeda2d4a4ff10a3c SHA256 a92972578cff5088eabab0e37dfc01067b56fc2cb9458a79f4b0f341ef3a549d
DIST agistudio-1.2.2.tar.gz 364846 RMD160 43575cecb66716fe681ed5e5ccdca54641840c21 SHA1 cab01d9ea60814254c93000377b034e7027f768a SHA256 2c14c82fc3e4355acb22c04d3cf44671699010f8679b8c0e4cd9515ddd11bea8
-EBUILD agistudio-1.2.2.ebuild 999 RMD160 4fe53cc740fafd21f7d9b7ca989a5c5fc7258b75 SHA1 0078e1e81a541e05936cfba27d2748147e0d2ea6 SHA256 8711939e9219c997daa705b3fa6cb52bd08a35e1287123fd7c3f32ea120ec619
-MISC ChangeLog 1136 RMD160 6476223c80e958240727aa2e81d209f1d536362a SHA1 aae82265e059a82b4502bd69d0cfd5f8dc62d1cf SHA256 fe66e5800ce3fa5364d58392d71701f4bbd7997c30fb2d831da47f1ba955dde9
+EBUILD agistudio-1.2.2.ebuild 1040 RMD160 ce1c10321405aa5829c2e69bd00cd0ba9910df80 SHA1 4f13294618f37c44692efb9026db93d156f66565 SHA256 27f72781dda8a10e2ce62fef28c72d8e3d726847a4dd06433ac3069e8cc2153c
+MISC ChangeLog 1273 RMD160 79bd2813f0128bd7afa1ccb13c69ea49524cacf2 SHA1 42248b2f2843f50891829eecbd29888f69704428 SHA256 9f6d5dc07272ff8f48e01b7be491598bb3f1d77da5163535ba25747f0b090436
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgbkjYACgkQdz7hIScOURF93wCg2JrThD3UIX7IuijdEOPKorga
+PWYAoLcc336p8Rh18jCCjjWuCC002pCP
+=2bn2
+-----END PGP SIGNATURE-----
diff --git a/games-util/agistudio/agistudio-1.2.2.ebuild b/games-util/agistudio/agistudio-1.2.2.ebuild
index 1e4de09c9bf7..0855cc07772b 100644
--- a/games-util/agistudio/agistudio-1.2.2.ebuild
+++ b/games-util/agistudio/agistudio-1.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/agistudio/agistudio-1.2.2.ebuild,v 1.4 2008/02/14 05:57:17 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/agistudio/agistudio-1.2.2.ebuild,v 1.5 2008/05/02 22:14:08 nyhm Exp $
-inherit toolchain-funcs qt3
+inherit eutils toolchain-funcs qt3
DESCRIPTION="QT AGI Studio allows you to view, create and edit AGI games"
HOMEPAGE="http://agistudio.sourceforge.net/"
@@ -20,10 +20,11 @@ S=${WORKDIR}/${P}/src
src_unpack() {
unpack ${A}
cd "${S}"
+ epatch "${FILESDIR}"/${P}-gcc43.patch
sed -i \
-e "s#^QTDIR.*#QTDIR = ${QTDIR}#" \
-e "s#^INCPATH.*#INCPATH = -I\$(QTDIR)/include#" \
- -e "s/g++/$(tc-getCXX)/" \
+ -e "s:g++:$(tc-getCXX):" \
-e "/^CXXFLAGS/s:-O2:${CXXFLAGS}:" \
-e 's/$(LFLAGS)/$(LDFLAGS)/' \
Makefile \
diff --git a/games-util/agistudio/files/agistudio-1.2.2-gcc43.patch b/games-util/agistudio/files/agistudio-1.2.2-gcc43.patch
new file mode 100644
index 000000000000..004a89bd2b1f
--- /dev/null
+++ b/games-util/agistudio/files/agistudio-1.2.2-gcc43.patch
@@ -0,0 +1,50 @@
+--- src/logdecode.cpp
++++ src/logdecode.cpp
+@@ -27,7 +27,8 @@
+ #include "menu.h"
+ #include "agicommands.h"
+
+-#include <stdio.h>
++#include <cstdlib>
++#include <cstdio>
+
+ static int EncryptionStart;
+ static int MessageSectionStart,MessageSectionEnd;
+--- src/main.cpp
++++ src/main.cpp
+@@ -18,7 +18,8 @@
+ *
+ */
+
+-#include <stdio.h>
++#include <cstdlib>
++#include <cstdio>
+
+ #include <qapplication.h>
+ #include <qmainwindow.h>
+--- src/picedit.cpp
++++ src/picedit.cpp
+@@ -24,6 +24,7 @@
+ #include "picture.h"
+ #include "preview.h"
+
++#include <cstdlib>
+ #include <qspinbox.h>
+ #include <qapplication.h>
+ #include <qpainter.h>
+--- src/util.cpp
++++ src/util.cpp
+@@ -19,9 +19,10 @@
+ */
+
+ #include "util.h"
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <ctype.h>
++#include <cstdio>
++#include <cstdlib>
++#include <cctype>
++#include <cstring>
+
+ TStringList::TStringList ()
+ {