Add upstream r4023 to fix systray icon problems, bug #92915

(Portage version: 2.0.51.22-r1 screaming llama edition)

5 files changed, 155 insertions, 11 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 6f391d192000..842a97dc6f3e 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.154 2005/05/16 16:16:21 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.155 2005/05/23 09:32:19 ciaranm Exp $
+
+*fluxbox-0.9.13-r1 (23 May 2005)
+
+  23 May 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  +files/0.9.13/fluxbox-0.9.13-4023-overlapping-icons-are-bad-92915.patch,
+  +fluxbox-0.9.13-r1.ebuild:
+  Add upstream r4023 to fix systray icon problems, bug #92915
 
   16 May 2005; Ciaran McCreesh <ciaranm@gentoo.org> fluxbox-0.9.13.ebuild:
   Tidy up post install messages
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 00833246c09f..e5ba21dcfd0f 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,18 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6589b5ce0397109e44446290cb1015f3 ChangeLog 29044
 MD5 759f1c52e4691d4d8c86f61ac8ff61ba fluxbox-0.9.11.ebuild 4803
 MD5 0cb85df690fb065d2d17495007f8219f fluxbox-0.9.12-r1.ebuild 5134
 MD5 ba3c40b11884514f9fa692fd8e9788b4 fluxbox-0.9.9.ebuild 1700
 MD5 fb91a86bbf58cb4d7e40f9536c319766 metadata.xml 437
 MD5 7b17c2ccd7795edb48bf7f638ab10b1d fluxbox-0.9.13.ebuild 4037
+MD5 16ae26c616b81475dca20911fd2d80ca fluxbox-0.9.13-r1.ebuild 4180
 MD5 d4702d1ea0037c658b15b9a4af27cf4a files/digest-fluxbox-0.9.11 67
 MD5 e5c69e225b86ee6f1491b9970d22153f files/digest-fluxbox-0.9.12-r1 67
 MD5 cde8982304ad765c60a68874325d66fb files/digest-fluxbox-0.9.9 65
 MD5 4bafaa2a6712efa9f0c040b6072c8169 files/fluxbox-0.9.9-gcc3.4.patch 527
 MD5 133c9b57600834dedcdbca2ed789327d files/fluxbox.desktop 202
 MD5 477fd294ad2a81438ea97da4a48cbd41 files/digest-fluxbox-0.9.13 67
+MD5 477fd294ad2a81438ea97da4a48cbd41 files/digest-fluxbox-0.9.13-r1 67
 MD5 97574b9984c119ced3c259bd8c314588 files/0.9.10/fluxbox-0.9.10-all-about-me.patch 674
 MD5 ee36523cd5cf3281d0261244260840c9 files/0.9.10/fluxbox-0.9.10-amd64-font-fix.patch 774
 MD5 6c400d01c4fe9bea1d751ea6cbc718b5 files/0.9.10/fluxbox-0.9.10-eat-this-setlocale.patch 1295
@@ -40,10 +39,4 @@ MD5 7a34186b1b83746dbc71f0415d5f5a52 files/0.9.12/fluxbox-0.9.12-sweet-sweet-mus
 MD5 7b8327fc8b73757e8fb506b565d989ea files/0.9.12/fluxbox-0.9.12-vi-sucks-use-vim.patch 1008
 MD5 e56d5d9ab0af15229ed139b1e1f5b3be files/0.9.12/fluxbox-0.9.12-you-got-mail.patch 516
 MD5 17110f6fe071a751aaa29832e92832fd files/0.9.13/fluxbox-0.9.13-our-styles-go-over-here.patch 653
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCiMdkLLFUmVNQ7rkRAqOUAKCpkAZ+ptH5hORBmpkR8ytmLD2ibQCggmGm
-8KvQkByjLACKL0fcXjXbi30=
-=q1Rh
------END PGP SIGNATURE-----
+MD5 36db5c88337dd805a65f485604e321d6 files/0.9.13/fluxbox-0.9.13-4023-overlapping-icons-are-bad-92915.patch 829
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
new file mode 100644
index 000000000000..9596b90375a3
--- /dev/null
+++ b/x11-wm/fluxbox/files/0.9.13/fluxbox-0.9.13-4023-overlapping-icons-are-bad-92915.patch
@@ -0,0 +1,16 @@
+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/digest-fluxbox-0.9.13-r1 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.13-r1
new file mode 100644
index 000000000000..2f3981fb7cb2
--- /dev/null
+++ b/x11-wm/fluxbox/files/digest-fluxbox-0.9.13-r1
@@ -0,0 +1 @@
+MD5 f9b7b3c3b8e1e9ce3449601b238d4fba fluxbox-0.9.13.tar.bz2 663812
diff --git a/x11-wm/fluxbox/fluxbox-0.9.13-r1.ebuild b/x11-wm/fluxbox/fluxbox-0.9.13-r1.ebuild
new file mode 100644
index 000000000000..aede2eeac61d
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-0.9.13-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.13-r1.ebuild,v 1.1 2005/05/23 09:32:19 ciaranm Exp $
+
+inherit eutils
+
+IUSE="nls xinerama truetype kde gnome imlib disablexmb"
+
+DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
+SRC_URI="mirror://sourceforge/fluxbox/${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="virtual/x11
+	truetype? ( media-libs/freetype )
+	nls? ( sys-devel/gettext )
+	imlib? ( >=media-libs/imlib2-1.2.0 )
+	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1"
+DEPEND=">=sys-devel/autoconf-2.52
+		${RDEPEND}"
+PROVIDE="virtual/blackbox"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+
+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}/${PV}/${P}-our-styles-go-over-here.patch
+
+	# Fix for systray icon problems from upstream r4023, bug #92915.
+	epatch ${FILESDIR}/${PV}/${P}-4023-overlapping-icons-are-bad-92915.patch
+
+	# 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
+}
+
+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 !disablexmb xmb) \
+		$(use_enable imlib imlib2) \
+		--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* COPYING 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}/0.9.10/styles-menu-fluxbox || die
+	doins ${FILESDIR}/0.9.10/styles-menu-commonbox || die
+	doins ${FILESDIR}/0.9.10/styles-menu-user || die
+}
+
+pkg_postinst() {
+	einfo "As of fluxbox 0.9.10-r3, we are using an improved system for"
+	einfo "handling styles in the menu. To take advantage of this, use"
+	einfo "the following for your menu styles section:"
+	einfo " "
+	einfo "    [submenu] (Styles) {Select a Style}"
+	einfo "        [include] (/usr/share/fluxbox/menu.d/styles/)"
+	einfo "    [end]"
+	einfo " "
+	einfo "If you use fluxbox-generate_menu or the default global fluxbox"
+	einfo "menu file, this will already be present."
+	einfo " "
+	ewarn "Note that menumaker and similar utilities do *not* support"
+	ewarn "this out of the box."
+	einfo " "
+	einfo "If you experience font problems, or if fluxbox takes a very"
+	einfo "long time to start up, please try the 'disablexmb' USE flag."
+	einfo "If that fails, please report bugs upstream."
+	epause
+}