diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-01-29 17:05:38 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-01-29 17:05:38 +0000 |
| commit | 1fb4bd96f001ba40f06ceba7d739b280426566e1 (patch) | |
| tree | 7ab5da8c1bf119998224df91910d2dd4d2931734 | |
| parent | Stable on amd64 wrt bug #352808 (diff) | |
| download | gentoo-2-1fb4bd96f001ba40f06ceba7d739b280426566e1.tar.gz gentoo-2-1fb4bd96f001ba40f06ceba7d739b280426566e1.tar.bz2 gentoo-2-1fb4bd96f001ba40f06ceba7d739b280426566e1.zip | |
Fix building with Linux >= 2.6.36 wrt #352335.
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
| -rw-r--r-- | sys-power/upower/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-power/upower/files/upower-0.9.5-linux-headers-2.6.36.patch | 12 | ||||
| -rw-r--r-- | sys-power/upower/upower-0.9.5.ebuild | 6 |
3 files changed, 21 insertions, 3 deletions
diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog index a01ce4475acd..5d2e5a38d467 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.30 2011/01/28 16:27:11 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.31 2011/01/29 17:05:37 ssuominen Exp $ + + 29 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> upower-0.9.5.ebuild, + +files/upower-0.9.5-linux-headers-2.6.36.patch: + Fix building with Linux >= 2.6.36 wrt #352335. 28 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> upower-0.9.8.ebuild: Check ACPI_SYSFS_POWER only for Linux version less than 2.6.37 wrt #352360. diff --git a/sys-power/upower/files/upower-0.9.5-linux-headers-2.6.36.patch b/sys-power/upower/files/upower-0.9.5-linux-headers-2.6.36.patch new file mode 100644 index 000000000000..617c12cb8093 --- /dev/null +++ b/sys-power/upower/files/upower-0.9.5-linux-headers-2.6.36.patch @@ -0,0 +1,12 @@ +http://cgit.freedesktop.org/upower/commit/?id=04dd349103ac1db8660d5c4fd86e91e3b488650c + +--- src/linux/sysfs-utils.c ++++ src/linux/sysfs-utils.c +@@ -36,6 +36,7 @@ + #include <fcntl.h> + #include <pwd.h> + #include <grp.h> ++#include <stdint.h> + #include <linux/fs.h> + #include <sys/ioctl.h> + #include <glib.h> diff --git a/sys-power/upower/upower-0.9.5.ebuild b/sys-power/upower/upower-0.9.5.ebuild index 97be0205a41f..23b4214ccb39 100644 --- a/sys-power/upower/upower-0.9.5.ebuild +++ b/sys-power/upower/upower-0.9.5.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.5.ebuild,v 1.15 2011/01/11 10:56:17 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.5.ebuild,v 1.16 2011/01/29 17:05:37 ssuominen Exp $ EAPI=3 -inherit linux-info +inherit eutils linux-info DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics" HOMEPAGE="http://upower.freedesktop.org/" @@ -46,6 +46,8 @@ pkg_setup() { } src_prepare() { + epatch "${FILESDIR}"/${P}-linux-headers-2.6.36.patch + if ! use ipod; then sed -i -e 's:libimobiledevice:dIsAbLe&:' configure || die fi |