summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2008-06-28 23:02:42 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2008-06-28 23:02:42 +0000
commit30d0440fbb6477884f4661b50871fcb7ca5511e5 (patch)
tree790b9d3169ee4c0f74055f4bdef1ff19b5f18374 /app-dicts
parentBump to subversion snapshot, r705. (diff)
downloadgentoo-2-30d0440fbb6477884f4661b50871fcb7ca5511e5.tar.gz
gentoo-2-30d0440fbb6477884f4661b50871fcb7ca5511e5.tar.bz2
gentoo-2-30d0440fbb6477884f4661b50871fcb7ca5511e5.zip
Fix for gcc-4.3, bug #227203. Thanks to Marek Miller <mlm@shells.pl>
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.8 i686)
Diffstat (limited to 'app-dicts')
-rw-r--r--app-dicts/babytrans/ChangeLog8
-rw-r--r--app-dicts/babytrans/babytrans-0.9.2-r3.ebuild13
-rw-r--r--app-dicts/babytrans/files/babytrans-0.9.2-gcc43.patch24
3 files changed, 37 insertions, 8 deletions
diff --git a/app-dicts/babytrans/ChangeLog b/app-dicts/babytrans/ChangeLog
index c4e670080d08..10c3be86367d 100644
--- a/app-dicts/babytrans/ChangeLog
+++ b/app-dicts/babytrans/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-dicts/babytrans
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/babytrans/ChangeLog,v 1.17 2007/07/25 15:47:33 drac Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/babytrans/ChangeLog,v 1.18 2008/06/28 23:02:41 loki_val Exp $
+
+ 28 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+ +files/babytrans-0.9.2-gcc43.patch, babytrans-0.9.2-r3.ebuild:
+ Fix for gcc-4.3, bug #227203. Thanks to Marek Miller <mlm@shells.pl>
25 Jul 2007; Samuli Suominen <drac@gentoo.org> babytrans-0.9.2-r3.ebuild:
Fix homepage.
diff --git a/app-dicts/babytrans/babytrans-0.9.2-r3.ebuild b/app-dicts/babytrans/babytrans-0.9.2-r3.ebuild
index 204cd33a718f..64a35c74a580 100644
--- a/app-dicts/babytrans/babytrans-0.9.2-r3.ebuild
+++ b/app-dicts/babytrans/babytrans-0.9.2-r3.ebuild
@@ -1,6 +1,6 @@
-# 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/app-dicts/babytrans/babytrans-0.9.2-r3.ebuild,v 1.8 2007/07/25 15:47:33 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/babytrans/babytrans-0.9.2-r3.ebuild,v 1.9 2008/06/28 23:02:41 loki_val Exp $
inherit eutils
@@ -19,20 +19,21 @@ RDEPEND="=x11-libs/gtk+-1.2*
src_unpack() {
unpack ${A}
cd ${S}/src
- epatch ${FILESDIR}/${P}-gcc.patch
+ epatch "${FILESDIR}"/${P}-gcc.patch
+ epatch "${FILESDIR}"/${P}-gcc43.patch
# Using make install instead of einstall causes a problem with sandbox.
# This simple patch is supposed to solve this.
cd ${S}/po
- epatch ${FILESDIR}/${P}-nls.patch
+ epatch "${FILESDIR}"/${P}-nls.patch
}
src_install() {
# Requested by bug 72019
- make install DESTDIR=${D} || die
+ make install DESTDIR="${D}" || die
insinto /usr/share/babytrans
- doins ${FILESDIR}/dictionary
+ doins "${FILESDIR}"/dictionary
dodoc AUTHORS README
}
diff --git a/app-dicts/babytrans/files/babytrans-0.9.2-gcc43.patch b/app-dicts/babytrans/files/babytrans-0.9.2-gcc43.patch
new file mode 100644
index 000000000000..1f9e1e446343
--- /dev/null
+++ b/app-dicts/babytrans/files/babytrans-0.9.2-gcc43.patch
@@ -0,0 +1,24 @@
+--- src/main.cc.orig 2008-06-15 16:22:24.000000000 +0000
++++ src/main.cc 2008-06-15 16:22:40.000000000 +0000
+@@ -32,6 +32,8 @@
+ #include <string>
+ #include <vector>
+ #include <cerrno>
++#include <cstdlib>
++#include <cstring>
+
+ #include <sys/stat.h> // for stat()
+ #include <unistd.h> // for stat()
+
+--- src/libbab.cc.orig 2008-06-15 16:28:41.000000000 +0000
++++ src/libbab.cc 2008-06-15 16:29:03.000000000 +0000
+@@ -30,6 +30,8 @@
+ #include <list>
+ #include <cctype>
+ #include <cerrno>
++#include <cstring>
++
+
+ #ifdef ENABLE_NLS
+ #include <libintl.h>
+