64 bit fixes

(Portage version: 2.0.51.19)

6 files changed, 284 insertions, 1 deletions

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index ac1acd7dc2bc..99a3e9b07012 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/fvwm
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.97 2005/07/17 00:21:25 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.98 2005/07/19 12:19:29 taviso Exp $
+
+*fvwm-2.5.13-r1 (19 Jul 2005)
+
+  19 Jul 2005; Tavis Ormandy <taviso@gentoo.org>
+  +files/fvwm-64bit-fixes.diff.gz, +files/fvwm-noxbell-grab-fail.diff,
+  +fvwm-2.5.13-r1.ebuild:
+  include 64bit cleanliness patch.
+  disable XBell() on grab fail.
 
 *fvwm-2.5.13 (17 Jul 2005)
 
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index f9b422d6a8c5..a8b7f1766d50 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,5 +1,7 @@
+MD5 be46958a37402633f77e4145f3ee8dde fvwm-2.5.13-r1.ebuild 7818
 MD5 d4ad99d2edb49ee23de8acb401f8ba0c fvwm-2.5.12.ebuild 8960
 MD5 60a24f01d6dc86f7d8230f805d81a573 fvwm-2.5.13.ebuild 7656
+MD5 de1498b69753c938a5858b611a0c0566 .fvwm-2.5.13-r1.ebuild.swp 24576
 MD5 7f7a934c35195483fb5a710fb9e706eb ChangeLog 16818
 MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527
 MD5 ba8d61baf42b7f21be2488b3581ff51d fvwm-2.4.18.ebuild 2956
@@ -13,9 +15,12 @@ MD5 c8fa1c05cdae43bd53f68942d684f23a files/digest-fvwm-2.5.12 209
 MD5 326a3b450dd43ec75b78fd0058026a3b files/digest-fvwm-2.5.13 209
 MD5 a580b9f394262307f85eae492bbd68d9 files/centerplacement-2.5.10.diff 2431
 MD5 38cb0131791d07053b5d90bf21d1993f files/fvwm-translucent-menus.diff.gz 3582
+MD5 0dc5ddac8cf6767f4a753feef77e6c65 files/fvwm-noxbell-grab-fail.diff 360
 MD5 0fcb3587e80a443304b2e6878b6eab0a files/fvwmtabs-2.8-insecure-tmp-handling.diff 2349
+MD5 9cc2f165a239ed01f75a0b7ee8475ec5 files/fvwm-64bit-fixes.diff.gz 12950
 MD5 5bda5a33cdd7fc8517aa413550ad4e1e files/iconfile-2.5.10.diff 745
 MD5 0a39299dd7ca570060f545e659c77604 files/fvwm-2.5.10-FvwmCommand.diff 1013
