diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2003-10-13 19:32:34 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2003-10-13 19:32:34 +0000 |
| commit | 31f0d51244bd9a41e5337d96062fc9ee40a8c34d (patch) | |
| tree | 50d6e28da8a2c4145d9f5e07e0a414b2c1fb412e /sys-apps/apmd | |
| parent | adding gcc3 patch. Closes #30889. (diff) | |
| download | gentoo-2-31f0d51244bd9a41e5337d96062fc9ee40a8c34d.tar.gz gentoo-2-31f0d51244bd9a41e5337d96062fc9ee40a8c34d.tar.bz2 gentoo-2-31f0d51244bd9a41e5337d96062fc9ee40a8c34d.zip | |
Added a patch to allow compilation on 2.6x kernels, Bug #29636...
Diffstat (limited to 'sys-apps/apmd')
| -rw-r--r-- | sys-apps/apmd/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/apmd/Manifest | 17 | ||||
| -rw-r--r-- | sys-apps/apmd/apmd-3.0.2-r3.ebuild | 8 | ||||
| -rw-r--r-- | sys-apps/apmd/files/apmd.kernel26x.patch | 22 |
4 files changed, 42 insertions, 11 deletions
diff --git a/sys-apps/apmd/ChangeLog b/sys-apps/apmd/ChangeLog index 789d523c932d..f9adc887559c 100644 --- a/sys-apps/apmd/ChangeLog +++ b/sys-apps/apmd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/apmd # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/ChangeLog,v 1.9 2003/07/16 13:34:12 pvdabeel Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/ChangeLog,v 1.10 2003/10/13 19:32:25 plasmaroo Exp $ + + 13 Oct 2003; <plasmaroo@gentoo.org> apmd-3.0.2-r3.ebuild, + files/apmd.kernel26x.patch: Added a patch to get apmd to compile on + 2.6x kernels: Bug #29636. *apmd-3.0.2-r3 (12 July 2002) diff --git a/sys-apps/apmd/Manifest b/sys-apps/apmd/Manifest index 8f109899c7bb..8c8c03ede356 100644 --- a/sys-apps/apmd/Manifest +++ b/sys-apps/apmd/Manifest @@ -1,12 +1,13 @@ -MD5 e8e0bddb05bf0084a8eccc652d31d5b0 ChangeLog 1934 -MD5 d02f7a9cc759fc9f70027a7d8f984dd3 apmd-3.0.2-r1.ebuild 1366 +MD5 77429c8b0f0da62c07ce8cab66f4b2ec ChangeLog 2096 MD5 b34c869514e68d3c5083e76865a03bf0 apmd-3.0.2-r2.ebuild 1486 -MD5 ccbff6a6c4408aa21a9c3448f5d08180 apmd-3.0.2-r3.ebuild 1695 -MD5 1cb28b2ee147ffb8a402956d9b429c12 files/apmd.confd 72 -MD5 c2edd6e21cae8a8167c1f717165b6d21 files/apmd.rc6 689 +MD5 97756f24b66606b01de1a72a909ec7b9 apmd-3.0.2-r3.ebuild 1809 +MD5 d02f7a9cc759fc9f70027a7d8f984dd3 apmd-3.0.2-r1.ebuild 1366 MD5 ad21c10734c08e19968e2c8c9560957c files/apmsleep.c.diff 367 -MD5 7bb0220959a949bad3d9726cf05ebcf9 files/digest-apmd-3.0.2-r1 61 -MD5 7bb0220959a949bad3d9726cf05ebcf9 files/digest-apmd-3.0.2-r2 61 -MD5 7bb0220959a949bad3d9726cf05ebcf9 files/digest-apmd-3.0.2-r3 61 MD5 41d93c73cf8e247bd38b863d1aa4e196 files/run 246 MD5 bae01c156ae6240672f7ee5ebfcadf61 files/svc-apmd 861 +MD5 7bb0220959a949bad3d9726cf05ebcf9 files/digest-apmd-3.0.2-r2 61 +MD5 7bb0220959a949bad3d9726cf05ebcf9 files/digest-apmd-3.0.2-r3 61 +MD5 c2edd6e21cae8a8167c1f717165b6d21 files/apmd.rc6 689 +MD5 7bb0220959a949bad3d9726cf05ebcf9 files/digest-apmd-3.0.2-r1 61 +MD5 02fc246d5b2fde52708927cb672239f1 files/apmd.kernel26x.patch 644 +MD5 1cb28b2ee147ffb8a402956d9b429c12 files/apmd.confd 72 diff --git a/sys-apps/apmd/apmd-3.0.2-r3.ebuild b/sys-apps/apmd/apmd-3.0.2-r3.ebuild index 380322edaf76..276606435c50 100644 --- a/sys-apps/apmd/apmd-3.0.2-r3.ebuild +++ b/sys-apps/apmd/apmd-3.0.2-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.2-r3.ebuild,v 1.12 2003/07/16 13:34:12 pvdabeel Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.2-r3.ebuild,v 1.13 2003/10/13 19:32:25 plasmaroo Exp $ inherit eutils @@ -38,8 +38,12 @@ src_unpack() { Makefile.orig > Makefile fi - #This closes bug #1472: fixes compilation with recent 2.4 kernels + # This closes bug #1472: fixes compilation with recent 2.4 kernels epatch ${FILESDIR}/apmsleep.c.diff + + # This closes bug #29636: needs 2.6 patching [plasmaroo@gentoo.org] + epatch ${FILESDIR}/apmd.kernel26x.patch + } src_compile() { diff --git a/sys-apps/apmd/files/apmd.kernel26x.patch b/sys-apps/apmd/files/apmd.kernel26x.patch new file mode 100644 index 000000000000..bf55cbe77afd --- /dev/null +++ b/sys-apps/apmd/files/apmd.kernel26x.patch @@ -0,0 +1,22 @@ +--- apmsleep.c 2003-10-13 17:40:40.000000000 +0100 ++++ apmsleep.c.plasmaroo@gentoo.org 2003-10-13 17:40:27.000000000 +0100 +@@ -45,13 +45,18 @@ + #include <stdio.h> + #include <linux/version.h> + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) ++#include <linux/rtc.h> ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) + #include <linux/spinlock.h> + #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0) + #include <asm/spinlock.h> + #endif + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) + #include <linux/mc146818rtc.h> ++#endif ++ + #include <sys/ioctl.h> + #include <sys/time.h> + #include <sys/types.h> |