summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Vroon <chainsaw@gentoo.org>2005-07-30 16:56:30 +0000
committerTony Vroon <chainsaw@gentoo.org>2005-07-30 16:56:30 +0000
commit885b5baf604ccf2082ac30cb16e36373e65dc02c (patch)
tree9b5ad1bbfbcbe55787f49b571e7fb93b7e0974a9 /media-libs
parentnot yet. (diff)
downloadhistorical-885b5baf604ccf2082ac30cb16e36373e65dc02c.tar.gz
historical-885b5baf604ccf2082ac30cb16e36373e65dc02c.tar.bz2
historical-885b5baf604ccf2082ac30cb16e36373e65dc02c.zip
GCC 4 patch, closes bug #100708.
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/tse3/ChangeLog8
-rw-r--r--media-libs/tse3/Manifest19
-rw-r--r--media-libs/tse3/files/tse3-0.2.7-gcc4.patch36
-rw-r--r--media-libs/tse3/tse3-0.2.7.ebuild4
4 files changed, 60 insertions, 7 deletions
diff --git a/media-libs/tse3/ChangeLog b/media-libs/tse3/ChangeLog
index d8c71e646c66..0eabbafb8fb4 100644
--- a/media-libs/tse3/ChangeLog
+++ b/media-libs/tse3/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/tse3
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tse3/ChangeLog,v 1.10 2004/10/08 09:51:50 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tse3/ChangeLog,v 1.11 2005/07/30 16:56:30 chainsaw Exp $
+
+ 30 Jul 2005; Tony Vroon <chainsaw@gentoo.org>
+ +files/tse3-0.2.7-gcc4.patch, tse3-0.2.7.ebuild:
+ GCC 4 patch by Håvard Wall <haavardw@ifi.uio.no>, closes bug #100708.
08 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> tse3-0.2.7.ebuild:
multilib fixes.
diff --git a/media-libs/tse3/Manifest b/media-libs/tse3/Manifest
index 7fbaf43f2dce..49df7f32cf8e 100644
--- a/media-libs/tse3/Manifest
+++ b/media-libs/tse3/Manifest
@@ -1,8 +1,19 @@
-MD5 0cb0735d315ee6cfd2a2c8374bf54d83 ChangeLog 1400
-MD5 211609ba67a6a5bffa3a00295eec3dcc tse3-0.2.5.ebuild 928
-MD5 ae03ac9386f8c40753432edf314ce0ed tse3-0.2.7.ebuild 1036
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 391fb3f743e587cc170406196204c7ef tse3-0.2.7.ebuild 1103
+MD5 66430158e1ab9eaacd7da4c19a5375ad ChangeLog 1571
+MD5 211609ba67a6a5bffa3a00295eec3dcc tse3-0.2.5.ebuild 928
+MD5 2e294bceee345f0752585b8114b9f93a files/tse3-0.2.7-size_t-64bit.patch 1079
MD5 43db7a6f8ef547d1b28951bb81a17542 files/digest-tse3-0.2.5 62
MD5 e5b12a211e5880ca3f3a11bd9ec606f4 files/digest-tse3-0.2.7 62
-MD5 2e294bceee345f0752585b8114b9f93a files/tse3-0.2.7-size_t-64bit.patch 1079
MD5 bf413ad8b299236102baab56aff1b7e9 files/tse3-0.2.7-gcc34.patch 3155
+MD5 350b80bb838405ff815b6be728b7551d files/tse3-0.2.7-gcc4.patch 1387
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFC67EMp5vW4rUFj5oRAna9AJsH3o8gh2O6xPudEZdzwXBCTdOLcACfSp3K
+RjOuou8R65N1rgNxRUDeuOg=
+=eyRj
+-----END PGP SIGNATURE-----
diff --git a/media-libs/tse3/files/tse3-0.2.7-gcc4.patch b/media-libs/tse3/files/tse3-0.2.7-gcc4.patch
new file mode 100644
index 000000000000..7f32076323b6
--- /dev/null
+++ b/media-libs/tse3/files/tse3-0.2.7-gcc4.patch
@@ -0,0 +1,36 @@
+--- ./src/tse3/cmd/Phrase.h~ 2002-07-28 17:17:11.000000000 +0200
++++ ./src/tse3/cmd/Phrase.h 2005-07-29 15:45:03.000000000 +0200
+@@ -19,6 +19,7 @@
+
+ #include "tse3/cmd/Command.h"
+ #include "tse3/Phrase.h"
++#include "tse3/PhraseEdit.h"
+ #include "tse3/DisplayParams.h"
+
+ #include <vector>
+--- ./src/tse3/file/XML.h~ 2005-07-29 15:37:31.000000000 +0200
++++ ./src/tse3/file/XML.h 2005-07-29 15:50:03.000000000 +0200
+@@ -154,7 +154,6 @@
+ void element(const std::string &name, const char *value);
+ void element(const std::string &name, int value);
+ void element(const std::string &name, unsigned int value);
+- void element(const std::string &name, size_t value);
+ void element(const std::string &name, bool value);
+
+ void comment(const std::string &comment);
+--- ./src/tse3/file/XML.cpp~ 2005-07-29 15:37:31.000000000 +0200
++++ ./src/tse3/file/XML.cpp 2005-07-29 15:49:55.000000000 +0200
+@@ -116,13 +116,6 @@
+ out << "<" << name << " value=\"" << value << "\"/>\n";
+ }
+
+-void TSE3::File::XmlFileWriter::element(const std::string &name, size_t value)
+-{
+- indent(out);
+- out << "<" << name << " value=\"" << value << "\"/>\n";
+-}
+-
+-
+ void TSE3::File::XmlFileWriter::element(const std::string &name, bool value)
+ {
+ indent(out);
diff --git a/media-libs/tse3/tse3-0.2.7.ebuild b/media-libs/tse3/tse3-0.2.7.ebuild
index f794cf50699a..ca6b639df83d 100644
--- a/media-libs/tse3/tse3-0.2.7.ebuild
+++ b/media-libs/tse3/tse3-0.2.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tse3/tse3-0.2.7.ebuild,v 1.14 2005/05/05 02:38:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tse3/tse3-0.2.7.ebuild,v 1.15 2005/07/30 16:56:30 chainsaw Exp $
inherit eutils
@@ -24,6 +24,8 @@ src_unpack() {
epatch ${FILESDIR}/${P}-size_t-64bit.patch
# gcc-3.4 patch
epatch ${FILESDIR}/${P}-gcc34.patch
+ # gcc-4 patch (bug #100708)
+ epatch ${FILESDIR}/${P}-gcc4.patch
}
src_compile() {