Added patch from upstream to fix bug 176476. Also removed some old unneeded patches

(Portage version: 2.1.2.5)

9 files changed, 254 insertions, 68 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 34030c3d5457..c5556b36feee 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,19 @@
 # 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.215 2007/05/14 16:41:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.216 2007/05/14 21:23:18 lack Exp $
+
+*fluxbox-1.0_rc3-r2 (14 May 2007)
+
+  14 May 2007; Jim Ramsay <lack@gentoo.org>
+  -files/0.9.13/fluxbox-0.9.13-4023-overlapping-icons-are-bad-92915.patch,
+  -files/0.9.13/fluxbox-0.9.13-our-styles-go-over-here.patch,
+  -files/1.0_rc1/fluxbox-1.0_rc1-our-styles-go-over-here.patch,
+  -files/1.0_rc2/fluxbox-1.0_rc2-our-styles-go-over-here.patch,
+  +files/1.0_rc3/fluxbox-1.0_rc3-flicker.patch,
+  +files/1.0_rc3/fluxbox-1.0_rc3-generate_menu_icon_fix.patch,
+  +fluxbox-1.0_rc3-r2.ebuild:
+  Added patch from upstream to fix bug 176476.  Also removed some old unneeded
+  patches
 
   14 May 2007; Raúl Porcel <armin76@gentoo.org> fluxbox-1.0_rc3.ebuild:
   alpha stable wrt # 167117
