Non-maintainer commit: fix build on modern glibc versions (bug #543624, thanks to Andreas Plesch et al.)

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)

4 files changed, 33 insertions, 7 deletions

diff --git a/sci-geosciences/gmt/ChangeLog b/sci-geosciences/gmt/ChangeLog
index af9de39ac8b2..b0fee50d213b 100644
--- a/sci-geosciences/gmt/ChangeLog
+++ b/sci-geosciences/gmt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/gmt
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/ChangeLog,v 1.30 2013/02/02 06:40:13 patrick Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/ChangeLog,v 1.31 2015/07/18 20:10:44 tetromino Exp $
+
+  18 Jul 2015; Alexandre Rostovtsev <tetromino@gentoo.org> gmt-4.5.6.ebuild,
+  gmt-4.5.9.ebuild, +files/gmt-4.5.9-unistd.h.patch:
+  Non-maintainer commit: fix build on modern glibc versions (bug #543624,
+  thanks to Andreas Plesch et al.)
 
 *gmt-4.5.9 (02 Feb 2013)
 
diff --git a/sci-geosciences/gmt/files/gmt-4.5.9-unistd.h.patch b/sci-geosciences/gmt/files/gmt-4.5.9-unistd.h.patch
new file mode 100644
index 000000000000..e724b4ceab79
--- /dev/null
+++ b/sci-geosciences/gmt/files/gmt-4.5.9-unistd.h.patch
@@ -0,0 +1,19 @@
+Fix "gmtdigitize.c:77:2: error: unknown type name 'gid_t'"
+build failure; patch from upstream version 4.5.11
+
+https://bugs.gentoo.org/show_bug.cgi?id=543624
+
+--- a/src/misc/gmtdigitize.c
++++ b/src/misc/gmtdigitize.c
+@@ -37,6 +37,11 @@
+  *
+  */
+  
++#define _XOPEN_SOURCE
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++
+ #include "gmt.h"
+ 
+ #ifndef WIN32
diff --git a/sci-geosciences/gmt/gmt-4.5.6.ebuild b/sci-geosciences/gmt/gmt-4.5.6.ebuild
index d6082c5096f4..f70f40fbed23 100644
--- a/sci-geosciences/gmt/gmt-4.5.6.ebuild
+++ b/sci-geosciences/gmt/gmt-4.5.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/gmt-4.5.6.ebuild,v 1.6 2012/06/16 16:57:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/gmt-4.5.6.ebuild,v 1.7 2015/07/18 20:10:44 tetromino Exp $
 
 EAPI=4
 
@@ -49,7 +49,8 @@ src_prepare() {
 
 	epatch \
 		"${FILESDIR}/${PN}-4.5.0-no-strip.patch" \
-		"${FILESDIR}/${PN}-4.5.6-respect-ldflags.patch"
+		"${FILESDIR}/${PN}-4.5.6-respect-ldflags.patch" \
+		"${FILESDIR}"/${PN}-4.5.9-unistd.h.patch
 
 	eautoreconf
 }
diff --git a/sci-geosciences/gmt/gmt-4.5.9.ebuild b/sci-geosciences/gmt/gmt-4.5.9.ebuild
index 4eba3599b40b..6d139eedb89c 100644
--- a/sci-geosciences/gmt/gmt-4.5.9.ebuild
+++ b/sci-geosciences/gmt/gmt-4.5.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/gmt-4.5.9.ebuild,v 1.1 2013/02/02 06:40:13 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/gmt-4.5.9.ebuild,v 1.2 2015/07/18 20:10:44 tetromino Exp $
 
 EAPI=4
 
@@ -42,6 +42,7 @@ MAKEOPTS+=" -j1"
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.5.9-no-strip.patch
 	"${FILESDIR}"/${PN}-4.5.6-respect-ldflags.patch
+	"${FILESDIR}"/${PN}-4.5.9-unistd.h.patch
 	)
 
 AUTOTOOLS_IN_SOURCE_BUILD=1