From b124ac8a3519811ba7cec94014546dd9309a2f61 Mon Sep 17 00:00:00 2001 From: Jim Ramsay Date: Tue, 3 Jul 2007 16:11:11 +0000 Subject: Bug 183836, I somehow broke the 0.9.15 patches again. Fixed now :) (Portage version: 2.1.3_rc4) --- x11-wm/fluxbox/ChangeLog | 7 ++++++- .../0.9.13/fluxbox-0.9.13-our-styles-go-over-here.patch | 17 ----------------- .../0.9.15/fluxbox-0.9.15-our-styles-go-over-here.patch | 17 +++++++++++++++++ 3 files changed, 23 insertions(+), 18 deletions(-) delete mode 100644 x11-wm/fluxbox/files/0.9.13/fluxbox-0.9.13-our-styles-go-over-here.patch create mode 100644 x11-wm/fluxbox/files/0.9.15/fluxbox-0.9.15-our-styles-go-over-here.patch (limited to 'x11-wm/fluxbox') diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog index e9103e81eff1..ec08c31784af 100644 --- a/x11-wm/fluxbox/ChangeLog +++ b/x11-wm/fluxbox/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-wm/fluxbox # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.222 2007/06/30 04:36:42 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.223 2007/07/03 16:11:11 lack Exp $ + + 03 Jul 2007; Jim Ramsay + -files/0.9.13/fluxbox-0.9.13-our-styles-go-over-here.patch, + +files/0.9.15/fluxbox-0.9.15-our-styles-go-over-here.patch: + Bug 183836, I somehow broke the 0.9.15 patches again. Fixed now :) *fluxbox-1.0_rc3_p4949 (30 Jun 2007) diff --git a/x11-wm/fluxbox/files/0.9.13/fluxbox-0.9.13-our-styles-go-over-here.patch b/x11-wm/fluxbox/files/0.9.13/fluxbox-0.9.13-our-styles-go-over-here.patch deleted file mode 100644 index 01e4470c4c2b..000000000000 --- a/x11-wm/fluxbox/files/0.9.13/fluxbox-0.9.13-our-styles-go-over-here.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- util/fluxbox-generate_menu.in 2005-04-28 11:21:09.000000000 +0100 -+++ util/fluxbox-generate_menu.in.new 2005-05-13 23:46:12.647655824 +0100 -@@ -1638,12 +1638,8 @@ - append_submenu "${FBSETTINGSMENU}" - append "[config] (${CONFIGUREMENU})" - -- append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}" -- append "[stylesdir] (${PREFIX}/share/fluxbox/styles)" -- append_menu_end -- -- append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}" -- append "[stylesdir] (~/.fluxbox/styles)" -+ append_submenu "Styles" -+ append "[include] (/usr/share/fluxbox/menu.d/styles/)" - append_menu_end - - # Backgroundmenu diff --git a/x11-wm/fluxbox/files/0.9.15/fluxbox-0.9.15-our-styles-go-over-here.patch b/x11-wm/fluxbox/files/0.9.15/fluxbox-0.9.15-our-styles-go-over-here.patch new file mode 100644 index 000000000000..01e4470c4c2b --- /dev/null +++ b/x11-wm/fluxbox/files/0.9.15/fluxbox-0.9.15-our-styles-go-over-here.patch @@ -0,0 +1,17 @@ +--- util/fluxbox-generate_menu.in 2005-04-28 11:21:09.000000000 +0100 ++++ util/fluxbox-generate_menu.in.new 2005-05-13 23:46:12.647655824 +0100 +@@ -1638,12 +1638,8 @@ + append_submenu "${FBSETTINGSMENU}" + append "[config] (${CONFIGUREMENU})" + +- append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}" +- append "[stylesdir] (${PREFIX}/share/fluxbox/styles)" +- append_menu_end +- +- append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}" +- append "[stylesdir] (~/.fluxbox/styles)" ++ append_submenu "Styles" ++ append "[include] (/usr/share/fluxbox/menu.d/styles/)" + append_menu_end + + # Backgroundmenu -- cgit v1.2.3-65-gdbad