diff options
| author |   Markus Duft <mduft@gentoo.org> | 2011-06-15 11:46:32 +0000 |
|---|---|---|
| committer | Markus Duft <mduft@gentoo.org> | 2011-06-15 11:46:32 +0000 |
| commit | b5dd067913836ce632375714cf84ad82b29eaafb (patch) | |
| tree | c876c473d49e4441bf103f7a21f186c72db7a6e2 /x11-apps | |
| parent | Fix eventlog dependency, bug 371737. (diff) | |
| download | historical-b5dd067913836ce632375714cf84ad82b29eaafb.tar.gz historical-b5dd067913836ce632375714cf84ad82b29eaafb.tar.bz2 historical-b5dd067913836ce632375714cf84ad82b29eaafb.zip | |
add ~x86-interix fix
Package-Manager: portage-2.2.01.18826-prefix/cvs/Linux i686
Diffstat (limited to 'x11-apps')
| -rw-r--r-- | x11-apps/xwininfo/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-apps/xwininfo/Manifest | 4 | ||||
| -rw-r--r-- | x11-apps/xwininfo/xwininfo-1.1.1.ebuild | 12 |
3 files changed, 16 insertions, 5 deletions
diff --git a/x11-apps/xwininfo/ChangeLog b/x11-apps/xwininfo/ChangeLog index 1c010342c207..a922464d6b49 100644 --- a/x11-apps/xwininfo/ChangeLog +++ b/x11-apps/xwininfo/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-apps/xwininfo # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwininfo/ChangeLog,v 1.60 2011/02/14 18:58:29 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwininfo/ChangeLog,v 1.61 2011/06/15 11:46:32 mduft Exp $ + + 14 Jun 2011; Markus Duft <mduft@gentoo.org> xwininfo-1.1.1.ebuild: + fixed build for interix with broken iconv in libc 14 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org> xwininfo-1.1.1.ebuild: ppc stable wrt #344827, #354237 diff --git a/x11-apps/xwininfo/Manifest b/x11-apps/xwininfo/Manifest index 3a8dc5907cd4..4355e337ea92 100644 --- a/x11-apps/xwininfo/Manifest +++ b/x11-apps/xwininfo/Manifest @@ -1,4 +1,4 @@ DIST xwininfo-1.1.1.tar.bz2 130083 RMD160 7b9e690f271ea5802d7672b93b6514d4e09e5834 SHA1 945e5d51632876e304e001003c8068f34ffe299e SHA256 645a57be4870fb6aba459e7dc96f4d8eaafa3b31bbcd42c997ac4cb021a2343d -EBUILD xwininfo-1.1.1.ebuild 571 RMD160 bfdb71efc0a413c480b7753e7bf6ea003c6eb1db SHA1 decaab62a55626607e1d5bb60d043a3f5d74bcca SHA256 81cc4f9f8b2a684f2a877a900de47391e35dbb5ab5f4767d85fd90a648520227 -MISC ChangeLog 7078 RMD160 46f6fcf67394d13e61291e8a6a44cffb6ea5facc SHA1 f773b238ee3069d9bb1e67d1c01649caff8a951c SHA256 d2f46800c30dcf57cd304895b497e29c6bee24377591d93cb9600b50f5497d12 +EBUILD xwininfo-1.1.1.ebuild 834 RMD160 369908e4c84377ee11f096079171dd793e1c38f7 SHA1 46317d74ceaf478b1b28c2f59a8ce24c76f96fb5 SHA256 8ec65e96cea9628e99e1037d4ff409d90bac895b8892a329673ca049cf8f6f08 +MISC ChangeLog 7195 RMD160 6275e5d7de808d52e784edb617241d703db54218 SHA1 f832570b8b01efc5e03d36d3cd982a461a296bee SHA256 695451b062dec45590bf26c08f49536e7c3f19339bf7976b051f04ef624a1eed MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 diff --git a/x11-apps/xwininfo/xwininfo-1.1.1.ebuild b/x11-apps/xwininfo/xwininfo-1.1.1.ebuild index a3c0dd8b6dd9..d4ddc4064f5c 100644 --- a/x11-apps/xwininfo/xwininfo-1.1.1.ebuild +++ b/x11-apps/xwininfo/xwininfo-1.1.1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwininfo/xwininfo-1.1.1.ebuild,v 1.9 2011/02/14 18:58:29 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwininfo/xwininfo-1.1.1.ebuild,v 1.10 2011/06/15 11:46:32 mduft Exp $ EAPI=3 -inherit xorg-2 +inherit xorg-2 flag-o-matic DESCRIPTION="window information utility for X" @@ -15,3 +15,11 @@ RDEPEND=">=x11-libs/libxcb-1.6 x11-libs/libX11" DEPEND="${RDEPEND} >=x11-proto/xproto-7.0.17" + +pkg_setup() { + # interix has a _very_ old iconv in libc, however, including + # iconv.h redefines those symbols to libiconv_*, which then + # are unresolved, as the configure check is old and dumb. + [[ ${CHOST} == *-interix* ]] && + append-libs -liconv +} |