diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-23 18:34:35 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-23 18:34:35 +0000 |
| commit | a2220c84b87de45e50e19875d5145550e6e128eb (patch) | |
| tree | 3c9a7f444678f8ec2ae2440aac4fc2c01a0f4a6f /sys-power | |
| parent | Restrict python3 ABIS. Stable on amd64. Bug #368221 (diff) | |
| download | gentoo-2-a2220c84b87de45e50e19875d5145550e6e128eb.tar.gz gentoo-2-a2220c84b87de45e50e19875d5145550e6e128eb.tar.bz2 gentoo-2-a2220c84b87de45e50e19875d5145550e6e128eb.zip | |
Fix building with glib-2.28.7
(Portage version: 2.2.0_alpha35/cvs/Linux x86_64)
Diffstat (limited to 'sys-power')
| -rw-r--r-- | sys-power/upower/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-power/upower/files/0.9.10-glib.patch | 40 | ||||
| -rw-r--r-- | sys-power/upower/upower-0.9.10.ebuild | 5 |
3 files changed, 48 insertions, 3 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/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() { |