summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-08-11 13:57:05 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-08-11 13:57:05 +0000
commit297c523cd221eedab8974fce2a04f979209aeb75 (patch)
tree66611a2c664da7fdbba269bf8afc09d8a9220f84 /app-cdr
parentReverting my previous commit about the media-plugins/swh-plugins dependency. ... (diff)
downloadgentoo-2-297c523cd221eedab8974fce2a04f979209aeb75.tar.gz
gentoo-2-297c523cd221eedab8974fce2a04f979209aeb75.tar.bz2
gentoo-2-297c523cd221eedab8974fce2a04f979209aeb75.zip
Fix building with GLIBC 2.12 wrt #332237 by Diego E. Pettenò.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-cdr')
-rw-r--r--app-cdr/cdrdao/ChangeLog6
-rw-r--r--app-cdr/cdrdao/cdrdao-1.2.3-r1.ebuild7
-rw-r--r--app-cdr/cdrdao/files/cdrdao-1.2.3-glibc212.patch12
3 files changed, 23 insertions, 2 deletions
diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index 935f546b95d5..afbcd74bb814 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-cdr/cdrdao
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.153 2010/08/09 23:12:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.154 2010/08/11 13:57:04 ssuominen Exp $
+
+ 11 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+ cdrdao-1.2.3-r1.ebuild, +files/cdrdao-1.2.3-glibc212.patch:
+ Fix building with GLIBC 2.12 wrt #332237 by Diego E. Pettenò.
09 Aug 2010; Jeroen Roovers <jer@gentoo.org> cdrdao-1.2.3.ebuild:
Stable for HPPA (bug #317529).
diff --git a/app-cdr/cdrdao/cdrdao-1.2.3-r1.ebuild b/app-cdr/cdrdao/cdrdao-1.2.3-r1.ebuild
index a2007483d2d4..437ccacf7bdb 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.3-r1.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.3-r1.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.3-r1.ebuild,v 1.1 2010/07/16 15:50:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.3-r1.ebuild,v 1.2 2010/08/11 13:57:04 ssuominen Exp $
EAPI=2
+inherit eutils
DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
HOMEPAGE="http://cdrdao.sourceforge.net/"
@@ -35,6 +36,10 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${P/_}
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-glibc212.patch
+}
+
src_configure() {
econf \
--disable-dependency-tracking \
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-glibc212.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-glibc212.patch
new file mode 100644
index 000000000000..dbfc96cb93bf
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.2.3-glibc212.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/332237
+
+--- dao/ScsiIf-linux.cc
++++ dao/ScsiIf-linux.cc
+@@ -30,6 +30,7 @@
+ #include <asm/param.h>
+ #include <scsi/scsi.h>
+ #include <scsi/sg.h>
++#include <sys/stat.h>
+
+ #include "ScsiIf.h"
+ #include "sg_err.h"