Fix building with glib-2.28.7

Package-Manager: portage-2.2.0_alpha35/cvs/Linux x86_64

4 files changed, 54 insertions, 8 deletions

diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog
index e05c55b914f5..ee81bd93d2b3 100644
--- a/sys-power/upower/ChangeLog
+++ b/sys-power/upower/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/upower
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.45 2011/05/23 01:07:10 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.46 2011/05/23 18:34:35 scarabeus Exp $
+
+  23 May 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/0.9.10-glib.patch, upower-0.9.10.ebuild:
+  Fix building with glib-2.28.7
 
   23 May 2011; Joseph Jezak <josejx@gentoo.org> upower-0.9.9.ebuild:
   Marked ppc/ppc64 stable for bug #366941.
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 87c10073159f..c2ef4f443abf 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0.9.10-glib.patch 980 RMD160 2efc4367069be5ff0ea407d6054da2848e3ae442 SHA1 cd27ca32b9d8f98d7d53e5ab701d6b70bdb6d80d SHA256 95dc28c6bac129d20d817f3e59781150b98cf2c791fe242fbbfc7d1e5842b25b
 DIST upower-0.9.10.tar.bz2 488216 RMD160 450a717707d3400bafd096cfdb0f44665afcb3d5 SHA1 eedacf3fe5f491aa30cf963a074372e01c167d1e SHA256 fa567509c4ce8d1975259665b907929cac692a59dbe0e217e7494b1cdc949288
 DIST upower-0.9.8.tar.bz2 462754 RMD160 cf3f0ec75e4e53b3e57a6429329c19e4826844be SHA1 4eb30f974dd817e7552698483e47c2d27838fbdc SHA256 7afaec3cb10ebbc898308c7abd250c27fd58e10379a42e80444d7a4b32f2eb91
 DIST upower-0.9.9.tar.bz2 478434 RMD160 78990545f56ba99b9cb335dfe3e9f55c498fc303 SHA1 6109a934cce6c6ab38e471f7d50ff6927561a3ab SHA256 39e19bab2c776000477d6d0ddb4bc508808954f63867a2da2be40eaf341214e2
-EBUILD upower-0.9.10.ebuild 2029 RMD160 c0db6bfc4e81dcbffa911e3a467e649c7c2a0193 SHA1 b577f6faaaed853dd869b4f2f0fe2bbf61f77a6a SHA256 04cb5aca787e23d29841872390a4dad19b2e6eb023b44357597b7ad373b6cccf
+EBUILD upower-0.9.10.ebuild 2075 RMD160 d208c246943bfa7182a7528f5671ff3786c6a876 SHA1 968faeb8b660311b897c4e1aec766da6d5b59778 SHA256 463d9dbf977f944e68cdd2c8ecc05cc3162dc72393cf957bac0969b89b202a77
 EBUILD upower-0.9.8.ebuild 2093 RMD160 d37b92d528168cd2135a7a486be8e1cd7e2d1a4a SHA1 d52831c9454567a45b3bd800e5e300be390ece0d SHA256 68df04fee5593be852374b422b0069d83a557d5dbc90782e143e2350a3033fe3
 EBUILD upower-0.9.9.ebuild 2109 RMD160 2783114130b65d3d938485987b1b9ea4101f34b9 SHA1 95d2306207daa61b1b4cca52b2818ab8f97700a7 SHA256 7ef91e1cd157b9529c7f638f2c788e31db44f798794c2a2e842817efd6f00e5f
-MISC ChangeLog 5731 RMD160 afb4df70c334aa2355aa9209d868e12070a273a3 SHA1 2ae3b5c455762dd0561c117af48e72e105e98f9d SHA256 11b9716f0c7415ea9fa1520d58c50ed12dfccae82650bb95b47e215d13fd5d33
+MISC ChangeLog 5872 RMD160 1a2389e9528c3cd5ed5d70a0bcc30a141ec482a1 SHA1 59757d3583e98ee7f8beeabd2fda6d1189badb82 SHA256 4e32c190b20ec5f4a409ae4f49f0de3964a4d8f9432b67827124cce14ba25d81
 MISC metadata.xml 363 RMD160 7210445bae10f2ddf76edaa8e7144227a03c5de1 SHA1 76f5af45c1a11584d24878ee65e6773757cfa014 SHA256 b24b22d2e371b3ee7165cd9ae1ca6fac72aee10e107c192a4e94686ba95b9093
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3Zs04ACgkQcsIHjyDViGQMUACfXT7MV7VIeyflyRSz9AH3vFdh
-aCkAnjj5cHxyJtNXFWVLHLx4pRjkBLEl
-=C+Ly
+iEYEARECAAYFAk3aqLsACgkQHB6c3gNBRYd4zACfb2f6dwsY76O/7V4gMvtb8r6f
+FkwAoIBxpe0XktrpFsVxFF7CJf6i0kUr
+=a/lC
 -----END PGP SIGNATURE-----
diff --git a/sys-power/upower/files/0.9.10-glib.patch b/sys-power/upower/files/0.9.10-glib.patch
new file mode 100644
index 000000000000..988d0229361f
--- /dev/null
+++ b/sys-power/upower/files/0.9.10-glib.patch
@@ -0,0 +1,40 @@
+From 2b42890480f21d55a2516de9126a9d83a54742da Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Mon, 23 May 2011 08:42:38 +0000
+Subject: Only include glib-unix.h if the GLib version is >= 2.29.4
+
+Many thanks to Takahiro HASHIMOTO for debugging the problem. Fixes fdo#37489
+---
+diff --git a/src/up-main.c b/src/up-main.c
+index 2e35f9e..c1e490b 100644
+--- a/src/up-main.c
++++ b/src/up-main.c
+@@ -41,7 +41,7 @@
+ #include "up-kbd-backlight.h"
+ #include "up-wakeups.h"
+ 
+-#if GLIB_CHECK_VERSION(2,28,7)
++#if GLIB_CHECK_VERSION(2,29,4)
+  #include <glib-unix.h>
+ #endif
+ 
+@@ -92,7 +92,7 @@ out:
+ 	return ret;
+ }
+ 
+-#if GLIB_CHECK_VERSION(2,28,7)
++#if GLIB_CHECK_VERSION(2,29,4)
+ 
+ /**
+  * up_main_sigint_cb:
+@@ -201,7 +201,7 @@ main (gint argc, gchar **argv)
+ 		goto out;
+ 	}
+ 
+-#if GLIB_CHECK_VERSION(2,28,7)
++#if GLIB_CHECK_VERSION(2,29,4)
+ 	/* do stuff on ctrl-c */
+ 	g_unix_signal_add_watch_full (SIGINT,
+ 				      G_PRIORITY_DEFAULT,
+--
+cgit v0.8.3-6-g21f6
diff --git a/sys-power/upower/upower-0.9.10.ebuild b/sys-power/upower/upower-0.9.10.ebuild
index f200bff49a03..6b0822d02ecd 100644
--- a/sys-power/upower/upower-0.9.10.ebuild
+++ b/sys-power/upower/upower-0.9.10.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.10.ebuild,v 1.1 2011/05/15 10:16:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.10.ebuild,v 1.2 2011/05/23 18:34:35 scarabeus Exp $
 
 EAPI=4
-inherit linux-info
+inherit linux-info eutils
 
 DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics"
 HOMEPAGE="http://upower.freedesktop.org/"
@@ -49,6 +49,7 @@ pkg_setup() {
 
 src_prepare() {
 	sed -i -e '/DISABLE_DEPRECATED/d' configure || die
+	epatch "${FILESDIR}/${PV}-glib.patch"
 }
 
 src_configure() {