diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2011-08-05 21:02:42 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2011-08-05 21:02:42 +0000 |
| commit | 43633ed68be9b6d9c925d2b5ac798c6a53f0b205 (patch) | |
| tree | 74fbc0652a8c1f211df07256e152a593fd519552 /sys-apps | |
| parent | Make compatible with system miniupnpc-1.6, bug #376795 wrt Oleg. (diff) | |
| download | historical-43633ed68be9b6d9c925d2b5ac798c6a53f0b205.tar.gz historical-43633ed68be9b6d9c925d2b5ac798c6a53f0b205.tar.bz2 historical-43633ed68be9b6d9c925d2b5ac798c6a53f0b205.zip | |
Fix linking with static bzip2 (from freetype) when building tuxonice userui with fbsplash enabled, see bug #375243.
Package-Manager: portage-2.1.10.9/cvs/Linux x86_64
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/tuxonice-userui/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-apps/tuxonice-userui/Manifest | 22 | ||||
| -rw-r--r-- | sys-apps/tuxonice-userui/tuxonice-userui-1.0.ebuild | 7 |
3 files changed, 23 insertions, 15 deletions
diff --git a/sys-apps/tuxonice-userui/ChangeLog b/sys-apps/tuxonice-userui/ChangeLog index e187e9cfba02..518339d48a80 100644 --- a/sys-apps/tuxonice-userui/ChangeLog +++ b/sys-apps/tuxonice-userui/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/tuxonice-userui -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/ChangeLog,v 1.19 2010/12/26 09:29:06 nelchael Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/ChangeLog,v 1.20 2011/08/05 21:02:42 nelchael Exp $ + + 05 Aug 2011; Krzysztof Pawlik <nelchael@gentoo.org> + tuxonice-userui-1.0.ebuild: + Fix linking with static bzip2 (from freetype) when building tuxonice userui + with fbsplash enabled, see bug #375243. 26 Dec 2010; Krzysztof Pawlik <nelchael@gentoo.org> tuxonice-userui-1.0.ebuild: diff --git a/sys-apps/tuxonice-userui/Manifest b/sys-apps/tuxonice-userui/Manifest index 7a7adb7fdc26..56f3cc488c41 100644 --- a/sys-apps/tuxonice-userui/Manifest +++ b/sys-apps/tuxonice-userui/Manifest @@ -1,19 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX tuxonice-userui-1.0-Makefiles.patch 1438 RMD160 4178677bbf596c2db145dfc4de8bf6840ac7a5b5 SHA1 7f4a0894eba5463757d1f6a8918bd0f70fd620da SHA256 a615252845a09af805b12c987cad459162dc98b6987c25123e68113d12339223 DIST tuxonice-userui-1.0.tar.gz 66922 RMD160 b6e7708e5f1f3368c96833346e19d2c9127a99c5 SHA1 31f0bf3f7dff1d8eff153e5027886bee677e181d SHA256 2da4a5eb4597fce89a43cac5e794e19a000e324a5873a54c6b0848e1b481942f -EBUILD tuxonice-userui-1.0.ebuild 1590 RMD160 53fe178713b5834b742bdd7dead68ebbcc0a0fe9 SHA1 aef983ad7e715ef274a644e5ce60d95b730023ed SHA256 6fb721dc09c2257e42c1c9cffe4c9857af9d4c3337b06568bc79311b59189c8c -MISC ChangeLog 7657 RMD160 f37c5cafc23525196f2674ad2458071468b8f71a SHA1 87c65140974202e9bc0cf315888baeb60e2f9fbc SHA256 a54df9c80bd852aa97d5a9e7c72d609179e96bc37d16b1bf57f7c2bfde190dca +EBUILD tuxonice-userui-1.0.ebuild 1682 RMD160 e8faed8f9e5d0ead8fc0e4ee6228a31e63d4cd83 SHA1 186f37e9b9bd6792728af5bee42df54afe186d0b SHA256 b424d2830862e5b86d03cc9e7d8006088658a3b30d5df7d62216ab2248e1a5d6 +MISC ChangeLog 7862 RMD160 e411979bc67d95990a0c4fb6926be6dbf398ab91 SHA1 fd31135e0e04db657f989d13898e235d09beb652 SHA256 1ff0b2820853fd446c8cfee47e99bf91f91993cb18578cdedda91248ef2d724b MISC metadata.xml 339 RMD160 fb235b57aa04c8d6aed76a25d85f1c4af05286ff SHA1 2667b453daf29896079179e8aea974a96d0dc1f4 SHA256 1fb14f262f3b9470228ed11d8f9e05ed83a10f4dd643cea230075b9a33d873a4 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iQEcBAEBAgAGBQJNFwr2AAoJEBZyv1r2qA5GyLwH/0JQ5fD0Htk7hRAsYaxsutm2 -5VsfrBUj7XnYRo9KV8a+FCY5lei6jCPCTuodGrhJpBbvPnRUxSPSyUlR23FYGYSM -ZfkfZrUn1IytQ+2mZUcXmlh9WMihcpafsMptFnyzZrP2PlHH8QLPJTYEJEyFuz8g -DrN6RgJao+zIa9fEdsQ7IoIXPKTX8yD8hPi8OV4usFC1wPNSBgpERUxjEjlbJFrJ -/TAhu/1wpL4+z6kZVKRDedmO09Dfeos/pxhVgy4dsARHnUPCdHrbRWVpFvFUMLwD -E2gwQVHdp1Q9buQlPKcIsmNbMdQkzF1fxHo4zGikHEXPUqS4VODoyjOpgdyJ5yM= -=ry50 +iQEcBAEBCgAGBQJOPFp8AAoJEBZyv1r2qA5GSPUIAIyRc9RCPKL/Oqsdms686ZLg +ppgvebonbXpzmzRkjArl2he9ZpzBsjBGIDg5OH2OhFpw1mFO1D33+E4a5ymsvr2J +QgYiuOqZKF8r/dDZzxBRELDgUrejVVdQoVv0R9ADzUqmSEEIJYWOjdRlTUgHWV3I +6DX2t+UvE2KILonqce3F8HcYOPpVpUqIGQdZqjFHF0gv/Fvbw2Da3ZZ0IR0kGCqf +TgOepJX6ho+24vJI8kqj6EKTENg10+ULcyDLnXnj0KnkKWcxUhrvpRaE8RvBkvO0 +PnqCFNmqdl99hEgWID/PSfdNoSqegSxwfF3Rp6QB7OQG2Xtw0KRUJvYmHfli/2o= +=KJql -----END PGP SIGNATURE----- diff --git a/sys-apps/tuxonice-userui/tuxonice-userui-1.0.ebuild b/sys-apps/tuxonice-userui/tuxonice-userui-1.0.ebuild index bdd288d4f071..8bfe582d0edf 100644 --- a/sys-apps/tuxonice-userui/tuxonice-userui-1.0.ebuild +++ b/sys-apps/tuxonice-userui/tuxonice-userui-1.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/tuxonice-userui-1.0.ebuild,v 1.6 2010/12/26 09:29:06 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/tuxonice-userui-1.0.ebuild,v 1.7 2011/08/05 21:02:42 nelchael Exp $ EAPI="2" @@ -19,11 +19,14 @@ DEPEND="fbsplash? ( >=media-gfx/splashutils-1.5.2.1 media-libs/libmng[lcms] || ( >=media-libs/libpng-1.4.4[static-libs] <media-libs/libpng-1.4.4:0 ) + app-arch/bzip2[static] media-libs/lcms:0[static-libs] )" RDEPEND="${DEPEND}" src_prepare() { epatch "${FILESDIR}/${P}-Makefiles.patch" + + sed -i -e 's/-lfreetype/-lfreetype -lbz2/' "${S}/Makefile" || die } src_compile() { |