From: Fabian Groffen <grobian@gentoo.org>
Date: Wed, 19 May 2010 20:38:58 +0000 (+0000)
Subject: Fixed compilation on Darwin 8 (OSX 10.4) by not defining _XOPEN_SOURCE at all.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=18089b37472e98da9b1577885e501408d982c932;p=gentoo.git

Fixed compilation on Darwin 8 (OSX 10.4) by not defining _XOPEN_SOURCE at all.
Package-Manager: portage-2.2.00.15842-prefix/cvs/Darwin powerpc
---

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 6d2ac48f4b20..705979b9c8bf 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.231 2010/05/17 22:43:53 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.232 2010/05/19 20:38:58 grobian Exp $
+
+  19 May 2010; Fabian Groffen <grobian@gentoo.org> poppler-0.12.4-r3.ebuild:
+  Fixed compilation on Darwin 8 (OSX 10.4) by not defining _XOPEN_SOURCE at
+  all.
 
   17 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
   -poppler-0.12.3-r6.ebuild, -poppler-0.12.4-r2.ebuild,
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 28ab212c2f5c..b92d9cfa6148 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -12,6 +12,6 @@ AUX poppler-0.12.4-xopen_source.patch 1878 RMD160 13541fb85dec76297d1d35c9591c1f
 DIST poppler-0.12.3.tar.gz 1616883 RMD160 a8fd07ec4dc918cc17390a5236aff9a43e1f7253 SHA1 bce8b675fb7c22d507b1965efa7bd71d9ce09460 SHA256 7a4ffe6d2950c446c285700d3b2dc399540a27ce635dd712aff646f02f8dfbcc
 DIST poppler-0.12.4.tar.gz 1674400 RMD160 9c212ebb8fc3d4cbc532f1c826428cc4d195cb5b SHA1 306507e0fbf47736b456218618f043a216c263ef SHA256 2afa2a54bd4ccb09e92f82b64bcafa95d39a404a3b3db9d6a5fcad0e0229857a
 EBUILD poppler-0.12.3-r3.ebuild 2747 RMD160 3b9629709338dc993c64423268f90af4d530421a SHA1 272b0a771c3a713d1ec925d3d715f17445e1ec53 SHA256 e4e21785e8ddb4b693ad12a0a59a1aad1fa1d4f61267b5b884cb7dca8f873ab1
-EBUILD poppler-0.12.4-r3.ebuild 3102 RMD160 2509faf958ab5251d705f714e9f17f614c0ecfb4 SHA1 dcc03c5b28481f931a689d7b51c2528c8d695562 SHA256 17b5f5bb244bfe62c05b1a3cbd01ca52670ba1f41e113bab00775b443097b565
-MISC ChangeLog 33298 RMD160 01273c285ccca698d8f4b70c2f41a5377883002f SHA1 e3e81df4717aa575a969d830b7207ecde2431139 SHA256 3f51dd87f2d3cdecbd68cd268a7b031b61cf648a61dfe89b2724500afa7f37f2
+EBUILD poppler-0.12.4-r3.ebuild 3415 RMD160 c678ca86a4cbad129b37b097f0afb803eb00b2ba SHA1 812fd817153cba8a3296995c5cfa5e9db8954583 SHA256 5842cb1c196762764824a1d606da1aed8554cd0711fd3b94f1930ff7fc42d14e
+MISC ChangeLog 33458 RMD160 316ce3bd92839faeeb359074e56dd1b424b4b04b SHA1 6f79718781c5caa0dee1e90e61393458ec430669 SHA256 223fad7ce9f310af3943e426e3b7b7e314625059d96bc684e6b0972c59686e02
 MISC metadata.xml 662 RMD160 b2bfa73aa44dfcdd9174ab7ae7e210957dd1dead SHA1 c53dbd326209bbbd743a539c08a07bb4d045507b SHA256 484bd11aa8a96c00b419805d8ca7537ac1adb99385894ff0f3d6cb7f8d1cc3ae
diff --git a/app-text/poppler/poppler-0.12.4-r3.ebuild b/app-text/poppler/poppler-0.12.4-r3.ebuild
index 1e699e033882..915c9700eade 100644
--- a/app-text/poppler/poppler-0.12.4-r3.ebuild
+++ b/app-text/poppler/poppler-0.12.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild,v 1.2 2010/05/17 22:43:53 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild,v 1.3 2010/05/19 20:38:58 grobian Exp $
 
 EAPI="2"
 
@@ -59,6 +59,11 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.12.4-nanosleep-rt.patch
 	epatch "${FILESDIR}"/${PN}-0.12.4-strings_h.patch #314925
 	epatch "${FILESDIR}"/${PN}-0.12.4-xopen_source.patch #314925
+	# The whole _XOPEN_SOURCE thing breaks Tiger (kinda sad they dished
+	# configure, since it typically is good at knowing this), I need to take
+	# this upstream still, configure and cmake conflict in this regard.
+	[[ ${CHOST} == *-darwin8 ]] && \
+		sed -i -e '/add_definitions/d' cmake/modules/PopplerMacros.cmake 
 }
 
 src_configure() {