summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-10-05 17:19:34 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-10-05 17:19:34 +0000
commit50dc03695db6c2a6ce71fb35208444a036085088 (patch)
tree6d3a08fb3aa63029f55f616ab337fa1f864ae21f /app-accessibility
parent2.2_rc89 version bump. This fixes bug #339606 (regression in 'updates (diff)
downloadgentoo-2-50dc03695db6c2a6ce71fb35208444a036085088.tar.gz
gentoo-2-50dc03695db6c2a6ce71fb35208444a036085088.tar.bz2
gentoo-2-50dc03695db6c2a6ce71fb35208444a036085088.zip
Fix building with recent glibc wrt #339846 by Diego E. Pettenò.
(Portage version: 2.2_rc88/cvs/Linux x86_64)
Diffstat (limited to 'app-accessibility')
-rw-r--r--app-accessibility/brltty/ChangeLog6
-rw-r--r--app-accessibility/brltty/brltty-4.2.ebuild8
-rw-r--r--app-accessibility/brltty/files/brltty-4.2-glibc-212.patch13
3 files changed, 25 insertions, 2 deletions
diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog
index c028ecfafd6a..0f523721872b 100644
--- a/app-accessibility/brltty/ChangeLog
+++ b/app-accessibility/brltty/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-accessibility/brltty
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.106 2010/07/16 22:36:02 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.107 2010/10/05 17:19:34 ssuominen Exp $
+
+ 05 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> brltty-4.2.ebuild,
+ +files/brltty-4.2-glibc-212.patch:
+ Fix building with recent glibc wrt #339846 by Diego E. Pettenò.
*brltty-4.2 (16 Jul 2010)
diff --git a/app-accessibility/brltty/brltty-4.2.ebuild b/app-accessibility/brltty/brltty-4.2.ebuild
index 872a8308aeb0..f405484fe84c 100644
--- a/app-accessibility/brltty/brltty-4.2.ebuild
+++ b/app-accessibility/brltty/brltty-4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.2.ebuild,v 1.1 2010/07/16 22:36:02 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.2.ebuild,v 1.2 2010/10/05 17:19:34 ssuominen Exp $
EAPI="2"
FINDLIB_USE="ocaml"
@@ -32,6 +32,12 @@ DEPEND="java? ( >=virtual/jdk-1.4 )
RDEPEND="java? ( >=virtual/jre-1.4 )
${COMMON_DEP}"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-glibc-212.patch
+
+ java-pkg-opt-2_src_prepare
+}
+
src_configure() {
# override prefix in order to install into /
# braille terminal needs to be available as soon in the boot process as
diff --git a/app-accessibility/brltty/files/brltty-4.2-glibc-212.patch b/app-accessibility/brltty/files/brltty-4.2-glibc-212.patch
new file mode 100644
index 000000000000..20e472d305e0
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-4.2-glibc-212.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/339846
+
+--- Programs/sys_linux.c
++++ Programs/sys_linux.c
+@@ -22,6 +22,8 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <sys/types.h> /* sys/stat.h */
++#include <sys/stat.h> /* S_ISCHR */
+ #include <sys/ioctl.h>
+ #include <linux/kd.h>
+