summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Arnold <nerdboy@gentoo.org>2009-07-18 18:53:13 +0000
committerSteve Arnold <nerdboy@gentoo.org>2009-07-18 18:53:13 +0000
commit094090b46f79b7bd371076e3c2a06bb76b768b7b (patch)
tree6a1f37f5282d3ebbe26ebdbbf0079732e6223fd8 /sci-libs
parentUnmask net-print/pnm2ppa by multiple user requests at bug 248171. (diff)
downloadgentoo-2-094090b46f79b7bd371076e3c2a06bb76b768b7b.tar.gz
gentoo-2-094090b46f79b7bd371076e3c2a06bb76b768b7b.tar.bz2
gentoo-2-094090b46f79b7bd371076e3c2a06bb76b768b7b.zip
Updated with patch for gcc 4.4 include and string changes (bug #276740).
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/libdap/ChangeLog6
-rw-r--r--sci-libs/libdap/files/libdap-3.9.2-gcc-4.4.patch26
-rw-r--r--sci-libs/libdap/libdap-3.9.2.ebuild4
3 files changed, 34 insertions, 2 deletions
diff --git a/sci-libs/libdap/ChangeLog b/sci-libs/libdap/ChangeLog
index 40074906e731..2f66a98f18bf 100644
--- a/sci-libs/libdap/ChangeLog
+++ b/sci-libs/libdap/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/libdap
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libdap/ChangeLog,v 1.4 2009/05/03 03:30:29 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libdap/ChangeLog,v 1.5 2009/07/18 18:53:13 nerdboy Exp $
+
+ 18 Jul 2009; Steve Arnold <nerdboy@gentoo.org>
+ +files/libdap-3.9.2-gcc-4.4.patch, libdap-3.9.2.ebuild:
+ Updated with patch for gcc 4.4 include and string changes (bug #276740).
03 May 2009; Steve Arnold <nerdboy@gentoo.org> libdap-3.8.2.ebuild,
libdap-3.9.2.ebuild:
diff --git a/sci-libs/libdap/files/libdap-3.9.2-gcc-4.4.patch b/sci-libs/libdap/files/libdap-3.9.2-gcc-4.4.patch
new file mode 100644
index 000000000000..ac7e856c41c0
--- /dev/null
+++ b/sci-libs/libdap/files/libdap-3.9.2-gcc-4.4.patch
@@ -0,0 +1,26 @@
+--- util_mit.cc.orig 2009-07-18 11:29:06.529751581 -0700
++++ util_mit.cc 2009-07-18 11:30:08.898000932 -0700
+@@ -34,6 +34,7 @@
+ };
+
+ #include <cstring>
++#include <cstdio>
+ #include <cstdlib>
+ #include <string>
+ #include <ctype.h>
+@@ -59,13 +60,13 @@
+
+ namespace libdap {
+
+-static char * months[12] =
++static const char * months[12] =
+ {
+ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+ };
+
+ #ifndef HAVE_STRFTIME
+-static char * wkdays[7] =
++static const char * wkdays[7] =
+ {
+ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+ };
diff --git a/sci-libs/libdap/libdap-3.9.2.ebuild b/sci-libs/libdap/libdap-3.9.2.ebuild
index 779d90154f90..ceac7e6cdaa4 100644
--- a/sci-libs/libdap/libdap-3.9.2.ebuild
+++ b/sci-libs/libdap/libdap-3.9.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libdap/libdap-3.9.2.ebuild,v 1.4 2009/05/03 03:30:29 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libdap/libdap-3.9.2.ebuild,v 1.5 2009/07/18 18:53:12 nerdboy Exp $
inherit autotools eutils flag-o-matic
@@ -27,6 +27,8 @@ src_unpack() {
cd "${S}"
eaclocal
eautoreconf
+
+ epatch "${FILESDIR}"/${P}-gcc-4.4.patch
}
src_compile() {