diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2011-11-03 21:03:49 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2011-11-03 21:03:49 +0000 |
| commit | 47e951842f6839498aba943e2d2bae8d8980dc34 (patch) | |
| tree | 1693d00e39f2cf1089ea96c4dade55b0876c4cd1 /x11-wm/icewm | |
| parent | Version bump #389429 by poncho. (diff) | |
| download | gentoo-2-47e951842f6839498aba943e2d2bae8d8980dc34.tar.gz gentoo-2-47e951842f6839498aba943e2d2bae8d8980dc34.tar.bz2 gentoo-2-47e951842f6839498aba943e2d2bae8d8980dc34.zip | |
Add missing eutils.eclass, fix building with >=gcc-4.4 wrt #376451 by Diego Elio Petteno
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
Diffstat (limited to 'x11-wm/icewm')
| -rw-r--r-- | x11-wm/icewm/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-wm/icewm/files/icewm-1.3.7-gcc44.patch | 13 | ||||
| -rw-r--r-- | x11-wm/icewm/icewm-1.3.7.ebuild | 11 |
3 files changed, 26 insertions, 5 deletions
diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog index 474898a2db5a..92b9c6d3fa97 100644 --- a/x11-wm/icewm/ChangeLog +++ b/x11-wm/icewm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-wm/icewm # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.145 2011/07/19 13:17:01 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.146 2011/11/03 21:03:49 xarthisius Exp $ + + 03 Nov 2011; Kacper Kowalik <xarthisius@gentoo.org> icewm-1.3.7.ebuild, + +files/icewm-1.3.7-gcc44.patch: + Add missing eutils.eclass, fix building with >=gcc-4.4 wrt #376451 by Diego + Elio Petteno *icewm-1.3.7 (19 Jul 2011) diff --git a/x11-wm/icewm/files/icewm-1.3.7-gcc44.patch b/x11-wm/icewm/files/icewm-1.3.7-gcc44.patch new file mode 100644 index 000000000000..d500f64004bc --- /dev/null +++ b/x11-wm/icewm/files/icewm-1.3.7-gcc44.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/show_bug.cgi?id=376451 + +--- a/src/wmapp.cc ++++ b/src/wmapp.cc +@@ -337,7 +337,7 @@ + char ** fontPath(XGetFontPath(xapp->display(), &ndirs)); + + char ** newFontPath = new char *[ndirs + 1]; +- newFontPath[ndirs] = fontsdir; ++ newFontPath[ndirs] = (char *)fontsdir; + + if (fontPath) + memcpy(newFontPath, fontPath, ndirs * sizeof (char *)); diff --git a/x11-wm/icewm/icewm-1.3.7.ebuild b/x11-wm/icewm/icewm-1.3.7.ebuild index 42880c1e789b..26558c4ae86c 100644 --- a/x11-wm/icewm/icewm-1.3.7.ebuild +++ b/x11-wm/icewm/icewm-1.3.7.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.3.7.ebuild,v 1.1 2011/07/19 13:17:01 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.3.7.ebuild,v 1.2 2011/11/03 21:03:49 xarthisius Exp $ EAPI="4" +inherit eutils + DESCRIPTION="Ice Window Manager with Themes" HOMEPAGE="http://www.icewm.org/" LICENSE="GPL-2" @@ -45,11 +47,12 @@ pkg_setup() { } src_prepare() { + epatch "${FILESDIR}"/${P}-gcc44.patch cd "${S}/src" - use uclibc && epatch "${FILESDIR}/icewm-uclibc.patch" + use uclibc && epatch "${FILESDIR}/${PN}-uclibc.patch" - echo "#!/bin/sh" > "$T/icewm" - echo "/usr/bin/icewm-session" >> "$T/icewm" + echo "#!/bin/sh" > "$T/${PN}" + echo "/usr/bin/icewm-session" >> "$T/${PN}" } src_configure() { |