summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-03-06 20:44:28 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-03-06 20:44:28 +0000
commitdd54f46f602cba0319e644587fbe23ef99ed8c09 (patch)
treed925bf73e83db9912f8e007ab65d5d333048590c /dev-libs/dvutil
parentVersion bump. (diff)
downloadgentoo-2-dd54f46f602cba0319e644587fbe23ef99ed8c09.tar.gz
gentoo-2-dd54f46f602cba0319e644587fbe23ef99ed8c09.tar.bz2
gentoo-2-dd54f46f602cba0319e644587fbe23ef99ed8c09.zip
Fix building with GCC 4.4 wrt #291231 by Kacper Kowalik.
(Portage version: 2.2_rc63/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/dvutil')
-rw-r--r--dev-libs/dvutil/ChangeLog8
-rw-r--r--dev-libs/dvutil/dvutil-1.0.5.ebuild5
-rw-r--r--dev-libs/dvutil/files/dvutil-1.0.5-gcc44.patch29
3 files changed, 38 insertions, 4 deletions
diff --git a/dev-libs/dvutil/ChangeLog b/dev-libs/dvutil/ChangeLog
index f51786bb1ed5..be5c63cb1c4d 100644
--- a/dev-libs/dvutil/ChangeLog
+++ b/dev-libs/dvutil/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/dvutil
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvutil/ChangeLog,v 1.35 2009/10/04 14:47:56 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvutil/ChangeLog,v 1.36 2010/03/06 20:44:27 ssuominen Exp $
+
+ 06 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> dvutil-1.0.5.ebuild,
+ +files/dvutil-1.0.5-gcc44.patch:
+ Fix building with GCC 4.4 wrt #291231 by Kacper Kowalik.
04 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> dvutil-0.15.5.ebuild,
dvutil-1.0.5.ebuild:
diff --git a/dev-libs/dvutil/dvutil-1.0.5.ebuild b/dev-libs/dvutil/dvutil-1.0.5.ebuild
index 8115f510bef1..22527ae3618f 100644
--- a/dev-libs/dvutil/dvutil-1.0.5.ebuild
+++ b/dev-libs/dvutil/dvutil-1.0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvutil/dvutil-1.0.5.ebuild,v 1.2 2009/10/04 14:47:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvutil/dvutil-1.0.5.ebuild,v 1.3 2010/03/06 20:44:27 ssuominen Exp $
inherit flag-o-matic eutils
@@ -20,6 +20,7 @@ src_unpack() {
unpack ${A}
cd "${S}"
+ epatch "${FILESDIR}"/${P}-gcc44.patch
sed -i 's|^\(SUBDIRS =.*\)doc\(.*\)$|\1\2|' Makefile.in || \
die "sed Makefile.in failed"
}
diff --git a/dev-libs/dvutil/files/dvutil-1.0.5-gcc44.patch b/dev-libs/dvutil/files/dvutil-1.0.5-gcc44.patch
new file mode 100644
index 000000000000..456bfb09bebe
--- /dev/null
+++ b/dev-libs/dvutil/files/dvutil-1.0.5-gcc44.patch
@@ -0,0 +1,29 @@
+--- dvutil-1.0.5.orig/dvutil/debug_dump.C 2008-03-14 22:44:10.000000000 +0100
++++ dvutil-1.0.5/dvutil/debug_dump.C 2009-10-30 21:21:17.211325923 +0100
+@@ -1,4 +1,5 @@
+ // $Id: dvutil-1.0.5-gcc44.patch,v 1.1 2010/03/06 20:44:28 ssuominen Exp $
++#include <stdint.h>
+ #include <ctype.h>
+ #include <iomanip>
+
+--- dvutil-1.0.5.orig/dvutil/props.C 2008-03-14 22:44:10.000000000 +0100
++++ dvutil-1.0.5/dvutil/props.C 2009-10-30 21:22:31.245328026 +0100
+@@ -1,6 +1,7 @@
+ // $Id: dvutil-1.0.5-gcc44.patch,v 1.1 2010/03/06 20:44:28 ssuominen Exp $
+
+ #include <ctype.h>
++#include <cstdio>
+ #include <unistd.h> // environ
+ #include <string.h> // strchr
+ #include <dvutil/props.h>
+--- dvutil-1.0.5.orig/dvutil/filterstreambuf.h 2008-03-16 16:17:26.000000000 +0100
++++ dvutil-1.0.5/dvutil/filterstreambuf.h 2009-10-30 21:23:13.555577358 +0100
+@@ -3,6 +3,8 @@
+ // $Id: dvutil-1.0.5-gcc44.patch,v 1.1 2010/03/06 20:44:28 ssuominen Exp $
+
+ #include <iostream>
++#include <cstdio>
++
+ /** @file
+ * The Dv::Util::filterstreambuf class is a template class that
+ * is used to define Dv::Util::filterstream objects.