diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-08-06 16:45:27 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-08-06 16:45:27 +0000 |
| commit | 727c41442cc7b1509952c8d4c143397e32dc2bbd (patch) | |
| tree | 0a497b0c8ae060af46f65c24d32eef1e04fec07d /app-misc | |
| parent | Version bump - security bug #280409. (diff) | |
| download | gentoo-2-727c41442cc7b1509952c8d4c143397e32dc2bbd.tar.gz gentoo-2-727c41442cc7b1509952c8d4c143397e32dc2bbd.tar.bz2 gentoo-2-727c41442cc7b1509952c8d4c143397e32dc2bbd.zip | |
Fix building with GCC 4.4+ and GLIBC 2.10+ wrt #277026.
(Portage version: 2.2_rc36/cvs/Linux x86_64)
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/workrave/ChangeLog | 8 | ||||
| -rw-r--r-- | app-misc/workrave/files/workrave-1.9.0-gcc44.patch | 12 | ||||
| -rw-r--r-- | app-misc/workrave/workrave-1.9.0.ebuild | 5 |
3 files changed, 21 insertions, 4 deletions
diff --git a/app-misc/workrave/ChangeLog b/app-misc/workrave/ChangeLog index 04426553bbac..30b7632e372f 100644 --- a/app-misc/workrave/ChangeLog +++ b/app-misc/workrave/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/workrave -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.57 2008/12/27 12:07:55 eva Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.58 2009/08/06 16:45:27 ssuominen Exp $ + + 06 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> workrave-1.9.0.ebuild, + +files/workrave-1.9.0-gcc44.patch: + Fix building with GCC 4.4+ and GLIBC 2.10+ wrt #277026. 27 Dec 2008; Gilles Dartiguelongue <eva@gentoo.org> +files/workrave-1.9.0-nosoundplayer.patch, workrave-1.9.0.ebuild: diff --git a/app-misc/workrave/files/workrave-1.9.0-gcc44.patch b/app-misc/workrave/files/workrave-1.9.0-gcc44.patch new file mode 100644 index 000000000000..f9f6deca2161 --- /dev/null +++ b/app-misc/workrave/files/workrave-1.9.0-gcc44.patch @@ -0,0 +1,12 @@ +diff -up workrave-1.9.0/backend/src/GlibIniConfigurator.cc.gcc44 workrave-1.9.0/backend/src/GlibIniConfigurator.cc +--- workrave-1.9.0/backend/src/GlibIniConfigurator.cc.gcc44 2008-03-07 22:38:26.000000000 +0100 ++++ workrave-1.9.0/backend/src/GlibIniConfigurator.cc 2009-02-25 23:40:01.000000000 +0100 +@@ -248,7 +248,7 @@ void + GlibIniConfigurator::split_key(const string &key, string &group, string &out_key) const + { + const char *s = key.c_str(); +- char *slash = strchr(s, '/'); ++ const char *slash = strchr(s, '/'); + if (slash) + { + group = key.substr(0, slash-s); diff --git a/app-misc/workrave/workrave-1.9.0.ebuild b/app-misc/workrave/workrave-1.9.0.ebuild index fd13ba6ecdc7..d92b1a1a9205 100644 --- a/app-misc/workrave/workrave-1.9.0.ebuild +++ b/app-misc/workrave/workrave-1.9.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.9.0.ebuild,v 1.2 2008/12/27 12:07:55 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.9.0.ebuild,v 1.3 2009/08/06 16:45:27 ssuominen Exp $ inherit autotools eutils gnome2 @@ -80,6 +80,7 @@ src_unpack() { # Fix compilation with gcc-4 epatch "${FILESDIR}/${P}-gcc43.patch" + epatch "${FILESDIR}/${P}-gcc44.patch" # Fix compilation with USE="-distribution" epatch "${FILESDIR}/${P}-compilation-fixes.patch" |