diff options
| author |   Samuli Suominen <drac@gentoo.org> | 2008-03-19 14:27:18 +0000 |
|---|---|---|
| committer | Samuli Suominen <drac@gentoo.org> | 2008-03-19 14:27:18 +0000 |
| commit | b494728fe832fe86ded16944df75fd7776fefa2c (patch) | |
| tree | 5602a0d984977fb7f858843fcfcf0fbac1564c50 /xfce-extra/xfce4-battery | |
| parent | alpha/ia64/sparc stable wrt security #212363 (diff) | |
| download | gentoo-2-b494728fe832fe86ded16944df75fd7776fefa2c.tar.gz gentoo-2-b494728fe832fe86ded16944df75fd7776fefa2c.tar.bz2 gentoo-2-b494728fe832fe86ded16944df75fd7776fefa2c.zip | |
Flip include order for bug 210218 to fix conflicting types between linux-headers-2.6.24 and glibc-2.7.
(Portage version: 2.1.4.4)
Diffstat (limited to 'xfce-extra/xfce4-battery')
| -rw-r--r-- | xfce-extra/xfce4-battery/ChangeLog | 10 | ||||
| -rw-r--r-- | xfce-extra/xfce4-battery/files/xfce4-battery-0.5.0-2.6.24-headers.patch | 12 | ||||
| -rw-r--r-- | xfce-extra/xfce4-battery/xfce4-battery-0.5.0-r2.ebuild | 5 |
3 files changed, 23 insertions, 4 deletions
diff --git a/xfce-extra/xfce4-battery/ChangeLog b/xfce-extra/xfce4-battery/ChangeLog index ec7f77d673f6..57265dbc9c1a 100644 --- a/xfce-extra/xfce4-battery/ChangeLog +++ b/xfce-extra/xfce4-battery/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for xfce-extra/xfce4-battery -# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery/ChangeLog,v 1.58 2007/10/26 13:18:29 angelos Exp $ +# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery/ChangeLog,v 1.59 2008/03/19 14:27:17 drac Exp $ + + 19 Mar 2008; Samuli Suominen <drac@gentoo.org> + +files/xfce4-battery-0.5.0-2.6.24-headers.patch, + xfce4-battery-0.5.0-r2.ebuild: + Flip include order for bug 210218 to fix conflicting types between + linux-headers-2.6.24 and glibc-2.7. 26 Oct 2007; Christoph Mende <angelos@gentoo.org> xfce4-battery-0.5.0-r2.ebuild: diff --git a/xfce-extra/xfce4-battery/files/xfce4-battery-0.5.0-2.6.24-headers.patch b/xfce-extra/xfce4-battery/files/xfce4-battery-0.5.0-2.6.24-headers.patch new file mode 100644 index 000000000000..080707a3be3f --- /dev/null +++ b/xfce-extra/xfce4-battery/files/xfce4-battery-0.5.0-2.6.24-headers.patch @@ -0,0 +1,12 @@ +--- xfce4-battery-plugin-0.5.0/panel-plugin/libapm.h.orig 2008-03-18 20:10:58.000000000 +0100 ++++ xfce4-battery-plugin-0.5.0/panel-plugin/libapm.h 2008-03-18 20:14:45.000000000 +0100 +@@ -17,8 +17,8 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +-#include <linux/apm_bios.h> + #include <sys/types.h> ++#include <linux/apm_bios.h> + + #define APM_PROC "/proc/apm" + #define APM_DEVICE "/dev/apm_bios" diff --git a/xfce-extra/xfce4-battery/xfce4-battery-0.5.0-r2.ebuild b/xfce-extra/xfce4-battery/xfce4-battery-0.5.0-r2.ebuild index d3d3a48b35a6..6c88a16cbafb 100644 --- a/xfce-extra/xfce4-battery/xfce4-battery-0.5.0-r2.ebuild +++ b/xfce-extra/xfce4-battery/xfce4-battery-0.5.0-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery/xfce4-battery-0.5.0-r2.ebuild,v 1.7 2007/10/26 13:18:29 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery/xfce4-battery-0.5.0-r2.ebuild,v 1.8 2008/03/19 14:27:17 drac Exp $ inherit autotools eutils xfce44 @@ -19,6 +19,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-freebsd.patch epatch "${FILESDIR}"/${P}-libacpi.patch epatch "${FILESDIR}"/${P}-2.6.21.patch + epatch "${FILESDIR}"/${P}-2.6.24-headers.patch sed -i -e "/^AC_INIT/s/battery_version()/battery_version/" configure.in eautoconf |