summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2004-09-13 02:23:56 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2004-09-13 02:23:56 +0000
commit591ee8787bc5e9ff268e0f77216b1563e7872568 (patch)
tree8d60d3c7a73e2add655a9da5cfc4b49ed6db0602 /games-puzzle
parentRevision bump to fix linking issue. Only changes in files/id3lib-3.8.3-zlib.... (diff)
downloadhistorical-591ee8787bc5e9ff268e0f77216b1563e7872568.tar.gz
historical-591ee8787bc5e9ff268e0f77216b1563e7872568.tar.bz2
historical-591ee8787bc5e9ff268e0f77216b1563e7872568.zip
Add gcc43 patch from Peter `MathFox' Roozemaal via bug #63773
Diffstat (limited to 'games-puzzle')
-rw-r--r--games-puzzle/pingus/ChangeLog6
-rw-r--r--games-puzzle/pingus/Manifest15
-rw-r--r--games-puzzle/pingus/files/0.6.0-gcc34.patch11
-rw-r--r--games-puzzle/pingus/pingus-0.6.0-r1.ebuild9
4 files changed, 24 insertions, 17 deletions
diff --git a/games-puzzle/pingus/ChangeLog b/games-puzzle/pingus/ChangeLog
index 65bbb8955a4b..8d6c9c735a10 100644
--- a/games-puzzle/pingus/ChangeLog
+++ b/games-puzzle/pingus/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-puzzle/pingus
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/ChangeLog,v 1.4 2004/06/24 23:08:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/ChangeLog,v 1.5 2004/09/13 02:23:56 mr_bones_ Exp $
+
+ 12 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org>
+ +files/0.6.0-gcc34.patch, pingus-0.6.0-r1.ebuild:
+ Add gcc43 patch from Peter `MathFox' Roozemaal via bug #63773
09 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> pingus-0.6.0-r1.ebuild,
files/0.6.0-gcc3.patch:
diff --git a/games-puzzle/pingus/Manifest b/games-puzzle/pingus/Manifest
index 16f193853026..2ee367e77a0f 100644
--- a/games-puzzle/pingus/Manifest
+++ b/games-puzzle/pingus/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9f6a88555832dee8be8f4c363bafbee4 ChangeLog 1313
+MD5 4788058de58204f4375addb22b22c2a6 ChangeLog 1486
+MD5 770d149558dc2164c4473a56b0529713 pingus-0.6.0-r1.ebuild 1258
MD5 f40bbfa2eda5672febaa041b87f025b7 metadata.xml 1049
-MD5 9f22301d973c9bb865073618b579fc59 pingus-0.6.0-r1.ebuild 1199
MD5 c9c5cd0b4f1ab5cdb79bcc756aba215e files/0.6.0-gcc3.patch 5070
+MD5 c433bc8abca5794071e6c80378a83f16 files/0.6.0-gcc34.patch 468
MD5 cf74eabf33bb46fc3ed87e741b182c10 files/digest-pingus-0.6.0-r1 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBHyTcHTu7gpaalycRAiBCAKD5HaTZRhQyb+yMNpitWMZ8ddWuegCfRH+v
-eod/g8OjhMMvSZUtXZLP6u8=
-=57Sn
------END PGP SIGNATURE-----
diff --git a/games-puzzle/pingus/files/0.6.0-gcc34.patch b/games-puzzle/pingus/files/0.6.0-gcc34.patch
new file mode 100644
index 000000000000..b0f52ed4084d
--- /dev/null
+++ b/games-puzzle/pingus/files/0.6.0-gcc34.patch
@@ -0,0 +1,11 @@
+--- src/story_screen.cxx.orig 2004-09-12 17:09:51.000000000 -0700
++++ src/story_screen.cxx 2004-09-12 17:10:43.000000000 -0700
+@@ -142,7 +142,7 @@
+
+ if (!page_displayed_completly)
+ {
+- unsigned int len = static_cast<unsigned int>(20.0f * time_passed);
++ size_t len = static_cast<size_t>(20.0f * time_passed);
+ display_text = current_page.text.substr(0, Math::min(current_page.text.length(), len));
+
+ if (current_page.text.length() < len)
diff --git a/games-puzzle/pingus/pingus-0.6.0-r1.ebuild b/games-puzzle/pingus/pingus-0.6.0-r1.ebuild
index 3f14500bc311..29e2dbc66b06 100644
--- a/games-puzzle/pingus/pingus-0.6.0-r1.ebuild
+++ b/games-puzzle/pingus/pingus-0.6.0-r1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/pingus-0.6.0-r1.ebuild,v 1.7 2004/08/15 08:53:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/pingus-0.6.0-r1.ebuild,v 1.8 2004/09/13 02:23:56 mr_bones_ Exp $
-inherit games eutils flag-o-matic
+inherit eutils flag-o-matic games
DESCRIPTION="free Lemmings clone"
HOMEPAGE="http://pingus.seul.org/"
@@ -21,6 +21,7 @@ src_unpack() {
unpack ${A}
cd ${S}
epatch "${FILESDIR}/${PV}-gcc3.patch"
+ epatch "${FILESDIR}/${PV}-gcc34.patch" # bug 63773
autoconf || die
}
@@ -39,8 +40,8 @@ src_compile() {
src_install() {
make install DESTDIR=${D} || die "make install failed"
# pos install process ... FIXME
- mv ${D}/usr/games/{games,bin}
- cd ${D}/usr/share/games
+ mv "${D}/usr/games/"{games,bin}
+ cd "${D}/usr/share/games"
use nls && mv locale ../
mv games/pingus .
rm -rf games