summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Herbert <stuart@gentoo.org>2006-06-11 15:04:12 +0000
committerStuart Herbert <stuart@gentoo.org>2006-06-11 15:04:12 +0000
commitefbad007ee75ad253ee8690a1e912b12bc10570b (patch)
tree2ef60cbc8b641b002affbe71d96f6385b4ebc2f6 /x11-misc/vym
parentRestore keywords. (diff)
downloadgentoo-2-efbad007ee75ad253ee8690a1e912b12bc10570b.tar.gz
gentoo-2-efbad007ee75ad253ee8690a1e912b12bc10570b.tar.bz2
gentoo-2-efbad007ee75ad253ee8690a1e912b12bc10570b.zip
Added gcc4.1 patch
(Portage version: 2.1)
Diffstat (limited to 'x11-misc/vym')
-rw-r--r--x11-misc/vym/ChangeLog7
-rw-r--r--x11-misc/vym/files/03_gcc41.patch11
-rw-r--r--x11-misc/vym/files/digest-vym-1.7.02
-rw-r--r--x11-misc/vym/vym-1.7.0.ebuild3
4 files changed, 21 insertions, 2 deletions
diff --git a/x11-misc/vym/ChangeLog b/x11-misc/vym/ChangeLog
index b6170992664a..4df46b459c7d 100644
--- a/x11-misc/vym/ChangeLog
+++ b/x11-misc/vym/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-misc/vym
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/ChangeLog,v 1.8 2006/01/08 13:06:56 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/ChangeLog,v 1.9 2006/06/11 15:04:12 stuart Exp $
+
+ 11 Jun 2006; Stuart Herbert <stuart@gentoo.org> +files/03_gcc41.patch,
+ vym-1.7.0.ebuild:
+ Added patch for gcc-4.1, closes bug 135496
+ Thanks for Ron MacNeil <macro@hotmail.com> for the patch
08 Jan 2006; Stefan Schweizer <genstef@gentoo.org> vym-1.7.0.ebuild:
modular depends, bug 118241
diff --git a/x11-misc/vym/files/03_gcc41.patch b/x11-misc/vym/files/03_gcc41.patch
new file mode 100644
index 000000000000..d0595ef99211
--- /dev/null
+++ b/x11-misc/vym/files/03_gcc41.patch
@@ -0,0 +1,11 @@
+--- xml.h.orig 2006-06-04 21:39:54.000000000 +1000
++++ xml.h 2006-06-04 21:40:14.000000000 +1000
+@@ -16,7 +16,7 @@
+ ~mapBuilderHandler();
+ QString errorProtocol();
+ bool startDocument();
+- QString mapBuilderHandler::parseHREF(QString);
++ QString parseHREF(QString);
+ bool startElement ( const QString&, const QString&,
+ const QString& eName, const QXmlAttributes& atts );
+ bool endElement ( const QString&, const QString&, const QString& );
diff --git a/x11-misc/vym/files/digest-vym-1.7.0 b/x11-misc/vym/files/digest-vym-1.7.0
index a348370105cb..45a4e4712f0a 100644
--- a/x11-misc/vym/files/digest-vym-1.7.0
+++ b/x11-misc/vym/files/digest-vym-1.7.0
@@ -1 +1,3 @@
MD5 f1d4ba9f5a2362a213f7ff90ad6cdfec vym-1.7.0.tar.gz 592231
+RMD160 ef336b671e04872762dd9c721abcfdd03c8efd96 vym-1.7.0.tar.gz 592231
+SHA256 273063cec9227ce6600baf9859715597c2d1ce43aa1c94bf6391b6850929a722 vym-1.7.0.tar.gz 592231
diff --git a/x11-misc/vym/vym-1.7.0.ebuild b/x11-misc/vym/vym-1.7.0.ebuild
index 385e4d39286d..847de14dafd1 100644
--- a/x11-misc/vym/vym-1.7.0.ebuild
+++ b/x11-misc/vym/vym-1.7.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/vym-1.7.0.ebuild,v 1.3 2006/01/08 13:06:56 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/vym-1.7.0.ebuild,v 1.4 2006/06/11 15:04:12 stuart Exp $
inherit eutils qt3
@@ -25,6 +25,7 @@ src_unpack() {
epatch ${FILESDIR}/01_all_linkablemapobj-math.patch
epatch ${FILESDIR}/02_all_misc-math.patch
+ epatch ${FILESDIR}/03_gcc41.patch
}
src_compile() {