summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <dirtyepic@gentoo.org>2011-09-21 23:55:12 +0000
committerRyan Hill <dirtyepic@gentoo.org>2011-09-21 23:55:12 +0000
commit48dc71530af55a0c4841c2c97256030990bfc1ed (patch)
tree861f3ae2bc221b41ed9e5ae12af0801f37eb928f /app-text/stardict
parentUse git instead of unstable SRC_URI (diff)
downloadgentoo-2-48dc71530af55a0c4841c2c97256030990bfc1ed.tar.gz
gentoo-2-48dc71530af55a0c4841c2c97256030990bfc1ed.tar.bz2
gentoo-2-48dc71530af55a0c4841c2c97256030990bfc1ed.zip
Add patch from Piotr Szymaniak to fix compilation w/ GCC 4.6 (bug #362299).
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
Diffstat (limited to 'app-text/stardict')
-rw-r--r--app-text/stardict/ChangeLog6
-rw-r--r--app-text/stardict/files/stardict-3.0.1-gcc46.patch12
-rw-r--r--app-text/stardict/stardict-3.0.1-r3.ebuild3
3 files changed, 19 insertions, 2 deletions
diff --git a/app-text/stardict/ChangeLog b/app-text/stardict/ChangeLog
index 086e5c81f86a..0abac87fd31d 100644
--- a/app-text/stardict/ChangeLog
+++ b/app-text/stardict/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-text/stardict
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/ChangeLog,v 1.9 2011/03/27 12:23:55 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/ChangeLog,v 1.10 2011/09/21 23:55:12 dirtyepic Exp $
+
+ 22 Sep 2011; Ryan Hill <dirtyepic@gentoo.org> stardict-3.0.1-r3.ebuild,
+ +files/stardict-3.0.1-gcc46.patch:
+ Add patch from Piotr Szymaniak to fix compilation w/ GCC 4.6 (bug #362299).
27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
-stardict-2.4.8-r1.ebuild, -stardict-3.0.1-r1.ebuild,
diff --git a/app-text/stardict/files/stardict-3.0.1-gcc46.patch b/app-text/stardict/files/stardict-3.0.1-gcc46.patch
new file mode 100644
index 000000000000..d57887395ee5
--- /dev/null
+++ b/app-text/stardict/files/stardict-3.0.1-gcc46.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/362299
+
+--- a/stardict-plugins/stardict-wordnet-plugin/scene.hpp
++++ b/stardict-plugins/stardict-wordnet-plugin/scene.hpp
+@@ -9,6 +9,7 @@
+ #include "partic.hpp"
+ #include "spring.hpp"
+
++#include <cstdlib>
+ #include <vector>
+ using namespace std;
+
diff --git a/app-text/stardict/stardict-3.0.1-r3.ebuild b/app-text/stardict/stardict-3.0.1-r3.ebuild
index 537a05b81585..87102d8f3226 100644
--- a/app-text/stardict/stardict-3.0.1-r3.ebuild
+++ b/app-text/stardict/stardict-3.0.1-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.1-r3.ebuild,v 1.3 2011/03/27 12:23:55 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.1-r3.ebuild,v 1.4 2011/09/21 23:55:12 dirtyepic Exp $
EAPI="2"
@@ -51,6 +51,7 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-changelog-minor-typo-fixes.patch
epatch "${FILESDIR}"/${P}-gcc44.patch
epatch "${FILESDIR}"/${P}-sparc_sigbus.patch
+ epatch "${FILESDIR}"/${P}-gcc46.patch
# Fix compatibility with gucharmap-2, bug #240728
epatch "${FILESDIR}/${P}-gucharmap2.patch"