Fix building with GCC 4.4 wrt #291231 by Kacper Kowalik.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

diff --git a/dev-libs/dvutil/ChangeLog b/dev-libs/dvutil/ChangeLog
index f51786bb1ed5f3e61b033c511d83b5683dc13d68..be5c63cb1c4dead2b2c815edfb0439018b36e529 100644 (file)
--- 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/Manifest b/dev-libs/dvutil/Manifest
index 0e15f0370cd6fbd63c288eec5c193ed1c8a0144b..87d716738f3458947fb80704f915b763d44d602a 100644 (file)
--- a/dev-libs/dvutil/Manifest
+++ b/dev-libs/dvutil/Manifest
@@ -1,10 +1,11 @@
 AUX dvutil-0.13.15-fix-underquoted-m4.diff 599 RMD160 30e7fb0a596b6c3910b95fd12987247c122377d2 SHA1 7ad91f6ff12a4c9cb571d470ce89e59482091b7b SHA256 d61ae51423bb73b0106645d057111108848ce20a49fee1223c7be6ff4a18556e
 AUX dvutil-0.15.5-missing_includes.patch 404 RMD160 830adaa98c97047c46ca8b8c1a6a827d5146ea55 SHA1 d53919166edc7f5474a8713d0c597d4e17adaad6 SHA256 758d67c43e9c55315ba3bee7505de1a084c0df01e71f06dcf93f7725de378225
+AUX dvutil-1.0.5-gcc44.patch 1098 RMD160 f7a1bb005a05faab21267852e98925e59325862b SHA1 c83160360b716a7bc6087ce1171f9a28af09e7f9 SHA256 3556be71c18c3b9ab00f544f5be57e25ca8733b91792ab7f8f87a068c0aba991
 DIST dvutil-0.13.15.tar.gz 958463 RMD160 8fa6fb0099d570fd8b561eed2d14337fc378e177 SHA1 68a73cb77b24f78a246c216f81e3302e97371e82 SHA256 b2fef7921c417b7e77439d4fa3a85505982d5bf1c0bf700b6395990e41bc8459
 DIST dvutil-0.15.5.tar.gz 956808 RMD160 9b782cae387e441e534a5e42541d1ee0e63d0983 SHA1 9dafc4a2a5e85c10af82bdca3e5eb11732d9f6a4 SHA256 86f4372168d802be33411e3db0658f9c4e0db7f3575a228e27ab571ffb7f27ed
 DIST dvutil-1.0.5.tar.gz 2292823 RMD160 1810bbac32f2970e7738f834045f905c8923fd01 SHA1 4860ab6b4cc6814ea3618b7ddd43db304ad35506 SHA256 d1ffe167ff65b18f935f84be3f2ee9acf7660954de047339e1cb1c04a95b6c14
 EBUILD dvutil-0.13.15-r2.ebuild 1000 RMD160 b0448721a7cc1cfd2ec20a41ecc85c08d65b44b7 SHA1 3d0bd7786fe444ff330e24859496421e73eb9cc8 SHA256 5992445459f3ce3344a689b49b0d0cf5798917e6667eb9e8a11fbe4955be8901
 EBUILD dvutil-0.15.5.ebuild 1269 RMD160 3f7a6207538d646ab8ef6c0b239570105712c3fe SHA1 8a1999d8ad9687351f9077aebe57aa6ef6d930a6 SHA256 4c514397deb7fe5e1d05ecb96052ab463aeb203a1cbf603f8dffd171045e8a02
-EBUILD dvutil-1.0.5.ebuild 1217 RMD160 630e57d142c85aadda3deaa77c7fad10d0d4eae7 SHA1 b053a511c3a858cebc8844ffd0fb4f9576601470 SHA256 e62f79c675194ba6309d68d4eb064f8a790c72bd4f5254ae5f0838b5838e2dfa
-MISC ChangeLog 5404 RMD160 cd0416e36dbe72487ef6391551154663d3c1faf6 SHA1 61c29a2d28915fdee4c7afc155f931088abd6777 SHA256 d7127fd8e16a51397327a255b1aaebd18ab44f4f8c2ad2a12a6e7c5358d34e77
+EBUILD dvutil-1.0.5.ebuild 1256 RMD160 4b4267bc032865db6c69f2b795e7eba1ecc10dc3 SHA1 acbb8e4f87109e3096aa96fff6f0f2fd3532bf3c SHA256 50aa5d56747e4eb6aa746d889dc86ff5758d323e0e43be6aaa60200d25e357a8
+MISC ChangeLog 5574 RMD160 cca009bf612c77239a82bfe75daed5c7b2146ba1 SHA1 245618bf1fb871650db3d1bc544b432fae96d676 SHA256 99ab25b21d299a26f063a1e29f41895ee7c499a6d6a0bb1c562707c8d065afa6
 MISC metadata.xml 157 RMD160 1a16d7c8813911ff609857e1d437b678c924114c SHA1 c82a897a9ef30c4e459bcb4ce934e0a966c11d4d SHA256 e44459c87638f81370c6caee91f75bf864c56875d2b17f69ec7473c81ff58f9f

diff --git a/dev-libs/dvutil/dvutil-1.0.5.ebuild b/dev-libs/dvutil/dvutil-1.0.5.ebuild
index 8115f510bef11406c9eb359ea6abf413c2cd4500..22527ae3618f968aaa450f9bd0d3a6978f8fa769 100644 (file)
--- 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 (file)
index 0000000..456bfb0
--- /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.