+MD5 326a3b450dd43ec75b78fd0058026a3b files/digest-fvwm-2.5.13-r1 209
 MD5 e9263b93f666293d0a1220ea3457efcd files/mini.happy.xpm 425
 MD5 df03a10a40a620ce8f1fab75f9758884 files/disable-debug-statements.diff 419
 MD5 efd2297324dd0241c2a879beadfabdb7 files/fvwm-2.5.10-mips-compat.diff 2306
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.5.13-r1 b/x11-wm/fvwm/files/digest-fvwm-2.5.13-r1
new file mode 100644
index 000000000000..2b957746910e
--- /dev/null
+++ b/x11-wm/fvwm/files/digest-fvwm-2.5.13-r1
@@ -0,0 +1,3 @@
+MD5 b95df3d751da3f5fc803a117de758723 fvwm-2.5.13.tar.bz2 1936745
+MD5 93e68afa231548b7e7af4db45082682e fvwm-2.5.11-translucent-menus.diff.gz 3426
+MD5 6e7d19a9130f5b7135c822965805517a FvwmTabs-v3-4.tar.gz 28659
diff --git a/x11-wm/fvwm/files/fvwm-64bit-fixes.diff.gz b/x11-wm/fvwm/files/fvwm-64bit-fixes.diff.gz
new file mode 100644
index 000000000000..2cc2f292b190
--- /dev/null
+++ b/x11-wm/fvwm/files/fvwm-64bit-fixes.diff.gz
diff --git a/x11-wm/fvwm/files/fvwm-noxbell-grab-fail.diff b/x11-wm/fvwm/files/fvwm-noxbell-grab-fail.diff
new file mode 100644
index 000000000000..005987332a46
--- /dev/null
+++ b/x11-wm/fvwm/files/fvwm-noxbell-grab-fail.diff
@@ -0,0 +1,10 @@
+--- fvwm/functions.c.orig       2005-07-19 13:08:00.453734288 +0100
++++ fvwm/functions.c    2005-07-19 13:08:25.055994176 +0100
+@@ -993,7 +993,6 @@
+        if (!GrabEm(CRS_NONE, GRAB_NORMAL))
+        {
+                func->use_depth--;
+-               XBell(dpy, 0);
+                __cf_cleanup(&depth, arguments, cond_rc);
+                return;
+        }
diff --git a/x11-wm/fvwm/fvwm-2.5.13-r1.ebuild b/x11-wm/fvwm/fvwm-2.5.13-r1.ebuild
new file mode 100644
index 000000000000..9ee2802eb69e
--- /dev/null
+++ b/x11-wm/fvwm/fvwm-2.5.13-r1.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.13-r1.ebuild,v 1.1 2005/07/19 12:19:29 taviso Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
+HOMEPAGE="http://www.fvwm.org/"
+SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2
+	mirror://gentoo/fvwm-2.5.11-translucent-menus.diff.gz
+	perl? ( http://users.tpg.com.au/users/scottie7/FvwmTabs-v3-4.tar.gz )"
+
+LICENSE="GPL-2 FVWM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bidi debug gtk gtk2 imlib nls perl png readline rplay stroke tcltk truetype xinerama"
+
+RDEPEND="readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.3-r1 )
+		gtk? ( =x11-libs/gtk+-1.2*
+				imlib? ( >=media-libs/gdk-pixbuf-0.21.0
+						>=media-libs/imlib-1.9.14-r1 ) )
+		rplay? ( >=media-sound/rplay-3.3.2 )
+		bidi? ( >=dev-libs/fribidi-0.10.4 )
+		png? ( >=media-libs/libpng-1.0.12-r2 )
+		stroke? ( >=dev-libs/libstroke-0.4 )
+		perl? ( tcltk? ( >=dev-lang/tk-8.3.4
+						>=dev-perl/perl-tk-800.024-r2
+						>=dev-perl/X11-Protocol-0.52 ) )
+		truetype? ( virtual/xft >=media-libs/fontconfig-2.1-r1 )
+		>=dev-lang/perl-5.6.1-r10
+		>=sys-libs/zlib-1.1.4-r1
+		sys-apps/debianutils
+		virtual/x11"
+# XXX:	gtk2 perl bindings require dev-perl/gtk2-perl, worth a dependency?
+# XXX:	gtk perl bindings require dev-perl/gtk-perl, worth a dependency?
+# XXX:	netpbm is used by FvwmScript-ScreenDump, worth a dependency?
+DEPEND="${RDEPEND} dev-util/pkgconfig !x11-wm/metisse"
+
+SFT=${WORKDIR}/FvwmTabs-v3-4
+
+src_unpack() {
+	unpack ${A}; export EPATCH_OPTS="-F3 -l"
+
+	# this patch enables fast translucent menus in fvwm. this is a
+	# minor tweak of a patch posted to fvwm-user mailing list by Olivier
+	# Chapuis in <20030827135125.GA6370@snoopy.folie>.
+	cd ${S}; epatch ${WORKDIR}/fvwm-2.5.11-translucent-menus.diff
+
+	if use perl; then
+		# I'll supply a default icon for FvwmTabs, this removes the need for
+		# installing an iconset, this one comes from the fvwm_icons package.
+		cd ${SFT}
+		ebegin "	Setting default icon for FvwmTabs"
+			sed -i 's#happyMini.xpm#/usr/share/fvwm/mini-happy.xpm#g' \
+				FvwmTabs FvwmTabs.1 fvwmtabrc
+		eend $?
+	fi
+
+	# fixing #51287, the fvwm-menu-xlock script is not compatible
+	# with the xlockmore implementation in portage.
+	cd ${S}; epatch ${FILESDIR}/fvwm-menu-xlock-xlockmore-compat.diff
+
+	# 64bit fixes.
+	# XXX: incvs
+	cd ${S}; epatch ${FILESDIR}/fvwm-64bit-fixes.diff.gz
+
+	# remove XBell when grab fails.
+	cd ${S}; epatch ${FILESDIR}/fvwm-noxbell-grab-fail.diff
+}
+
+src_compile() {
+	local myconf="--libexecdir=/usr/lib \
+		--with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm \
+		--enable-package-subdirs"
+
+	# use readline in FvwmConsole.
+	if ! use readline; then
+		myconf="${myconf} --without-readline-library"
+	else
+		myconf="${myconf} --with-readline-library --without-termcap-library"
+	fi
+
+	# FvwmGtk can be built as a gnome application, or a Gtk+ application.
+	if ! use gtk; then
+		myconf="${myconf} --disable-gtk --without-gnome"
+	else
+		if ! use imlib; then
+			einfo "ATTN: You can safely ignore any imlib related configure errors."
+			myconf="${myconf} --with-imlib-prefix=${T}"
+		fi
+		myconf="${myconf} --without-gnome"
+	fi
+
+	# rplay is a cool, but little used way of playing sounds over a network
+	if ! use rplay; then
+		myconf="${myconf} --without-rplay-library"
+	fi
+
+	# Install perl bindings.
+	if use perl; then
+		myconf="${myconf} --enable-perllib"
+	else
+		myconf="${myconf} --disable-perllib"
+	fi
+
+	# xinerama support for those who have multi-headed machines.
+	if use xinerama; then
+		myconf="${myconf} --enable-xinerama"
+	else
+		myconf="${myconf} --disable-xinerama"
+	fi
+
+	# bidirectional writing support, eg hebrew
+	if use bidi; then
+		myconf="${myconf} --enable-bidi"
+	else
+		myconf="${myconf} --disable-bidi"
+	fi
+
+	# png image support (very nice in fvwm)
+	if ! use png; then
+		myconf="${myconf} --without-png-library"
+	fi
+
+	# native language support
+	if use nls; then
+		myconf="${myconf} --enable-nls --enable-iconv"
+	else
+		myconf="${myconf} --disable-nls --disable-iconv"
+	fi
+
+	# support for mouse gestures using libstroke (very very cool)
+	if ! use stroke; then
+		myconf="${myconf} --without-stroke-library"
+	fi
+
+	# more verbosity for module developers/hackers/etc.
+	if use debug; then
+		myconf="${myconf} --enable-debug-msgs --enable-command-log"
+	fi
+
+	# Xft Anti Aliased text support
+	if use truetype; then
+		myconf="${myconf} --enable-xft"
+	else
+		myconf="${myconf} --disable-xft"
+	fi
+
+	# set the local maintainer for fvwm-bug.
+	export FVWM_BUGADDR="taviso@gentoo.org"
+
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	if use perl; then
+
+		local toolkits="gtk2 gtk tcltk"
+
+		if use tcltk; then
+			# Install the very cool FvwmTabs module
+			# http://users.tpg.com.au/users/scottie7/FvwmTabs
+			einfo "Installing FvwmTabs module..."
+
+			exeinto /usr/lib/fvwm/${PV}/
+			doexe ${SFT}/FvwmTabs
+
+			dodoc ${SFT}/fvwmtabrc ${SFT}/tab.zsh
+			doman ${SFT}/FvwmTabs.1
+			dohtml ${SFT}/FvwmTabs.man.html
+
+			newdoc ${SFT}/README README.fvwmtabs
+
+			# install default drag and drop icon.
+			insinto /usr/share/fvwm
+			newins ${FILESDIR}/mini.happy.xpm mini-happy.xpm
+		else
+			# Remove the Tk bindings (requires perl-tk)
+			rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm
+			toolkits=${toolkits/tcltk/}
+		fi
+		if ! use gtk; then
+			# Remove gtk bindings (requires gtk-perl/gtk2-perl)
+			rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm \
+				${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm
+			toolkits=${toolkits/gtk2/}
+			toolkits=${toolkits/gtk/}
+		else
+			if ! use gtk2; then
+				# Just remove the gtk2 bindings (requires gtk2-perl)
+				rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm
+				toolkits=${toolkits/gtk2/}
+			fi
+		fi
+		toolkits=${toolkits// /}
+		if ! test "${toolkits}"; then
+			# No perl toolkit bindings wanted, remove the unneeded files
+			# and empty directories.
+			rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm
+			find ${D}/usr/share/fvwm/perllib -depth -type d -exec rmdir {} \; 2>/dev/null
+		fi
+	else
+		# Remove useless script if perllib isnt required.
+		rm -rf ${D}/usr/bin/fvwm-perllib ${D}/usr/share/man/man1/fvwm-perllib.1
+	fi
+
+	# neat utility for testing fvwm behaviour on applications setting various
+	# hints, creates a simple black window with configurable hints set.
+	if use debug; then
+		dobin ${S}/tests/hints/hints_test
+		newdoc ${S}/tests/hints/README README.hints
+	fi
+
+	# fvwm-convert-2.6 is just a stub, contains no code - remove it for now.
+	# fvwm-convert-2.2 has a man page, but the script is no longer distributed.
+	rm -f ${D}/usr/bin/fvwm-convert-2.6 ${D}/usr/share/man/man1/fvwm-convert-2.6.1
+	rm -f ${D}/usr/share/man/man1/fvwm-convert-2.2.1
+
+	# ive included `exec` to save a few bytes of memory.
+	echo "#!/bin/bash" > fvwm2
+	echo "exec /usr/bin/fvwm2" >> fvwm2
+
+	exeinto /etc/X11/Sessions
+	doexe fvwm2
+
+	dodoc AUTHORS ChangeLog COPYING README NEWS docs/ANNOUNCE docs/BUGS \
+	docs/COMMANDS docs/DEVELOPERS docs/FAQ docs/error_codes docs/TODO \
+	docs/fvwm.lsm
+
+	dodoc utils/fvwm_make_directory_menu.sh  utils/fvwm_make_browse_menu.sh \
+	utils/quantize_pixmaps utils/xselection.c
+
+	dodoc ${FILESDIR}/README.transluceny.gz
+
+	# fix a couple of symlinks.
+	prepallman
+}
+
+pkg_postinst() {
+	if use perl; then
+		if use tcltk; then
+			einfo "By setting the perl and tcltk USE flags, you have elected to"
+			einfo "install the FvwmTabs module, a configurable tabbing system"
+			einfo "for FVWM. You can read more about FvwmTabs here:"
+			einfo
+			einfo "	http://users.tpg.com.au/users/scottie7/fvwmtabs.html"
+			einfo
+		fi
+	fi
+	echo
+	einfo "For information about the changes in this release, please"
+	einfo "refer to the NEWS file."
+	echo
+}