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 | 5bff04d5a868b976f36de9247779f0b67bdc3d7a (patch) | |
| tree | 4f8bb29f60f2b7742ad1feacf25b60ab91e83561 /sys-power | |
| parent | alpha/ia64/sparc stable wrt #350307 (diff) | |
| download | historical-5bff04d5a868b976f36de9247779f0b67bdc3d7a.tar.gz historical-5bff04d5a868b976f36de9247779f0b67bdc3d7a.tar.bz2 historical-5bff04d5a868b976f36de9247779f0b67bdc3d7a.zip | |
Fix building with Linux >= 2.6.36 wrt #352335.
Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64
Diffstat (limited to 'sys-power')
| -rw-r--r-- | sys-power/upower/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-power/upower/Manifest | 5 | ||||
| -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 |
4 files changed, 24 insertions, 5 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/Manifest b/sys-power/upower/Manifest index d3c1e55d1b24..b7815602dcaa 100644 --- a/sys-power/upower/Manifest +++ b/sys-power/upower/Manifest @@ -1,6 +1,7 @@ +AUX upower-0.9.5-linux-headers-2.6.36.patch 305 RMD160 e5f3b47800a9b2b2058af38b310073262461fd8f SHA1 6d7650e8e3b56863cede7d2ab29a56851fdd3547 SHA256 8e166721e35aaa0b525c6763aa6af7b809eb4e3229648b513b7bf375047c3dbd DIST upower-0.9.5.tar.bz2 473750 RMD160 0d6c84046230b17ee63428df1b103474d920ef93 SHA1 5a4763bcbdf0dae1868f8475d9eebe6188eb89c2 SHA256 b34074a5467d442720f4b5d4cee3946fa41dea932463f5e265deb90ae0e7c7a1 DIST upower-0.9.8.tar.bz2 462754 RMD160 cf3f0ec75e4e53b3e57a6429329c19e4826844be SHA1 4eb30f974dd817e7552698483e47c2d27838fbdc SHA256 7afaec3cb10ebbc898308c7abd250c27fd58e10379a42e80444d7a4b32f2eb91 -EBUILD upower-0.9.5.ebuild 2144 RMD160 5dbd062abae094c06ab1e0eeda179dc0fec8e5f4 SHA1 f1d22f3cbb7ca16d9b5c4e4db47323bb20bc9818 SHA256 44e55ac922726795338c9bd2a0b43ed49dc1b0527d7f4ed74bdd500fc09805ef +EBUILD upower-0.9.5.ebuild 2205 RMD160 72c75ca19b05379f737cad4fcba30b589379f968 SHA1 4dc13560a17a035e1b5addf3451f6c8e8f0f37db SHA256 92893c549ec67c89dbf3e6ff26766c59636e84f353b5e3e0643d66a3872b6451 EBUILD upower-0.9.8.ebuild 2105 RMD160 43ff7d699ab72df43e2ce040e2c41fbf99bccb20 SHA1 c4ac13e7475b1cf65346758686206bc086b7a176 SHA256 be662d2bb4501e6f16d3c79a7e63dc4b060f199e9a932424f17821def9399f2f -MISC ChangeLog 4020 RMD160 f2b026e4eee71217b14b9aead7775f6d775feb71 SHA1 2dda77713bf4f37519acd1962b96e400afbfd3d0 SHA256 9d8ad8759e0c8d529d9c32e3f3c396e23d6e004c810dc0606515ee27fa9407d7 +MISC ChangeLog 4195 RMD160 f3df4ca6d2ffb40349ce0f69aa3d3746c7e02751 SHA1 50c5a7bd2c4862f6029becd19f22aa31a9afacb4 SHA256 bcb5b3ec753d7dcda292a605939739385cc6dc2280968dea0681c656a1e2c258 MISC metadata.xml 363 RMD160 7210445bae10f2ddf76edaa8e7144227a03c5de1 SHA1 76f5af45c1a11584d24878ee65e6773757cfa014 SHA256 b24b22d2e371b3ee7165cd9ae1ca6fac72aee10e107c192a4e94686ba95b9093 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 |