new x11-wm/fluxbox-0.9.10-r1 fixes #62722

5 files changed, 92 insertions, 15 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 11d144df1486..ee9b63ad6242 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.115 2004/09/01 16:11:02 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.116 2004/09/03 20:12:04 blubb Exp $
+
+*fluxbox-0.9.10-r1 (03 Sep 2004)
+
+  03 Sep 2004; <blubb@gentoo.org> +files/fluxbox-0.9.10.amd64_fix.patch,
+  +fluxbox-0.9.10-r1.ebuild:
+  Fixed crash on amd64. See bug #62722.
 
 *fluxbox-0.9.10 (01 Sep 2004)
 
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index f55ee2e5f86e..1c370da99086 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 5bb7664f4b463ec8f87554d1cebc64ff ChangeLog 21754
 MD5 72eaed6596c18b00e8764b9b8d141d94 fluxbox-0.9.8-r1.ebuild 1628
-MD5 d6b153b1bd45052f32b2aa919214054c ChangeLog 21577
-MD5 8897651d647e0a64d135b95aadeab41e fluxbox-0.9.10.ebuild 1627
-MD5 fb91a86bbf58cb4d7e40f9536c319766 metadata.xml 437
 MD5 010fb64778d2657638b423bd53e90e58 fluxbox-0.9.9.ebuild 1695
+MD5 fb91a86bbf58cb4d7e40f9536c319766 metadata.xml 437
+MD5 e7f6704d578af80f9a561eb489d26a19 fluxbox-0.9.10-r1.ebuild 1728
+MD5 8897651d647e0a64d135b95aadeab41e fluxbox-0.9.10.ebuild 1627
 MD5 c11d6a60aaece3dd919a1802a23ecc7a files/digest-fluxbox-0.9.8-r1 65
-MD5 c4565cd7f88b9897ccb504eef29fa8f3 files/digest-fluxbox-0.9.10 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBNfPwLLFUmVNQ7rkRAmB5AJ9EFgaJwB0OVdRgkUMz4rixXwto/gCgwxc9
-3YDjL0qMSNcMWgUeFzHmTpQ=
-=Vzcm
------END PGP SIGNATURE-----
+MD5 c4565cd7f88b9897ccb504eef29fa8f3 files/digest-fluxbox-0.9.10 67
+MD5 ee36523cd5cf3281d0261244260840c9 files/fluxbox-0.9.10.amd64_fix.patch 774
+MD5 c4565cd7f88b9897ccb504eef29fa8f3 files/digest-fluxbox-0.9.10-r1 67
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.10-r1 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.10-r1
new file mode 100644
index 000000000000..102f1b571a9e
--- /dev/null
+++ b/x11-wm/fluxbox/files/digest-fluxbox-0.9.10-r1
@@ -0,0 +1 @@
+MD5 7a04a21960b8bc364bcc002389008989 fluxbox-0.9.10.tar.bz2 556030
diff --git a/x11-wm/fluxbox/files/fluxbox-0.9.10.amd64_fix.patch b/x11-wm/fluxbox/files/fluxbox-0.9.10.amd64_fix.patch
new file mode 100644
index 000000000000..f4e1e5fd3d10
--- /dev/null
+++ b/x11-wm/fluxbox/files/fluxbox-0.9.10.amd64_fix.patch
@@ -0,0 +1,15 @@
+diff -I'^// \$Id' -Naur --exclude-from diff-exclude fluxbox.real/src/FbTk/XmbFontImp.cc fluxbox.toolbar/src/FbTk/XmbFontImp.cc
+--- fluxbox.real/src/FbTk/XmbFontImp.cc	2004-09-01 01:26:39.000000000 +1000
++++ fluxbox.toolbar/src/FbTk/XmbFontImp.cc	2004-09-04 03:03:16.000000000 +1000
+@@ -173,9 +173,9 @@
+     }
+ 
+     getFontElement(fontname, weight, FONT_ELEMENT_SIZE,
+-                   "-medium-", "-bold-", "-demibold-", "-regular-", 0);
++                   "-medium-", "-bold-", "-demibold-", "-regular-", NULL);
+     getFontElement(fontname, slant, FONT_ELEMENT_SIZE,
+-                   "-r-", "-i-", "-o-", "-ri-", "-ro-", 0);
++                   "-r-", "-i-", "-o-", "-ri-", "-ro-", NULL);
+     getFontSize(fontname, &pixel_size);
+ 
+     if (! strcmp(weight, "*")) 
diff --git a/x11-wm/fluxbox/fluxbox-0.9.10-r1.ebuild b/x11-wm/fluxbox/fluxbox-0.9.10-r1.ebuild
new file mode 100644
index 000000000000..b4ef7105ff74
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-0.9.10-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.10-r1.ebuild,v 1.1 2004/09/03 20:12:04 blubb Exp $
+
+inherit eutils
+
+IUSE="nls xinerama truetype kde gnome"
+
+DESCRIPTION="Fluxbox is a lightweight windowmanager for X featuring tabs."
+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 )"
+DEPEND=">=sys-devel/autoconf-2.52
+		${RDEPEND}"
+PROVIDE="virtual/blackbox"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~hppa ~ia64 ~mips ~ppc64 ~macos"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	use amd64 && epatch ${FILESDIR}/${PN}-${PV}.amd64_fix.patch
+}
+
+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` \
+		--sysconfdir=/etc/X11/${PN} \
+		${myconf} || die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	dodir /usr/share/fluxbox
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc README* AUTHORS TODO* COPYING
+
+	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
+}
+