Add patch by MATSUI Tetsushi to fix compilation on Darwin, bug #369363

Package-Manager: portage-2.2.01.19074-prefix/cvs/Darwin i386

diff --git a/app-text/dvipng/ChangeLog b/app-text/dvipng/ChangeLog
index d5f125272a5f0a71cb811071630726e13145c16e..583ead147f8b312334c456dd64b598bc2887b188 100644 (file)
--- a/app-text/dvipng/ChangeLog
+++ b/app-text/dvipng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/dvipng
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dvipng/ChangeLog,v 1.76 2011/06/14 03:29:05 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvipng/ChangeLog,v 1.77 2011/08/28 13:15:15 grobian Exp $
+
+  28 Aug 2011; Fabian Groffen <grobian@gentoo.org> dvipng-1.14.ebuild,
+  +files/dvipng-1.14-wait.patch:
+  Add patch by MATSUI Tetsushi to fix compilation on Darwin, bug #369363
 
   14 Jun 2011; Matt Turner <mattst88@gentoo.org> dvipng-1.14.ebuild:
   Added ~mips, bug 342513

diff --git a/app-text/dvipng/Manifest b/app-text/dvipng/Manifest
index ff2781826c93f5f70a65127ebc2fc656ebe63e64..4f60189da6b1a34196ba2786759b24bbc92d47c8 100644 (file)
--- a/app-text/dvipng/Manifest
+++ b/app-text/dvipng/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX dvipng-1.14-wait.patch 366 RMD160 260fd608a5609ca4e5b2086cd469a80575bf17a6 SHA1 2415e3c0606ae33b282cab99f60fe8a6db699b67 SHA256 cf2d09d16b37719bc31ce552bff7c57efc9b0488865000de8c9d035f0bdd1027
 DIST dvipng-1.13.tar.gz 169309 RMD160 c615840bbc3f51cb81973e88484bc0838db1382d SHA1 626568203e3f799c99da0f3e31edecb13ce202b6 SHA256 cbbffb2769fddaeb904d255da4a09ded06699fa2c5cdc076b784645f59cfa5ab
 DIST dvipng-1.14.tar.gz 173686 RMD160 df1ac7709c7a2c81dd28bfc5cfbaf69a35ba6f64 SHA1 778c7be5378eddf23200e47d92096ffe543528b6 SHA256 43f5b57d0fab29398dcec1b849e8bebbcacb0b9c06875d2ac84a049be3c5b350
 EBUILD dvipng-1.13.ebuild 1390 RMD160 8e2571a58c0a48e2a8813dd180d3e7f629ac4f6a SHA1 bb1e1ac0f2e1fd7b27a032daaf1e5c0ed01484e4 SHA256 c5b1198d8619f0d6af83f9fa7e4d71b8764d4ba59469963d7083f2d15a17dd2f
-EBUILD dvipng-1.14.ebuild 1408 RMD160 5f66e16775f2f062c74394861c9818e17248f9f4 SHA1 62f5f5e2e3920a51d900d391034385f3b7b9cbe5 SHA256 d2b767c5085a84030fab6392646622be77faaf31354ef6ded4998b1f7771e4d0
-MISC ChangeLog 9058 RMD160 68cb106efa9dcc3848c45dc508e4d1ebd21d3d6f SHA1 9550dc914911a84a6063e9eefa24554a58894674 SHA256 904e508c00114c04195c0d237685674bac632d0060a2c520ab723b6e182c3867
+EBUILD dvipng-1.14.ebuild 1464 RMD160 3a66a508b08f9881172fd52abf4cc2e8db37dc3a SHA1 3e62a39ea4ee518726e3ff46236ab88ba0f748ed SHA256 8489db5bbe835462c24e10b24f791c47b45a3828fb901f297c621090da122d98
+MISC ChangeLog 9235 RMD160 e8853c72d9f921c4be766955cf85f19ff1ae16b6 SHA1 59017da4849548cf2217f0049e6e8450a450b08d SHA256 c484a7f6ccd2da01905c4531ce2db7fffbb5f594c7804e6a70d9d8aac054cdb6
 MISC metadata.xml 978 RMD160 3522ff15a6cdf0b14c04350fbeee273975d5f680 SHA1 c11095d27bce6c7cd632a47bcb6771c44d13845c SHA256 9efddc2ff0c676401712d76f9f0d55cbc363798273ec2344f9cdf385d65185ca
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (Darwin)
+
+iEYEARECAAYFAk5aP2kACgkQX3X2B8XHTolM7gCdFtxYFAN78hK0cAk4PNXCI18D
+yFUAn3YW/9tgR3EQW4wZv6sNCTDDI/XW
+=MRuq
+-----END PGP SIGNATURE-----

diff --git a/app-text/dvipng/dvipng-1.14.ebuild b/app-text/dvipng/dvipng-1.14.ebuild
index 65cc895916557928d9e820a4ac201cf3bea12b19..2974acd0804c0ce0795fd1bdb0d8f5080965c110 100644 (file)
--- a/app-text/dvipng/dvipng-1.14.ebuild
+++ b/app-text/dvipng/dvipng-1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dvipng/dvipng-1.14.ebuild,v 1.2 2011/06/14 03:29:05 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvipng/dvipng-1.14.ebuild,v 1.3 2011/08/28 13:15:15 grobian Exp $
 
 EAPI="2"
 inherit eutils
@@ -24,6 +24,10 @@ DEPEND="${RDEPEND}
        virtual/texi2dvi
        test? ( || ( dev-texlive/texlive-fontsrecommended app-text/ptex ) )"
 
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-wait.patch
+}
+
 src_configure() {
        if ! use t1lib; then
                # The build system autodetects libt1. We don't want that if the

diff --git a/app-text/dvipng/files/dvipng-1.14-wait.patch b/app-text/dvipng/files/dvipng-1.14-wait.patch
new file mode 100644 (file)
index 0000000..d7f629f
--- /dev/null
+++ b/app-text/dvipng/files/dvipng-1.14-wait.patch
@@ -0,0 +1,18 @@
+Patch by MATSUI Tetsushi to fix compilation issue on OSX
+
+sys/wait.h seems to be the man-page include for waitpid on Linux,
+Solaris and OSX
+
+https://bugs.gentoo.org/show_bug.cgi?id=369363
+
+--- special.c
++++ special.c
+@@ -26,7 +26,7 @@
+ 
+ #ifndef MIKTEX
+ #ifndef WIN32
+-#include <wait.h>
++#include <sys/wait.h>
+ #else /* WIN32 */
+ #include <fcntl.h>
+ #include <io.h>