summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2007-11-29 05:01:47 +0000
committerJeroen Roovers <jer@gentoo.org>2007-11-29 05:01:47 +0000
commit4e311892442abb9822ccb7f11cc65de6333d0274 (patch)
treeb79cffedea84797ee0ad9bc5d1653327703a166a /app-accessibility/dasher
parentVersion bump, drop old, quoting. (diff)
downloadgentoo-2-4e311892442abb9822ccb7f11cc65de6333d0274.tar.gz
gentoo-2-4e311892442abb9822ccb7f11cc65de6333d0274.tar.bz2
gentoo-2-4e311892442abb9822ccb7f11cc65de6333d0274.zip
Fixing bug #200659 and stable for HPPA (bug #199740).
(Portage version: 2.1.4_rc3)
Diffstat (limited to 'app-accessibility/dasher')
-rw-r--r--app-accessibility/dasher/ChangeLog6
-rw-r--r--app-accessibility/dasher/dasher-4.6.1.ebuild7
-rw-r--r--app-accessibility/dasher/files/dasher-4.6.1-lldiv.patch11
3 files changed, 21 insertions, 3 deletions
diff --git a/app-accessibility/dasher/ChangeLog b/app-accessibility/dasher/ChangeLog
index 4858843a8b8b..2c1d30ed9b66 100644
--- a/app-accessibility/dasher/ChangeLog
+++ b/app-accessibility/dasher/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-accessibility/dasher
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.120 2007/11/26 13:43:35 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.121 2007/11/29 05:01:46 jer Exp $
+
+ 29 Nov 2007; Jeroen Roovers <jer@gentoo.org>
+ +files/dasher-4.6.1-lldiv.patch, dasher-4.6.1.ebuild:
+ Fixing bug #200659 and stable for HPPA (bug #199740).
26 Nov 2007; Markus Rothe <corsair@gentoo.org> dasher-4.6.1.ebuild:
Stable on ppc64; bug #199740
diff --git a/app-accessibility/dasher/dasher-4.6.1.ebuild b/app-accessibility/dasher/dasher-4.6.1.ebuild
index fb18bf216b82..73f51a219765 100644
--- a/app-accessibility/dasher/dasher-4.6.1.ebuild
+++ b/app-accessibility/dasher/dasher-4.6.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-4.6.1.ebuild,v 1.8 2007/11/26 13:43:35 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-4.6.1.ebuild,v 1.9 2007/11/29 05:01:46 jer Exp $
WANT_AUTOCONF="2.5"
WANT_AUTOMAKE="1.8"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.inference.phy.cam.ac.uk/dasher/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
IUSE="accessibility cairo gnome"
@@ -77,6 +77,9 @@ src_unpack() {
# Fix compilation with gcc-4
epatch "${FILESDIR}/${PN}-4.5.2-gcc4-speech-fix.patch"
+ # Fix compilation with glibc-2.5
+ epatch "${FILESDIR}/${P}-lldiv.patch"
+
cp aclocal.m4 old-macros.m4
AT_M4DIR="." eautoreconf
}
diff --git a/app-accessibility/dasher/files/dasher-4.6.1-lldiv.patch b/app-accessibility/dasher/files/dasher-4.6.1-lldiv.patch
new file mode 100644
index 000000000000..04f70a576d90
--- /dev/null
+++ b/app-accessibility/dasher/files/dasher-4.6.1-lldiv.patch
@@ -0,0 +1,11 @@
+--- Src/DasherCore/DasherViewSquare.cpp. 2007-10-15 15:55:00.000000000 +0200
++++ Src/DasherCore/DasherViewSquare.cpp 2007-11-28 17:18:08.000000000 +0100
+@@ -802,7 +802,7 @@
+ else
+ return quot;
+ #else
+- lldiv_t res = __gnu_cxx::lldiv(iNumerator, iDenominator);
++ lldiv_t res = lldiv(iNumerator, iDenominator);
+
+ if(res.rem < 0)
+ return res.quot - 1;