diff --git a/x11-wm/fluxbox/files/0.9.13/fluxbox-0.9.13-4023-overlapping-icons-are-bad-92915.patch b/x11-wm/fluxbox/files/0.9.13/fluxbox-0.9.13-4023-overlapping-icons-are-bad-92915.patch
deleted file mode 100644
index 9596b90375a3..000000000000
--- a/x11-wm/fluxbox/files/0.9.13/fluxbox-0.9.13-4023-overlapping-icons-are-bad-92915.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: src/SystemTray.cc
-===================================================================
---- src/SystemTray.cc	(revision 4022)
-+++ src/SystemTray.cc	(revision 4023)
-@@ -347,8 +347,10 @@
-                 static_cast<unsigned int>(event.xconfigure.height) != (*it)->height()) {
-                 // the position might differ so we update from our local
-                 // copy of position
--                (*it)->moveResize((*it)->x(), (*it)->y(),
-+                XMoveResizeWindow(FbTk::App::instance()->display(), (*it)->window(), 
-+                                  (*it)->x(), (*it)->y(),
-                                   (*it)->width(), (*it)->height());
-+
-                 // this was why gaim wasn't centring the icon
-                 (*it)->sendConfigureNotify(0, 0, (*it)->width(), (*it)->height());
-             }
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/1.0_rc1/fluxbox-1.0_rc1-our-styles-go-over-here.patch b/x11-wm/fluxbox/files/1.0_rc1/fluxbox-1.0_rc1-our-styles-go-over-here.patch
deleted file mode 100644
index 40f5cd50c5c4..000000000000
--- a/x11-wm/fluxbox/files/1.0_rc1/fluxbox-1.0_rc1-our-styles-go-over-here.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- util/fluxbox-generate_menu.in	2006-06-10 19:04:11.000000000 +0200
-+++ util/fluxbox-generate_menu.in.new	2006-06-14 14:39:04.000000000 +0200
-@@ -1735,12 +1735,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/1.0_rc2/fluxbox-1.0_rc2-our-styles-go-over-here.patch b/x11-wm/fluxbox/files/1.0_rc2/fluxbox-1.0_rc2-our-styles-go-over-here.patch
deleted file mode 100644
index 40f5cd50c5c4..000000000000
--- a/x11-wm/fluxbox/files/1.0_rc2/fluxbox-1.0_rc2-our-styles-go-over-here.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- util/fluxbox-generate_menu.in	2006-06-10 19:04:11.000000000 +0200
-+++ util/fluxbox-generate_menu.in.new	2006-06-14 14:39:04.000000000 +0200
-@@ -1735,12 +1735,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/1.0_rc3/fluxbox-1.0_rc3-flicker.patch b/x11-wm/fluxbox/files/1.0_rc3/fluxbox-1.0_rc3-flicker.patch
new file mode 100644
index 000000000000..9f93d1765f66
--- /dev/null
+++ b/x11-wm/fluxbox/files/1.0_rc3/fluxbox-1.0_rc3-flicker.patch
@@ -0,0 +1,20 @@
+Index: src/Ewmh.cc
+===================================================================
+--- src/Ewmh.cc	(revision 4877)
++++ src/Ewmh.cc	(working copy)
+@@ -1058,13 +1058,12 @@
+     } else if (state == m_net_wm_state_below) {  // bottom layer
+         if (value)
+             win.moveToLayer(Layer::BOTTOM);
+-        else
++        else if (win.layerNum() > Layer::NORMAL)
+             win.moveToLayer(Layer::NORMAL);
+-
+     } else if (state == m_net_wm_state_above) { // above layer
+         if (value)
+             win.moveToLayer(Layer::ABOVE_DOCK);
+-        else
++        else if (win.layerNum() < Layer::NORMAL)
+             win.moveToLayer(Layer::NORMAL);
+     } else if (state == m_net_wm_state_demands_attention) {
+         if (value) { // if add attention
diff --git a/x11-wm/fluxbox/files/1.0_rc3/fluxbox-1.0_rc3-generate_menu_icon_fix.patch b/x11-wm/fluxbox/files/1.0_rc3/fluxbox-1.0_rc3-generate_menu_icon_fix.patch
new file mode 100644
index 000000000000..60daa8af3db0
--- /dev/null
+++ b/x11-wm/fluxbox/files/1.0_rc3/fluxbox-1.0_rc3-generate_menu_icon_fix.patch
@@ -0,0 +1,43 @@
+Index: util/fluxbox-generate_menu.in
+===================================================================
+--- util/fluxbox-generate_menu.in	(revision 4883)
++++ util/fluxbox-generate_menu.in	(revision 4884)
+@@ -1326,22 +1326,22 @@
+         -g) GNOMEMENU=yes; shift;;
+         -in) NO_ICON=yes; shift;;
+         -is) OTHER_ICONPATHS="
+-                /usr/share/icons,
+-                /usr/share/icons/mini,
+-                /usr/share/pixmaps,
+-                /usr/local/share/icons,
+-                /usr/local/share/icons/mini,
+-                /usr/local/share/pixmaps,
+-                /usr/share/xclass/icons,
+-                /usr/share/xclass/pixmaps,
+-                /usr/local/share/xclass/icons,
+-                /usr/local/share/xclass/pixmaps,
+-                /usr/X11R6/share/icons/default/16x16,
+-                /usr/X11R6/share/icons/kde/16x16,
+-                /usr/X11R6/share/icons/hicolor/16x16,
+-                /usr/local/X11R6/share/icons/default/16x16,
+-                /usr/local/X11R6/share/icons/kde/16x16,
+-                /usr/local/X11R6/share/icons/hicolor/16x16,
++                /usr/share/icons
++                /usr/share/icons/mini
++                /usr/share/pixmaps
++                /usr/local/share/icons
++                /usr/local/share/icons/mini
++                /usr/local/share/pixmaps
++                /usr/share/xclass/icons
++                /usr/share/xclass/pixmaps
++                /usr/local/share/xclass/icons
++                /usr/local/share/xclass/pixmaps
++                /usr/X11R6/share/icons/default/16x16
++                /usr/X11R6/share/icons/kde/16x16
++                /usr/X11R6/share/icons/hicolor/16x16
++                /usr/local/X11R6/share/icons/default/16x16
++                /usr/local/X11R6/share/icons/kde/16x16
++                /usr/local/X11R6/share/icons/hicolor/16x16
+             "
+             shift;;
+         -ds) OTHER_DESKTOP_PATHS="
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc3-r2 b/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc3-r2
new file mode 100644
index 000000000000..a68891bf80b5
--- /dev/null
+++ b/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc3-r2
@@ -0,0 +1,3 @@
+MD5 8ed52d10d7de72efab0948eaaa4a6a50 fluxbox-1.0rc3.tar.bz2 780622
+RMD160 5086545ea2c2b0dd71f17d314838d04f197a1294 fluxbox-1.0rc3.tar.bz2 780622
+SHA256 cf1e2aa77716e42b2457b19989c2b2d2fc5f7d900cc16a3621a2e42372f474b6 fluxbox-1.0rc3.tar.bz2 780622
diff --git a/x11-wm/fluxbox/fluxbox-1.0_rc3-r2.ebuild b/x11-wm/fluxbox/fluxbox-1.0_rc3-r2.ebuild
new file mode 100644
index 000000000000..d527f3499ce4
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.0_rc3-r2.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0_rc3-r2.ebuild,v 1.1 2007/05/14 21:23:18 lack Exp $
+
+inherit eutils
+
+IUSE="nls xinerama truetype kde gnome imlib disableslit disabletoolbar"
+
+DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
+MY_P="fluxbox-1.0rc3"
+
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://sourceforge/fluxbox/${MY_P}.tar.bz2"
+HOMEPAGE="http://www.fluxbox.org"
+
+# Please note that USE="kde gnome" simply adds support for the respective
+# protocols, and does not depend on external libraries. They do, however,
+# make the binary a fair bit bigger, so we don't want to turn them on unless
+# the user actually wants them.
+
+RDEPEND="|| ( ( x11-libs/libXpm
+			x11-libs/libXrandr
+			xinerama? ( x11-libs/libXinerama )
+			x11-apps/xmessage
+		)
+		virtual/x11
+	)
+	virtual/xft
+	truetype? ( media-libs/freetype )
+	imlib? ( >=media-libs/imlib2-1.2.0 )
+	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1"
+DEPEND=">=sys-devel/autoconf-2.52
+		nls? ( sys-devel/gettext )
+		|| ( ( x11-proto/xextproto
+				xinerama? ( x11-proto/xineramaproto )
+			)
+			virtual/x11
+		)
+		${RDEPEND}"
+PROVIDE="virtual/blackbox"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+pkg_setup() {
+	if use imlib ; then
+		if ! built_with_use media-libs/imlib2 X ; then
+			eerror "To build fluxbox with imlib in USE, you need an X enabled"
+			eerror "media-libs/imlib2 . Either recompile imlib2 with the X"
+			eerror "USE flag turned on or disable the imlib USE flag for fluxbox."
+			die "USE=imlib requires imlib2 with USE=X"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# We need to be able to include directories rather than just plain
+	# files in menu [include] items. This patch will allow us to do clever
+	# things with style ebuilds.
+	epatch "${FILESDIR}/1.0_rc3/${PN}-1.0_rc3-our-styles-go-over-here.patch" ||	die "Patch failed"
+
+	# Bug 177114 - Segfault for certain locales
+	epatch "${FILESDIR}/1.0_rc3/${PN}-1.0_rc3-textproperties_segfault.patch" ||	die "Patch failed"
+
+	# Some "bottom" windows, notably ROX Filer's panel, cause a flicker sometimes
+	epatch "${FILESDIR}/1.0_rc3/${PN}-1.0_rc3-flicker.patch" ||	die "Patch failed"
+
+	# Bug 176476 - Missing icons from fluxbox-generate_menu
+	epatch "${FILESDIR}/1.0_rc3/fluxbox-1.0_rc3-generate_menu_icon_fix.patch" ||	die "Patch failed"
+
+	# Add in the Gentoo -r number to fluxbox -version output.
+	if [[ "${PR}" == "r0" ]] ; then
+		suffix="gentoo"
+	else
+		suffix="gentoo-${PR}"
+	fi
+	sed -i \
+		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
+		version.h.in || die "version sed failed"
+
+	# Turn on aa by default if possible. Fluxbox fonts are really frickin'
+	# broken, we'll do what we can to make it less painful by default.
+	use truetype 1>/dev/null && \
+		echo "session.screen0.antialias: true" >> data/init.in
+
+	# Fix broken styles
+	ebegin "Fixing backgrounds..."
+	for style in "${S}/data/styles/"* ; do
+		[[ -f "${style}" ]] || continue
+		sed -i -e 's,\([^f]\)bsetroot,\1fbsetroot,' "${style}" \
+			|| die "styles sed failed on ${style}"
+	done
+	eend 0
+}
+
+src_compile() {
+	export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
+
+	econf \
+		$(use_enable nls) \
+		$(use_enable xinerama) \
+		$(use_enable truetype xft) \
+		$(use_enable kde) \
+		$(use_enable gnome) \
+		$(use_enable imlib imlib2) \
+		$(use_enable !disableslit slit ) \
+		$(use_enable !disabletoolbar toolbar ) \
+		--sysconfdir=/etc/X11/${PN} \
+		--with-style=/usr/share/fluxbox/styles/Emerge \
+		${myconf} || die "configure failed"
+
+	emake || die "make failed"
+
+	ebegin "Creating a menu file (may take a while)"
+	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
+	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"
+	eend $?
+}
+
+src_install() {
+	dodir /usr/share/fluxbox
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc README* AUTHORS TODO* ChangeLog NEWS
+
+	dodir /usr/share/xsessions
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/${PN}.desktop"
+
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/startfluxbox" > "${D}/etc/X11/Sessions/fluxbox"
+	fperms a+x /etc/X11/Sessions/fluxbox
+
+	dodir /usr/share/fluxbox/menu.d
+
+	# Styles menu framework
+	dodir /usr/share/fluxbox/menu.d/styles
+	insinto /usr/share/fluxbox/menu.d/styles
+	doins "${FILESDIR}/styles-menu-fluxbox" || die
+	doins "${FILESDIR}/styles-menu-commonbox" || die
+	doins "${FILESDIR}/styles-menu-user" || die
+}
+
+pkg_postinst() {
+	einfo "As of fluxbox 0.9.10-r3, we are using an improved layout for"
+	einfo "styles to avoid problems with huge menus. Use the following"
+	einfo "in the menu for your menu styles section:"
+	echo
+	einfo "    [submenu] (Styles) {Select a Style}"
+	einfo "        [include] (/usr/share/fluxbox/menu.d/styles/)"
+	einfo "    [end]"
+	echo
+	einfo "If you use fluxbox-generate_menu or the default global fluxbox"
+	einfo "menu file, this will already be present."
+	echo
+	einfo "Note that menumaker and similar utilities do *not* support"
+	einfo "this out of the box."
+	echo
+	einfo "As of fluxbox 0.9.14_pre1, Fluxbox uses XFT for font rendering. If"
+	einfo "you experience font problems, try tinkering with your theme files."
+	einfo "You can check the validity of a font name using:"
+	echo
+	einfo "    XFT_DEBUG=1 xfd -fa 'whatever-12:bold'"
+	echo
+	einfo "The slow startup issues in previous versions should now be fixed;"
+	einfo "if you still encounter problems, please report bugs upstream."
+}
+