summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Ramsay <lack@gentoo.org>2008-09-03 13:18:29 +0000
committerJim Ramsay <lack@gentoo.org>2008-09-03 13:18:29 +0000
commit34380a91c02b725d93ad8a570d616ca1e9c671cd (patch)
tree6ac2e5ccaee92ff9a10795dcfe5e57ea9c1a90f8 /x11-wm/fluxbox
parentalpha/ia64/x86 stable wrt #236487 (diff)
downloadgentoo-2-34380a91c02b725d93ad8a570d616ca1e9c671cd.tar.gz
gentoo-2-34380a91c02b725d93ad8a570d616ca1e9c671cd.tar.bz2
gentoo-2-34380a91c02b725d93ad8a570d616ca1e9c671cd.zip
New fix for bug #236532 - Uses missing windowmenu file from upstream
(Portage version: 2.2_rc8/cvs/Linux 2.6.23-gentoo-r5 i686)
Diffstat (limited to 'x11-wm/fluxbox')
-rw-r--r--x11-wm/fluxbox/ChangeLog8
-rw-r--r--x11-wm/fluxbox/files/1.1.0/windowmenu15
-rw-r--r--x11-wm/fluxbox/fluxbox-1.1.0-r1.ebuild (renamed from x11-wm/fluxbox/fluxbox-1.1.0.ebuild)7
3 files changed, 27 insertions, 3 deletions
diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 8e223e00f715..31d7ee1f7853 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-wm/fluxbox
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.255 2008/09/03 09:51:58 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.256 2008/09/03 13:18:28 lack Exp $
+
+*fluxbox-1.1.0-r1 (03 Sep 2008)
+
+ 03 Sep 2008; Jim Ramsay <lack@gentoo.org> +files/1.1.0/windowmenu,
+ -fluxbox-1.1.0.ebuild, +fluxbox-1.1.0-r1.ebuild:
+ New fix for bug #236532 - Uses missing windowmenu file from upstream
03 Sep 2008; Peter Alfredsen <loki_val@gentoo.org> fluxbox-1.1.0.ebuild:
Fix bug 236523, upstream changed default menu location.
diff --git a/x11-wm/fluxbox/files/1.1.0/windowmenu b/x11-wm/fluxbox/files/1.1.0/windowmenu
new file mode 100644
index 000000000000..d867b64c2299
--- /dev/null
+++ b/x11-wm/fluxbox/files/1.1.0/windowmenu
@@ -0,0 +1,15 @@
+[begin]
+ [shade]
+ [stick]
+ [maximize]
+ [iconify]
+ [raise]
+ [lower]
+ [settitledialog]
+ [sendto]
+ [layer]
+ [alpha]
+ [extramenus]
+ [separator]
+ [close]
+[end]
diff --git a/x11-wm/fluxbox/fluxbox-1.1.0.ebuild b/x11-wm/fluxbox/fluxbox-1.1.0-r1.ebuild
index 54d915df3811..806fa5cad71a 100644
--- a/x11-wm/fluxbox/fluxbox-1.1.0.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0.ebuild,v 1.2 2008/09/03 09:51:58 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0-r1.ebuild,v 1.1 2008/09/03 13:18:28 lack Exp $
EAPI=1
inherit eutils
@@ -56,6 +56,9 @@ src_unpack() {
# things with style ebuilds.
epatch "${FILESDIR}/${PV}/gentoo_style_location.patch"
+ # Bug 236523: This file is missing from the upstream tarball:
+ cp "${FILESDIR}/${PV}/windowmenu" "${S}/data/windowmenu"
+
# Add in the Gentoo -r number to fluxbox -version output.
if [[ "${PR}" == "r0" ]] ; then
suffix="gentoo"
@@ -85,7 +88,7 @@ src_compile() {
ebegin "Creating a menu file (may take a while)"
mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
- MENUFILENAME="${S}/data/windowmenu" MENUTITLE="Fluxbox ${PV}" \
+ MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
CHECKINIT="no. go away." HOME="${T}/home" \
"${S}/util/fluxbox-generate_menu" -is -ds \
|| die "menu generation failed"