Fix window manager hints on 64bit systems by Tres #76324 by Maik Stubbe.

(Portage version: 2.0.51.19)

4 files changed, 104 insertions, 1 deletions

diff --git a/x11-terms/eterm/ChangeLog b/x11-terms/eterm/ChangeLog
index a9f40bbfc6b3..49269882c2e4 100644
--- a/x11-terms/eterm/ChangeLog
+++ b/x11-terms/eterm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/eterm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.28 2005/04/19 05:02:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.29 2005/04/20 23:11:22 vapier Exp $
+
+*eterm-0.9.3-r2 (20 Apr 2005)
+
+  20 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/eterm-0.9.3-CARD64.patch, +eterm-0.9.3-r2.ebuild:
+  Fix window manager hints on 64bit systems by Tres #76324 by Maik Stubbe.
 
 *eterm-0.9.3-r1 (19 Apr 2005)
 
diff --git a/x11-terms/eterm/eterm-0.9.3-r2.ebuild b/x11-terms/eterm/eterm-0.9.3-r2.ebuild
new file mode 100644
index 000000000000..9d0e04ab66e4
--- /dev/null
+++ b/x11-terms/eterm/eterm-0.9.3-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.3-r2.ebuild,v 1.1 2005/04/20 23:11:22 vapier Exp $
+
+inherit eutils
+
+MY_P=Eterm-${PV}
+DESCRIPTION="A vt102 terminal emulator for X"
+HOMEPAGE="http://www.eterm.org/"
+SRC_URI="http://www.eterm.org/download/${MY_P}.tar.gz
+	http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz
+	mirror://sourceforge/eterm/${MY_P}.tar.gz
+	mirror://sourceforge/eterm/Eterm-bg-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="mmx etwin escreen"
+
+DEPEND="virtual/x11
+	>=x11-libs/libast-0.6.1
+	media-libs/imlib2
+	etwin? ( app-misc/twin )
+	escreen? ( app-misc/screen )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-pixmap-colmod.patch
+	epatch "${FILESDIR}"/${P}-CARD64.patch #76324
+	unpack Eterm-bg-${PV}.tar.gz
+	sed -i 's:Tw/Tw_1\.h:Tw/Tw1.h:' src/libscream.c || die
+}
+
+src_compile() {
+	local mymmx
+	use x86 \
+		&& mymmx="$(use_enable mmx)" \
+		|| mymmx="--disable-mmx"
+	econf \
+		$(use_enable escreen) \
+		$(use_enable etwin) \
+		--with-imlib \
+		--enable-trans \
+		${mymmx} \
+		--enable-multi-charset \
+		--with-delete=execute \
+		--with-backspace=auto \
+		|| die "conf failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make \
+		TIC="tic -o ${D}/usr/share/terminfo" \
+		DESTDIR="${D}" \
+		install || die "install failed"
+	dodoc ChangeLog README ReleaseNotes
+	use escreen && dodoc doc/README.Escreen
+	dodoc bg/README.backgrounds
+}
diff --git a/x11-terms/eterm/files/digest-eterm-0.9.3-r2 b/x11-terms/eterm/files/digest-eterm-0.9.3-r2
new file mode 100644
index 000000000000..099bf720b418
--- /dev/null
+++ b/x11-terms/eterm/files/digest-eterm-0.9.3-r2
@@ -0,0 +1,2 @@
+MD5 dd089fa7768f945341d721dd4942c702 Eterm-0.9.3.tar.gz 660767
+MD5 e8c6567b13d7fb760bded56c1d1a181d Eterm-bg-0.9.3.tar.gz 1883627
diff --git a/x11-terms/eterm/files/eterm-0.9.3-CARD64.patch b/x11-terms/eterm/files/eterm-0.9.3-CARD64.patch
new file mode 100644
index 000000000000..5de6065ad781
--- /dev/null
+++ b/x11-terms/eterm/files/eterm-0.9.3-CARD64.patch
@@ -0,0 +1,32 @@
+Index: src/command.h
+===================================================================
+RCS file: /cvsroot/enlightenment/eterm/Eterm/src/command.h,v
+retrieving revision 1.20
+diff -u -r1.20 command.h
+--- src/command.h	18 Apr 2005 20:01:55 -0000	1.20
++++ src/command.h	20 Apr 2005 23:06:09 -0000
+@@ -303,6 +303,15 @@
+ 
+ /************ Structures ************/
+ /* Motif window hints */
++# ifdef LONG64
++typedef struct _mwmhints {
++  CARD64 flags;
++  CARD64 functions;
++  CARD64 decorations;
++  INT64  input_mode;
++  CARD64 status;
++} MWMHints;
++# else
+ typedef struct _mwmhints {
+   CARD32 flags;
+   CARD32 functions;
+@@ -310,6 +319,8 @@
+   INT32  input_mode;
+   CARD32 status;
+ } MWMHints;
++# endif
++
+ # ifdef HAVE_TERMIOS_H
+ typedef struct termios ttymode_t;
+ # else