diff options
| -rw-r--r-- | net-libs/libdmapsharing/ChangeLog | 14 | ||||
| -rw-r--r-- | net-libs/libdmapsharing/Manifest | 33 | ||||
| -rw-r--r-- | net-libs/libdmapsharing/files/libdmapsharing-2.1.13-glib-2.31.patch | 27 | ||||
| -rw-r--r-- | net-libs/libdmapsharing/libdmapsharing-2.1.13.ebuild | 9 | ||||
| -rw-r--r-- | net-libs/libdmapsharing/libdmapsharing-2.9.13.ebuild | 6 | ||||
| -rw-r--r-- | net-libs/libdmapsharing/libdmapsharing-2.9.15.ebuild (renamed from net-libs/libdmapsharing/libdmapsharing-2.9.12.ebuild) | 6 |
6 files changed, 65 insertions, 30 deletions
diff --git a/net-libs/libdmapsharing/ChangeLog b/net-libs/libdmapsharing/ChangeLog index 84dc3827f729..29205929cd5b 100644 --- a/net-libs/libdmapsharing/ChangeLog +++ b/net-libs/libdmapsharing/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-libs/libdmapsharing -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libdmapsharing/ChangeLog,v 1.4 2011/10/27 05:41:33 nirbheek Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/libdmapsharing/ChangeLog,v 1.5 2012/05/03 23:43:53 tetromino Exp $ + +*libdmapsharing-2.9.15 (03 May 2012) + + 03 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + libdmapsharing-2.1.13.ebuild, +files/libdmapsharing-2.1.13-glib-2.31.patch, + -libdmapsharing-2.9.12.ebuild, libdmapsharing-2.9.13.ebuild, + +libdmapsharing-2.9.15.ebuild: + Version bump, fixes build failure with >=glib-2.31 (bug #413757, thanks to + Juergen Rose). Also fix >=glib-2.31 header use in slot 2.2. Switch to + virtual/pkgconfig. Drop old. *libdmapsharing-2.9.13 (27 Oct 2011) diff --git a/net-libs/libdmapsharing/Manifest b/net-libs/libdmapsharing/Manifest index 03dccbd443a8..c034ef5d9c77 100644 --- a/net-libs/libdmapsharing/Manifest +++ b/net-libs/libdmapsharing/Manifest @@ -2,29 +2,24 @@ Hash: SHA1 AUX libdmapsharing-2.1.13-build-order.patch 616 RMD160 119b688b121a4a052c147b28aa862f5e81a2e979 SHA1 6c5defebacb0987d3198f8aae921d1525e68b6d0 SHA256 aefbc59129acaff39204a68be61a9d85fa11199a176cdbb4a8158d14d18c6db3 +AUX libdmapsharing-2.1.13-glib-2.31.patch 744 RMD160 a70928a261542779d466ba3f5db2a8d6b7698e5b SHA1 62a71f75862f2b3d25f59425482f4b0c6f7bde1d SHA256 f7d5ae0c4d7376c792c5d03d282defe427b2ecb52a5c21b9294add9915bbf414 AUX libdmapsharing-2.1.13-slotability-fix.patch 3698 RMD160 4b21306db15e5982cbaf597909e882e20003d0fe SHA1 48b1f55e9628e0715f4d494bf71043feba5293fc SHA256 3c0de833f78e932c4f89567ed14ff3ea07fd784abb5e4cb0bda6d5af9bbc55b5 DIST libdmapsharing-2.1.13.tar.gz 645475 RMD160 144ff83e87096ea77031eef8dac3fece266084e9 SHA1 f5873a7cfe61228aabe763d1692bede1e9050b20 SHA256 bc4bcedf5da41c1f85fc36931877044f6eaf6043277a0fcfe7d1dc24a401ee1a -DIST libdmapsharing-2.9.12.tar.gz 723304 RMD160 4e909eaa11969ce0fc3c50fd95ae60a0a9ed17f6 SHA1 dbfe770ce8492ccf7a21c2b217b079a3fcc672bf SHA256 6127788fbd96a2a00bc312196cfb56ceec14a23fc5866d1be1fb48bb3544f821 DIST libdmapsharing-2.9.13.tar.gz 725466 RMD160 1a3c27c2830bc001d0a5ebed08674745b4616642 SHA1 4404f6d10deae93ad88f8f4fa79d0f0f1c76d53a SHA256 5ce97ddc3a2802f153710e221c1912d52e328f033b363ca18f6e0bc2916a2f10 -EBUILD libdmapsharing-2.1.13.ebuild 1623 RMD160 1df5b4cd23aca169a18d165578b97d64776c7bb0 SHA1 843257a7556c5286303408ccfca77b1b3d6151bc SHA256 92c33eba49060ddde594849b35bba0a3ee797fb077bdb762b2d4427ba7992f23 -EBUILD libdmapsharing-2.9.12.ebuild 1286 RMD160 9122a41bfb0fdc1b282069e31f322620b1a82db3 SHA1 45b23371b4415405a7846036e0082beb69877e8e SHA256 6ce3dbe614332b0fb811ddaa701a3b0940d1e4c6f38c5f4ccd46d3a943f0b12b -EBUILD libdmapsharing-2.9.13.ebuild 1286 RMD160 dd05ae05a7137d44e61371102cbfdb8b20ce97ae SHA1 60b22965111beb62f32c5c7c56f158be6d381bc8 SHA256 98a875db80fe18af4fdf699e5173166c882d99bcd51d487b08faba98d75ecd9f -MISC ChangeLog 1016 RMD160 9807f20dc350a3ab89342094cee74af879af9378 SHA1 8585d42b3b68c55b069b4fb5961865dd07ee3442 SHA256 c0b3d43f65f752fff38eecbced69ddf5674b672af1ad8920322152c7e681ce0a +DIST libdmapsharing-2.9.15.tar.gz 708500 RMD160 2113dcbc97859197ceea951a7ca17da123bcee4b SHA1 289a83813a391dd471f8fef56377e167634eeea2 SHA256 3f9ba35058fe7c8df06a893807a455e5328c11ebaee58019373f9310cc3930fa +EBUILD libdmapsharing-2.1.13.ebuild 1705 RMD160 9a68d5cd11e603817791997846638601c2836081 SHA1 7af8793d6252906204c63f63e95933392c9bbf9e SHA256 e88bfc9b6f66aaf87263a2e4a53980d7160ab15876af9d7fdecabbd69191e4cb +EBUILD libdmapsharing-2.9.13.ebuild 1286 RMD160 5d72099d4c6b53610779f6e5c5307773817ddb11 SHA1 473c10785686724eea997e7ccfc39bac42d87ff4 SHA256 5c4415c29ff9e62ecfca8f8cb4e678305e114ece16c7f64ad4ef8e46c706c47b +EBUILD libdmapsharing-2.9.15.ebuild 1286 RMD160 c158396c1ed8cb4a23bae2f07a5dffd463a86f70 SHA1 e2e3ab787403a878dcc082d037dfe552097002bb SHA256 c2b9195032bbb9b0df8ce92087e94c5bc013c596aaf6489feff3516a1d31046a +MISC ChangeLog 1469 RMD160 02e3c56de4b4619a7e2f3eac319242e3be1641b1 SHA1 e4e7e58200c25394fc5d3cd202d2bddfe4c6509a SHA256 656d17dceb1f99ff7ff7de12d102f22e7f1312f5c3d8c6a9f187defd8706573a MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBAgAGBQJOqO8SAAoJEO/kOhxWD91kn8MQAKfKBATwqI30tIJMz+PdcImy -YqZqrEZ6A9pd/E/Lu832pP4sctgGZQsG53YZ7DgLyDXK4aFc7ARBLjfLuYQOhbgN -JdwNncx/kMRjqX9uQAvsgQ3jse1lDC/dbhAwIAzTioQp++5F3urEQu4/NNh1P/24 -iRn3fNwVHQemdde4k7FRtDXC7pDVuhMWj1jJPVoxdk/bhzmNgYhKzCzjbSfORbgZ -SxjzkvY289LaU4pe7ly4iXW9Lf92YQo/3NrtGZE4Es0tnxowReZtOHt/O/p7JimU -z7hdi22dBsgePhTcF8A8cb89QZqEahqsayTbjJWBOI9nDkv8E/aqevKAA86Z+0GQ -QIKMue9SnF0jrNYQ52mKR8bJL0D+Rq2Ra/ey0W1xUYMoWdbaEt8c83cmDaQ2xYMv -B33ML4sjdaoZ8ODQTZi7Wp5e28F0n0sn7WhEmHnb1sKAW8XOS3vLot2TCmFPcMZO -i9y8I4LJTF7XjmEbTr/d4zhvXDohYRUhlQkwr9bfRkoQRutwxxn77TP0nSo1jhKN -W/Yqgdk/dWWSzkO0wPOZVdFkQVati2ijd8VvfuUj0MLIPYMkI3PScBHlJzFwuAKa -SRM3J/10RTdMOXwko7WvXqiNeyxQH9IMdigP8hpAkojllytTXvPVAdW7qqG1TFlG -XcZv45wUItYR4fFfuK6U -=USZ3 +iQEcBAEBAgAGBQJPoxg+AAoJEJ0WA1zPCt1hKTMIAIr7BV7Tkan+TQTEAMlgq1pl +lhAd6q5KsrS8fe6GbEOezN+5ahFG1nPQMg5Ql1IWt/VPHCgXY02z06aE/cdnOEQI +JnRlTVZlJDcxbpv7GOS68j6j24na/9TImwabmEP91e8e2wKbrIhfW/B7QAol8f6j +n+pXFOFMyPe83M8NAcBgIHwHudBUhccqUs/ZxRkTVJ23yjD7jmyjog1ddAM5ywIw +nZiha3qbc4HA9ZJ2DMV/pSr+WYGrvYY03zwWNXWcwgfI/xrxvac/x/fGlY57vfA7 +lvb8l9jWrmz2I0c4L/zvigajiXdb6Nv781Ofgbf0/xHxa39wccsKTnZX2sWKSts= +=j7B7 -----END PGP SIGNATURE----- diff --git a/net-libs/libdmapsharing/files/libdmapsharing-2.1.13-glib-2.31.patch b/net-libs/libdmapsharing/files/libdmapsharing-2.1.13-glib-2.31.patch new file mode 100644 index 000000000000..57935e3a673f --- /dev/null +++ b/net-libs/libdmapsharing/files/libdmapsharing-2.1.13-glib-2.31.patch @@ -0,0 +1,27 @@ +From 401b054f026f437d36fba06c25be9f49bee8ab00 Mon Sep 17 00:00:00 2001 +From: "W. Michael Petullo" <mike@flyn.org> +Date: Mon, 5 Dec 2011 11:14:42 -0600 +Subject: [PATCH] Update glib includes in dpap-share.c (thanks Adam Jackson) + +Signed-off-by: W. Michael Petullo <mike@flyn.org> +--- + libdmapsharing/dpap-share.c | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +diff --git a/libdmapsharing/dpap-share.c b/libdmapsharing/dpap-share.c +index 5b5628d..6c21d68 100644 +--- a/libdmapsharing/dpap-share.c ++++ b/libdmapsharing/dpap-share.c +@@ -27,8 +27,7 @@ + #include <stdlib.h> + + #include <glib/gi18n.h> +-#include <glib/gslist.h> +-#include <glib/gmappedfile.h> ++#include <glib.h> + + #include <unistd.h> + #include <sys/types.h> +-- +1.7.8.6 + diff --git a/net-libs/libdmapsharing/libdmapsharing-2.1.13.ebuild b/net-libs/libdmapsharing/libdmapsharing-2.1.13.ebuild index dd02c7ef6822..06ec26639720 100644 --- a/net-libs/libdmapsharing/libdmapsharing-2.1.13.ebuild +++ b/net-libs/libdmapsharing/libdmapsharing-2.1.13.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libdmapsharing/libdmapsharing-2.1.13.ebuild,v 1.2 2011/04/08 21:51:49 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libdmapsharing/libdmapsharing-2.1.13.ebuild,v 1.3 2012/05/03 23:43:53 tetromino Exp $ EAPI="3" @@ -27,7 +27,7 @@ RDEPEND=" x11-libs/gtk+:2 ) " DEPEND="${RDEPEND} - dev-util/pkgconfig + virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1 ) " @@ -48,6 +48,9 @@ src_prepare() { # Fix build order, bug #361067 epatch "${FILESDIR}/${P}-build-order.patch" + # Fix building with >=glib-2.31 + epatch "${FILESDIR}/${P}-glib-2.31.patch" + AT_M4DIR="m4" eautoreconf } diff --git a/net-libs/libdmapsharing/libdmapsharing-2.9.13.ebuild b/net-libs/libdmapsharing/libdmapsharing-2.9.13.ebuild index 28d82879f188..ec1aa5c46cf3 100644 --- a/net-libs/libdmapsharing/libdmapsharing-2.9.13.ebuild +++ b/net-libs/libdmapsharing/libdmapsharing-2.9.13.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libdmapsharing/libdmapsharing-2.9.13.ebuild,v 1.1 2011/10/27 05:41:33 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libdmapsharing/libdmapsharing-2.9.13.ebuild,v 1.2 2012/05/03 23:43:53 tetromino Exp $ EAPI="4" @@ -28,7 +28,7 @@ RDEPEND=" sys-libs/zlib " DEPEND="${RDEPEND} - dev-util/pkgconfig + virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1 ) " diff --git a/net-libs/libdmapsharing/libdmapsharing-2.9.12.ebuild b/net-libs/libdmapsharing/libdmapsharing-2.9.15.ebuild index 73bf09250f7a..555b6a43e797 100644 --- a/net-libs/libdmapsharing/libdmapsharing-2.9.12.ebuild +++ b/net-libs/libdmapsharing/libdmapsharing-2.9.15.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libdmapsharing/libdmapsharing-2.9.12.ebuild,v 1.1 2011/09/02 07:03:54 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libdmapsharing/libdmapsharing-2.9.15.ebuild,v 1.1 2012/05/03 23:43:53 tetromino Exp $ EAPI="4" @@ -28,7 +28,7 @@ RDEPEND=" sys-libs/zlib " DEPEND="${RDEPEND} - dev-util/pkgconfig + virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1 ) " |