summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-07-21 18:40:45 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-07-21 18:40:45 +0000
commit673a25dbc7324c2e69b18dc4bce52ad3e6f797c3 (patch)
treec50f111f0c466c7e453308b3b71b04e4a999e1bc /dev-libs/libindicate
parentVersion bump with support for 3.2, 3.3 and 3.4 kernels. Thanks a lot to peopl... (diff)
downloadhistorical-673a25dbc7324c2e69b18dc4bce52ad3e6f797c3.tar.gz
historical-673a25dbc7324c2e69b18dc4bce52ad3e6f797c3.tar.bz2
historical-673a25dbc7324c2e69b18dc4bce52ad3e6f797c3.zip
Fix building with dev-libs/glib >= 2.31 wrt #427480
Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/libindicate')
-rw-r--r--dev-libs/libindicate/ChangeLog6
-rw-r--r--dev-libs/libindicate/Manifest18
-rw-r--r--dev-libs/libindicate/libindicate-0.6.1-r201.ebuild7
3 files changed, 18 insertions, 13 deletions
diff --git a/dev-libs/libindicate/ChangeLog b/dev-libs/libindicate/ChangeLog
index 4bc849917215..6533be661929 100644
--- a/dev-libs/libindicate/ChangeLog
+++ b/dev-libs/libindicate/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/libindicate
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/ChangeLog,v 1.30 2012/07/21 18:28:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/ChangeLog,v 1.31 2012/07/21 18:40:45 ssuominen Exp $
+
+ 21 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
+ libindicate-0.6.1-r201.ebuild:
+ Fix building with dev-libs/glib >= 2.31 wrt #427480
*libindicate-12.10.0 (21 Jul 2012)
diff --git a/dev-libs/libindicate/Manifest b/dev-libs/libindicate/Manifest
index de4232d8dd8d..805260418235 100644
--- a/dev-libs/libindicate/Manifest
+++ b/dev-libs/libindicate/Manifest
@@ -4,19 +4,19 @@ Hash: SHA1
AUX libindicate-0.6.1-no-mono.patch 1880 SHA256 9f9dcdd610a012cceded3d6076b745e8c406b9fdd179543b2680567f005615b5 SHA512 da2e8aa7423fd2b74289a9d60e81f6cfc9a10027cf196d9f91507bf3334e993f500e5673549af5608920c571f25ce60a73b85965a7ac631fa8917a51fc23e238 WHIRLPOOL 997c70634206d3bc75725c1310c77ef2b42c602e69bc6e267be040a0fc22a462e24efc6848bf2b216e863d8f0ffbff0614e69719675036a744d76bacd1187222
DIST libindicate-0.6.1.tar.gz 530107 SHA256 2c8236e326610fce5972de744827f88617a6f17340aac1bba9e85405d5c691f2 SHA512 cd3e075b210af56dd2ad84e121f65b5f246eb9a0771390b039a96b69726ac0b27cb38d2f11a5eeadb95da890f488877fa145f12e40453c55066ffe6e7aa9c70e WHIRLPOOL 94ac1de886747fb91649b31b4ca35d7a2af8afb5407a5f1a870744ece24bb0d24cc0ccecc6f69189bf884fb6297d45c487603e3166ad98315256ba562b03cf0e
DIST libindicate-12.10.0.tar.gz 512998 SHA256 48b64056a3fdffe9f9b3740f349b5e69757bb5d8199995a2e2c714707d500c17 SHA512 261df26eb90e138537ac16489aada741a2f618933e433b00d1ef8f5cb860d6b8831e19d9cc25837f8cf3d0a3688937d75e16296ba466e32cbc8ef9533bd6c1dc WHIRLPOOL 07202e0fc9778f29e109d07e8abb5cffbbc703c7625ac9163f776c8e558a86de3f130f81501e36d7c715aea4dc3a1bfd570db16902c243a826000245e46e71ba
-EBUILD libindicate-0.6.1-r201.ebuild 2270 SHA256 eb6bfce17cc971f14c0637ad61a12e9b528bbfc1dd7242249a3114fcfeba611f SHA512 361ceafc47a62da2e40999e5278298de590c8ecae260e0ceb928a351ab7842e326e7ead0904178ab41f110c72334a05db131b5be3fdb8972b4f669a4378adb05 WHIRLPOOL 0e605301b8861ef38640de56d07368e2e1fcb4e8a2555ac6ffed486ee5a8ce6c420100ec1081e4bbd17c9c637bea026e20e734a9a6ad74937eb82a4071cde658
+EBUILD libindicate-0.6.1-r201.ebuild 2313 SHA256 2ff9750656e9a74c75adc82c83402f5b53d8c9dacb391832c71f7bd76bbdb9e5 SHA512 a7606d52958f905872a2c9302c6a1bab6d606c36290a2bf5bc244f3fea7d083fae081f9d8542385a884c9f952498eca64b0cbae300c8d5fe4152bd7f1895297f WHIRLPOOL 3a3e43442a0251a95a762d437dc0f244ed9685d88700ad150dc64ba3faaaeaf04ff4e451cd77b3e8453b70ac4cb348af49e72c0608cc7e28953507af8092dd47
EBUILD libindicate-0.6.1-r300.ebuild 1636 SHA256 884bb4bcadf505155e5c2f57bcb7947fb4180f06746f009fc1a7296d61b9233e SHA512 bf93caab6ee50e9c423d37f3e8585c8d87517e880e497c2065500c06a36b35d51e6435f5e83addf7048125415bf0985336fc42a220a592eb8c5cb4e75c2f4133 WHIRLPOOL 76975372769476b3701d5b904f7a7dca0a4429445ac3982a1c4db6393672e29a876e1dfd54efdf58b9b7dec495e47b6fd7d75510d02c5d44d44aee7519279970
EBUILD libindicate-12.10.0.ebuild 1801 SHA256 2a71afc1cda6864a8421df9de0c1a02ef4bf3e75e60444a138847dc8885fcc20 SHA512 1c73db019fba821c4ae85969c5d1c9d4cc5d87b8348c0a90d9d7781ce048ba9e3bcd5a276a5045320f16e171f21ac0bdd3afd137b7f7ae200c0baea8af99711a WHIRLPOOL 49f091166fa82305bd187ddded1bb1f4055a1e2e964546a4767e07ba7a5745e829678475c227577c8ea9ffb69ab0e4a173ea7667bed694bdbe2e4a2e94630dc6
-MISC ChangeLog 7390 SHA256 9c759ef460fc7a707285d11047bb2b4ecfb6bbcb9097a0f839533f3a88df4dec SHA512 b010a4ade00a4f600fae257c8a87818d27613d83f9dcfc95a115295d3ceb45af6769fbb8c946e99fd906d710a65f2923d6b143bf7ec4466d26ac92717dc7a22a WHIRLPOOL 5f3630c12a065b825d7214fbe0da7686068d3d61f68d47d2d985ea5d94cb8f0bda26fa9546569c45c3b0cd24b637e0aef0692effb9121eb59a9be8f178065db8
+MISC ChangeLog 7532 SHA256 8097591ede5cc17e9468f07458e8e4c2001a2e858ec17eb5f689d0c425e566a3 SHA512 52c045b28247355779ce38e938da40ac51867429823a40f4891295e326089ce40c671a389c900c328b8ef015e1ac904c5df922d73da50127236d9702fca0437a WHIRLPOOL 4925f111c192edea7f2c2478be749a9dd1f88afb60ccc60996fe28b148d5483f33e5d544e329d25a9a65eaf1f089eb34c55acba0d937b4e78b3b47ea0a0c378d
MISC metadata.xml 374 SHA256 962b7c529448cbb491147f265e8b06fc88a32b3ae377c43d8dc1dd159d73443c SHA512 e0c76674aabc3059159cf48cb3df7ef2fb313d262ae779d41f6d47644b23ee70d63dd01653d3a9ff954186c3c05907ecf48228587bf2e52451a9ffbf19bf62a3 WHIRLPOOL 415f73d20eb8587c9b50b130d047619f191c2a7330f2bbaa7907ad0add24710ec1356bc5582c0a3e3f39b12093783a141d8bef56312c7947e03aed7150a7cfd2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBAgAGBQJQCvNGAAoJEEdUh39IaPFNo9EH/jgksvz3jL44Ii+tG3ipD24t
-YX+jEKeR2la03OM3YnTaQdwVOlaoS1ogQ4S6ug7omxGblfBGeJFqF6ozXQQ8Jb82
-jxrY3zk9Oyf0F0hWG8+lnjilW4RBmIEF4GEP/DCvGJGIsT71TnE1k/HiHBTn7XLP
-ht30XO8rgGoYkcHAJA6STMGwqh6A5sboRHauGq1aBzuNJC/QXV7hFdxUDlkwoJv8
-Xds23h4E6SEAy0ax24PUKoJkkLiHU21c9NsW/pmTx9q9qyOAQhGaKCya97CJocYE
-rDoHyoKbw8L949Bv17JWRHdiO/yEY7W7mGS++vOoOGLy2q/SsM0+cG+DJSfJ3r4=
-=T07K
+iQEcBAEBAgAGBQJQCvYPAAoJEEdUh39IaPFNP8YH/0w01Fz5RT6kLeuioTWXcWRC
+jngLv2ppco9plDNuv3zQzVQb8dMWteZTZ3ZsTjJFWSO73A1AqN3O7EW5+FLjKyp9
+LuMFngE8HcD3tcVv9Fqo3uzSS+7PtQDUHDcR03mnvq7zUKAzb5fC2UHQ3bmqfX1a
+7k/TkUoBFjtB3gQqT8nZU/OZW5VdCZPqPEmpQpxBsCtDu9h0MjLUM5AXhUfXz227
+h/ZT2u4m7gPysf3sOpamGDtpnrKhvwJR1ExAxhAnZlNwJl53J66w98AMKumwTqSU
+GZqdTGFOK18hjOUsbfSe10oqMKJ4/TTIT0zhhoJOI0ojm8O2sXDOv8BXVvgMung=
+=54R1
-----END PGP SIGNATURE-----
diff --git a/dev-libs/libindicate/libindicate-0.6.1-r201.ebuild b/dev-libs/libindicate/libindicate-0.6.1-r201.ebuild
index 0961c396a584..77ce07379c60 100644
--- a/dev-libs/libindicate/libindicate-0.6.1-r201.ebuild
+++ b/dev-libs/libindicate/libindicate-0.6.1-r201.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/dev-libs/libindicate/libindicate-0.6.1-r201.ebuild,v 1.4 2012/05/04 13:12:52 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.6.1-r201.ebuild,v 1.5 2012/07/21 18:40:45 ssuominen Exp $
EAPI=4
@@ -51,10 +51,11 @@ src_prepare() {
# for slotted dev-lang/vala
sed -i -e "s:vapigen:vapigen-${PV_vala_version}:" configure.ac || die
+ sed -i -e '/^#include.*glib.*gmessages/d' ${PN}/indicator.c || die #427480
+
eautoreconf
- rm -f py-compile
- ln -s $(type -P true) py-compile
+ >py-compile
}
src_configure() {