diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2010-06-08 12:17:09 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2010-06-08 12:17:09 +0000 |
| commit | e5464826f60624db004c1cd296f69c6ae6d281cc (patch) | |
| tree | 2fe42f0f8bf584e8d04fd738b2dadac0f045b09d /app-text | |
| parent | Add docbook-xml-dtd:4.1.2 to DEPEND, bug #317263. (diff) | |
| download | historical-e5464826f60624db004c1cd296f69c6ae6d281cc.tar.gz historical-e5464826f60624db004c1cd296f69c6ae6d281cc.tar.bz2 historical-e5464826f60624db004c1cd296f69c6ae6d281cc.zip | |
Don't define _XOPEN_SOURCE on Solaris either, such that we can compile there too.
Package-Manager: portage-2.2.00.15842-prefix/cvs/SunOS i386
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/poppler/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/poppler/Manifest | 4 | ||||
| -rw-r--r-- | app-text/poppler/poppler-0.12.4-r3.ebuild | 9 |
3 files changed, 11 insertions, 8 deletions
diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog index 705979b9c8bf..cce6c70314dd 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.232 2010/05/19 20:38:58 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.233 2010/06/08 12:17:08 grobian Exp $ + + 08 Jun 2010; Fabian Groffen <grobian@gentoo.org> poppler-0.12.4-r3.ebuild: + Don't define _XOPEN_SOURCE on Solaris either, such that we can compile + there too. 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 diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index d807ed418f66..9f7153ce194a 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 3414 RMD160 f44aa596b639a2d1ec7dac010642632a78801221 SHA1 9cc7a1ceb1914c5b900b21273d0187f6ba0614d7 SHA256 f7f89c1a7fc69144186b24b21eeb8dde0077ef0374373e7253000eddb0eb43ab -MISC ChangeLog 33458 RMD160 316ce3bd92839faeeb359074e56dd1b424b4b04b SHA1 6f79718781c5caa0dee1e90e61393458ec430669 SHA256 223fad7ce9f310af3943e426e3b7b7e314625059d96bc684e6b0972c59686e02 +EBUILD poppler-0.12.4-r3.ebuild 3375 RMD160 2511510726d378d73c796a370299b00d575bdba4 SHA1 e43b0ff6da13d1223f2435633904bbc3ecb41175 SHA256 e3bcd3a230ad135cfcddf833a8e89329740a8986959d4b0e94d08c0a2bb3cb45 +MISC ChangeLog 33622 RMD160 7e9a97827183f64e97933a5f520ff9503d0d14c1 SHA1 9e43a0a65a407793e8c2317310aed8142f81c6d4 SHA256 6a9b60460a7c542a1a342b135ec5d8fef2e931eea95abb8f355939d1e1a9d4a7 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 f6b6a5dfff30..c42738830572 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.4 2010/05/19 20:39:53 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild,v 1.5 2010/06/08 12:17:09 grobian Exp $ EAPI="2" @@ -59,10 +59,9 @@ 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 ]] && \ + # The whole _XOPEN_SOURCE thing breaks OSX Tiger and Solaris, I need to + # take this upstream still, configure and cmake conflict in this regard. + [[ ${CHOST} == *-darwin8 || ${CHOST} == *-solaris* ]] && \ sed -i -e '/add_definitions/d' cmake/modules/PopplerMacros.cmake } |