diff options
author | Fabian Groffen <grobian@gentoo.org> | 2012-05-09 18:42:26 +0000 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2012-05-09 18:42:26 +0000 |
commit | 83e31f4d0c668aca4e9ba48ce0e798c88725681d (patch) | |
tree | 958e27a6c56c2e29260b028da2e42cf608e56075 /media-plugins | |
parent | Revert my commit (diff) | |
download | historical-83e31f4d0c668aca4e9ba48ce0e798c88725681d.tar.gz historical-83e31f4d0c668aca4e9ba48ce0e798c88725681d.tar.bz2 historical-83e31f4d0c668aca4e9ba48ce0e798c88725681d.zip |
Fix compilation on Solaris as per instructions in liveMedia/include/Locale.hh
Package-Manager: portage-2.2.01.20430-prefix/cvs/SunOS i386
Diffstat (limited to 'media-plugins')
-rw-r--r-- | media-plugins/live/ChangeLog | 5 | ||||
-rw-r--r-- | media-plugins/live/Manifest | 12 | ||||
-rw-r--r-- | media-plugins/live/live-2012.04.21.ebuild | 6 |
3 files changed, 13 insertions, 10 deletions
diff --git a/media-plugins/live/ChangeLog b/media-plugins/live/ChangeLog index f7d502f09648..345c512344e1 100644 --- a/media-plugins/live/ChangeLog +++ b/media-plugins/live/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-plugins/live # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/live/ChangeLog,v 1.154 2012/04/24 13:01:39 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/live/ChangeLog,v 1.155 2012/05/09 18:42:26 grobian Exp $ + + 09 May 2012; Fabian Groffen <grobian@gentoo.org> live-2012.04.21.ebuild: + Fix compilation on Solaris as per instructions in liveMedia/include/Locale.hh *live-2012.04.21 (24 Apr 2012) diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest index 59c7efedfb66..4c20dd30dad8 100644 --- a/media-plugins/live/Manifest +++ b/media-plugins/live/Manifest @@ -10,13 +10,13 @@ DIST live.2012.04.04.tar.gz 541301 RMD160 d37ff787c0c08566851959feb82bdc6e4e2783 DIST live.2012.04.21.tar.gz 548778 RMD160 21dab0813d56fbb02f0eaefd566b2f0557a7c136 SHA1 1028f51d6139bad5c3dc5479c229c246541661a0 SHA256 b5073bdfe615d6bf9f6fff48e9cabeb835a6286dfc0d8679853e516ed64aea81 EBUILD live-2012.01.07.ebuild 3706 RMD160 79e216bb7dfe0f538f230a36a81995817a0128fd SHA1 795c69a8726b42b7d968c22e7743325353bde5c1 SHA256 6a939b524fcf3c10dcd285445b661911e1c8f0c222c893049cf743c1fe51af33 EBUILD live-2012.04.04.ebuild 3873 RMD160 5ac82e7843863780a8f3ccdfb3970b299e607a2d SHA1 975c898965caf9392c849b4ff1d5798b4170e47d SHA256 a4744169bad50a70319e62aca1f3ac22f8872b0d431dd77f05c0cea304966232 -EBUILD live-2012.04.21.ebuild 4129 RMD160 bafc5852e9aec0e1dfd2ddecb1972bdebaafbdfd SHA1 51ee98d0452b75fde1dc957dddab576da0fd9c08 SHA256 bd31207f162848090f5c76164154e6a7b8b207a2508ba23b55e7d6160b48fccc -MISC ChangeLog 19621 RMD160 d98674b1e3cd19d2eee042b322e8dd02eb0f5c32 SHA1 1674297b0273e5ba339bd425840c9ba91ddd90e3 SHA256 c4e5235de41f5fc4d0fb28de36886b8428965e76a08d002c940ab445b178a004 +EBUILD live-2012.04.21.ebuild 4166 RMD160 4d7b52ab0e0da74503fbff7e20ec11b67f4e8523 SHA1 66bd89c8512f649e2f26214fb02eff0e491d9f3c SHA256 916f178958059b880099cf66b8b60e4c4facf0e19a19bd3e243276441debc8e9 +MISC ChangeLog 19776 RMD160 c2992546d7afadcbc698d242d287f4c04ad26c64 SHA1 f629dc89a5591dc80d7b73a5d57c5988b3668673 SHA256 cea29b3752b65ec91c7052a5969e6d8b99732f49be8c309f5e6291aa3e003ace MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.19 (SunOS) -iEYEARECAAYFAk+WpDsACgkQvFcC4BYPU0pcHQCgppd/aOPD3ULeKipH+NSnOLXQ -KKUAoJuNC+ZKMDXoF9M240wEYr+KxzbB -=xqK0 +iEYEARECAAYFAk+qupkACgkQX3X2B8XHTommMgCfUBqfqvoGqx/he2u0rS0+JyYy +V8wAnRNotQ/ACOWBLlRzqCevUYBmWN4k +=zGls -----END PGP SIGNATURE----- diff --git a/media-plugins/live/live-2012.04.21.ebuild b/media-plugins/live/live-2012.04.21.ebuild index 4b5628000153..fa348eeb6f36 100644 --- a/media-plugins/live/live-2012.04.21.ebuild +++ b/media-plugins/live/live-2012.04.21.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/live/live-2012.04.21.ebuild,v 1.1 2012/04/24 13:01:41 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/live/live-2012.04.21.ebuild,v 1.2 2012/05/09 18:42:26 grobian Exp $ EAPI=3 inherit flag-o-matic eutils toolchain-funcs multilib @@ -38,12 +38,12 @@ src_prepare() { case ${CHOST} in *-solaris*) use static-libs && { sed -i \ - -e '/^COMPILE_OPTS /s/$/ -DSOLARIS/' \ + -e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \ -e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \ live-static/config.gentoo \ || die ; } sed -i \ - -e '/^COMPILE_OPTS /s/$/ -DSOLARIS/' \ + -e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \ -e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \ live-shared/config.gentoo-so-r1 \ || die |