diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-01-16 05:12:40 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-01-16 05:12:40 +0000 |
| commit | 4946eac3ecba52ee538c5e41ab9c6337b7298816 (patch) | |
| tree | 01450a3fc64a9ebf8a7dac3a21166300c53f55ac /gnome-base | |
| parent | update of mangler to mangler-1.2.5 for bug 444046 (diff) | |
| download | historical-4946eac3ecba52ee538c5e41ab9c6337b7298816.tar.gz historical-4946eac3ecba52ee538c5e41ab9c6337b7298816.tar.bz2 historical-4946eac3ecba52ee538c5e41ab9c6337b7298816.zip | |
Fix compability with dev-libs/libcdio-paranoia wrt #452400
Package-Manager: portage-2.2.0_alpha151/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/gvfs/ChangeLog | 7 | ||||
| -rw-r--r-- | gnome-base/gvfs/Manifest | 18 | ||||
| -rw-r--r-- | gnome-base/gvfs/gvfs-1.14.2.ebuild | 13 |
3 files changed, 24 insertions, 14 deletions
diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog index e0d11bc15fda..6b353dde6ee3 100644 --- a/gnome-base/gvfs/ChangeLog +++ b/gnome-base/gvfs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for gnome-base/gvfs -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.196 2012/12/27 22:54:52 tetromino Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.197 2013/01/16 05:12:34 ssuominen Exp $ + + 16 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> gvfs-1.14.2.ebuild: + Fix compability with dev-libs/libcdio-paranoia wrt #452400 27 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gvfs-1.14.2.ebuild: Add missing gdbus-codegen dependency (bug #448916, thanks to Mark). diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest index cb686f20b2d1..38603b03fe95 100644 --- a/gnome-base/gvfs/Manifest +++ b/gnome-base/gvfs/Manifest @@ -11,17 +11,17 @@ DIST gvfs-1.14.2.tar.xz 1466384 SHA256 c3bbdac4bc89de82a2ba373799da80d24fb6a038a DIST libgcrypt.m4.bz2 1526 SHA256 ce9d04f9cbd5417e4d4ba91095c06cea4852c70d75716311e82dfc243d2f0128 SHA512 fe7916d01efb1d14c4d84ed37f3b53b04d3b005cb04b603bded8d24e147fe69a4c0823164483dba3bc95cf540eaf93a0c0ad59f29f8e1edbae9566a81be5900d WHIRLPOOL 6baa8ed005a691fb1f31ac420d801d20a1611519a38749718dcf3956557f40a058c24b988d20534a62084fadd4141c44893cfa751ebf8011cf55d83c759868dd EBUILD gvfs-1.12.3-r1.ebuild 3466 SHA256 49936d3d86dcf4ddc80a478a9db0e5586e72c73d04361b44a30fa5ec9e8362b9 SHA512 f11196389d7d79ec881662053bd1cade54107e70f88dd4e885d080ecf5f45766788e1611b8ee92099a843ff1d5ddabf480fbd72942b545f424beb8fa20ad7ac5 WHIRLPOOL 1bc644a38084723dec529e6cbedbc780be6ee094a68dc980891bb38deffab1cc9bf3268ff77569841dba45acd73ab1a81cae6cecf79a8057ef633bcc561b909b EBUILD gvfs-1.12.3.ebuild 3455 SHA256 f0c746e083ab2373ca139d60a5fe7b1c967ca1cfff20713e060a2a04f1e53230 SHA512 ef301479f451caa8bde73348e08c1bf8b754c9cc2305e91aa15dbf38da493d9e914ab977a78e37c296937433a26743f7a9226292d1bd31b51ca4b49685d04631 WHIRLPOOL b8c5178dc0a513c4eb662fb33170bdc75766920ccd9628ed7bb9b93f18d46fa2554730d42d8d5dbc04d104873e9f47f5f8c7740fcead298fffebd87f3f5aea85 -EBUILD gvfs-1.14.2.ebuild 3583 SHA256 7f2db40a3f00eb0a15ae0d047f99ea13767b6d98850c1d09b4d55c1efcd3c08e SHA512 36a4fe08c01dd7fdf79fc1203beab2a0e65e4a815ae605bea14e76c2aac11c3fb7a0b0d88911246f5b5fd65af57f4436135b2bfc4190fe5a3f1842f969801667 WHIRLPOOL a008feabd0ba7611ee6894d81052b114bbf7e5311f00f3629fa825663e0d0678c267bc5b49037b031320b49ef06cc1658a4655702d6c89f4fa36d20acbe43c61 -MISC ChangeLog 28271 SHA256 3c7e836fd902d3c07fadf3052259b52413c1d5c9a07d5887b2d652066881b76c SHA512 0c963c16ee1c37f27c72f2ce5b9d189d08c83dc4dd1545d48c658820348b8b7a4c079a4dfbb0b9541e8741e6ced89860dbb9caddee2c1a65bdd7fb3b1645b639 WHIRLPOOL e5118121e52cd8e36581eae339942785650a9000428cbd83b6f20ba14f6ee946023ed96eb9e386b3ea594c4fead5d8bd69c3150caf0d4197e499ae73aef7cbbd +EBUILD gvfs-1.14.2.ebuild 3819 SHA256 a63e085bf1e48875d5742a0c9b0188dab8186cde57dd20cc9e10df1e656c87aa SHA512 351b0a5bc17fb89b8098bb5872ffb669ff4e8bb48984049ec21b995cb08214b06e061d6c1d5a27903ad81991e7c0160ffca451eedc8353c568da440d0fcbf7f3 WHIRLPOOL 9272b59d35dd9828a1f6d2f57c6ce45a20b83c59fbf14efaa53af3cef32ea9dfff53b460b5be5cc3b69c6583fff93de3b3f2d5beaed32a2ed4c808dacb2f5cf7 +MISC ChangeLog 28407 SHA256 88f8c5278b58ed50034985264cfe1e343b987cdbfd4af0d37ce29a9e8b9b7c51 SHA512 0d2e3a7d790d41c4964c5b0ee2b40b047885cd34ea2edcb8caa9d532cf438e84c557542c0f6652be3268069b17bbcfa3f903c1a327b20b92abe995399e8381b0 WHIRLPOOL bae35b18e792c9ac177061c7d8709922e412089e9267cded0669f7d9fb452f7850adbbc04a06f7c7405967a2510bdb0eef5be80b4d5673b4723fef48e6e9812b MISC metadata.xml 1436 SHA256 8abc5f14d4c38e07815876aba0a376bd4c73e308477dd0cb584ec2e0fd3a58f1 SHA512 5c8481499c086482c54d5ccd18ad31f60941298e6329b32a88e909d571df46cadb80ee6c6d890a83b68288806901504287793f68c47970122092a17b8aa59a3b WHIRLPOOL 52c575106ca10f2e10406d669fc7802af23ff6dd055e03751cc9a33ced386291cf6d1865c968536cf50da9e3ccbf9511d6a7fda82ba2ef5888a7d06e0a086096 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJQ3NG9AAoJEJ0WA1zPCt1hHoQH+gNDwMQyqn4xrTgKe2K+hmWw -dmyoO4wFY/gHpvC1vlK062wKAhNNzMKa8GMq7fDuiRQM673CTIfxe9sSWIkQUxuw -FZoEasXD3YGcPFMPDRgn8eM3ggnH4h0iaV7WlBVWpfLkEKdCxpaX8Kh6b+D07NC+ -MKvC9xvdF2kj6CAK1Gg4aAFvaEWE4RahhIXmOp7W7ym0UhNAExIUr4ne80neontm -XQ84ssTuSmnWpm1mC44tW+w1NRAgGNmnpGxqDZGGuu/CLkBmP8q8IgqS0w97A1Nk -mBXgQnENzorjl3qbBqOpAshympCny/cddjkwPt52+fT8b5v5ndd44+Rwpr+SYsI= -=ZQxa +iQEcBAEBCAAGBQJQ9jZ6AAoJEEdUh39IaPFNwZAH/2uYwDUqwv2j8SSRKApJbGiS +/Jpo9d5Rz4KWaiHK6EJcPSikAu07OivIirnpxOGor8DQDOBskM2JoU7fgyR7LS2t +Fc6+y8LEGopeOLX0XGHJaPXh/blQ6cGs77nTXe6E2vcPwJ6soNY9kCP2ijGE1yAC +FEZUACTzYu+puf7qH3xrAGh7UJtj9hU0ECTXjsdTL0xQWU3XDHqxtHELNxF9K/5u +ik4gJlgB3M1xB43CKTOw16Tyl5Hcy4b/LG5p/2UgzGY2/InzY7Ra+GX3Zr1Qwilb +nRy1grW+P8q1RepwQJzDbNxRwbuwAW8FGlcorxw23V+x2vC1EY8vaPlSGJwxpcI= +=YI5E -----END PGP SIGNATURE----- diff --git a/gnome-base/gvfs/gvfs-1.14.2.ebuild b/gnome-base/gvfs/gvfs-1.14.2.ebuild index c2da8420639b..d1bb9e297ea5 100644 --- a/gnome-base/gvfs/gvfs-1.14.2.ebuild +++ b/gnome-base/gvfs/gvfs-1.14.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.14.2.ebuild,v 1.4 2012/12/27 22:54:52 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.14.2.ebuild,v 1.5 2013/01/16 05:12:34 ssuominen Exp $ EAPI="5" GCONF_DEBUG="no" @@ -60,7 +60,7 @@ RDEPEND=">=dev-libs/glib-2.33.12:2 samba? ( >=net-fs/samba-3.4.6[smbclient] ) systemd? ( sys-apps/systemd ) udev? ( - cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] ) + cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) virtual/udev[gudev] ) udisks? ( >=sys-fs/udisks-1.97:2[systemd?] )" DEPEND="${RDEPEND} @@ -74,6 +74,13 @@ DEPEND="${RDEPEND} REQUIRED_USE="cdda? ( udev )" src_prepare() { + # Replace me with correct patch, see #452400 + if has_version dev-libs/libcdio-paranoia; then + sed -i \ + -e '/#include/s:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \ + daemon/gvfsbackendcdda.c || die + fi + if use archive; then epatch "${FILESDIR}"/${PN}-1.2.2-expose-archive-backend.patch echo mount-archive.desktop.in >> po/POTFILES.in |