diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2010-04-07 21:50:49 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2010-04-07 21:50:49 +0000 |
| commit | c88553515121ef208c431ec4e7c75f210ed0feb8 (patch) | |
| tree | 2498ad8ae84a000167245605e0fbff0461eedb0c /x11-libs/libXpm | |
| parent | Bug #313747 - Fix grammar in pam description. Thanks to Bartłomiej Majka (diff) | |
| download | historical-c88553515121ef208c431ec4e7c75f210ed0feb8.tar.gz historical-c88553515121ef208c431ec4e7c75f210ed0feb8.tar.bz2 historical-c88553515121ef208c431ec4e7c75f210ed0feb8.zip | |
x11-libs/libXpm: fix building in solaris prefix, bug #303197
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'x11-libs/libXpm')
| -rw-r--r-- | x11-libs/libXpm/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/libXpm/Manifest | 14 | ||||
| -rw-r--r-- | x11-libs/libXpm/libXpm-3.5.8.ebuild | 12 |
3 files changed, 17 insertions, 15 deletions
diff --git a/x11-libs/libXpm/ChangeLog b/x11-libs/libXpm/ChangeLog index 5978204fced6..266cb0cd5c20 100644 --- a/x11-libs/libXpm/ChangeLog +++ b/x11-libs/libXpm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/libXpm # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/ChangeLog,v 1.65 2010/02/25 07:31:11 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/ChangeLog,v 1.66 2010/04/07 21:50:49 chithanh Exp $ + + 07 Apr 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + libXpm-3.5.8.ebuild: + Fix building in solaris prefix, bug #303197 25 Feb 2010; Jonathan Callen <abcd@gentoo.org> libXpm-3.5.8.ebuild: Transfer prefix keywords (no other changes) diff --git a/x11-libs/libXpm/Manifest b/x11-libs/libXpm/Manifest index 704f537200b7..062cd2b55da3 100644 --- a/x11-libs/libXpm/Manifest +++ b/x11-libs/libXpm/Manifest @@ -1,14 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - DIST libXpm-3.5.8.tar.bz2 392021 RMD160 3b2bd291c0037d646042cb502dfffa1ee62c237e SHA1 3bfc833ed4527f74b1c66c386da62271d0313413 SHA256 02a77aaa32e6e335e1ee04aeb9ad1008045d98274d64ed33bc5fc6c3a3542c4c -EBUILD libXpm-3.5.8.ebuild 640 RMD160 f13480afcf134ccdc2146d40b24edd735f8d133e SHA1 93fc0b84933062bb290b9b552973f5649924aca4 SHA256 094a66f8d6983622209af0b25f2e7d18581ba7b7478980205fc68f852b60e577 -MISC ChangeLog 6908 RMD160 5317cc275801b1464322bcf565f9a095adeeff7c SHA1 b91d2db77fdd5c018d71e7e1145d7aab27a33c8d SHA256 dc3b2f6518a8652bde5acd116c8d3ee89eea2b2b27e3d4c4ebab908678e817da +EBUILD libXpm-3.5.8.ebuild 942 RMD160 f98b426aae8ec45b27714d19e8f27da2643021a0 SHA1 ee73902edf7802467e239746e6e24450e7aefde6 SHA256 b5d03aba0184662ba7ac0505cec3dc1c92c2a87c8fa96034f803031e8916347f +MISC ChangeLog 7051 RMD160 9c80f6393c3277ba1d6c0891914dfba4cba5c6a4 SHA1 aa38aaec6fddb377e51f029ebc53ad530944347f SHA256 3b5bc7f696aabb0ab670e297c201eda8a42bce0f2b8e2509afbeb3a36bbf55ee MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAkuGJ0UACgkQOypDUo0oQOocGgCeN47Cz2Ro/SYum6rQLRjcEKpl -O4EAoL0lx+A7u7QFoouYo5JeDtPcwF/h -=U3UR ------END PGP SIGNATURE----- diff --git a/x11-libs/libXpm/libXpm-3.5.8.ebuild b/x11-libs/libXpm/libXpm-3.5.8.ebuild index 76038bc27272..243362cb6382 100644 --- a/x11-libs/libXpm/libXpm-3.5.8.ebuild +++ b/x11-libs/libXpm/libXpm-3.5.8.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/libXpm-3.5.8.ebuild,v 1.12 2010/02/25 07:31:11 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/libXpm-3.5.8.ebuild,v 1.13 2010/04/07 21:50:49 chithanh Exp $ -inherit x-modular +inherit x-modular flag-o-matic DESCRIPTION="X.Org Xpm library" @@ -15,3 +15,11 @@ RDEPEND="x11-libs/libX11 DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) x11-proto/xproto" + +src_compile() { + # the gettext configure check and code in sxpm are incorrect; they assume + # gettext being in libintl, whereas Solaris has gettext by default + # resulting in libintl not being added to LIBS + [[ ${CHOST} == *-solaris* ]] && append-libs -lintl + x-modular_src_compile +} |