fix tiling issues

5 files changed, 114 insertions, 5 deletions

diff --git a/x11-terms/eterm/ChangeLog b/x11-terms/eterm/ChangeLog
index a2c9c6acf589..baafc7fefcf0 100644
--- a/x11-terms/eterm/ChangeLog
+++ b/x11-terms/eterm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/eterm
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.24 2004/06/28 21:56:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.25 2004/09/23 03:05:03 vapier Exp $
+
+*eterm-0.9.2-r6 (22 Sep 2004)
+
+  22 Sep 2004; Mike Frysinger <vapier@gentoo.org> +files/0.9.2-tiling.patch,
+  +eterm-0.9.2-r6.ebuild:
+  Take patch from cvs to fix tiling bugs.
 
   28 Jun 2004; Aron Griffis <agriffis@gentoo.org> eterm-0.9.2-r5.ebuild:
   add sed-4 dep
diff --git a/x11-terms/eterm/Manifest b/x11-terms/eterm/Manifest
index 3850a381130e..d00a79411316 100644
--- a/x11-terms/eterm/Manifest
+++ b/x11-terms/eterm/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1ea6862ca5415cc099cb24539045345e ChangeLog 3874
+MD5 8c50cc21a347be7a8426186f9be0c21e ChangeLog 4049
 MD5 22bd2f31704c6aae7219089849c7562f eterm-0.9.2-r5.ebuild 1555
 MD5 c97cacef51ce9af2ed721636c4436fe1 metadata.xml 631
+MD5 7291f872195683d064c87e892bd74fd4 eterm-0.9.2-r6.ebuild 1593
 MD5 c06f18d32325d81aa5c4a895a8798a82 files/0.9.2-ansi16.patch 1730
 MD5 309a7b42f0c4a1580943f0078f90bd50 files/digest-eterm-0.9.2-r5 129
+MD5 2914b242770c0fd9c37bf68d32205a0f files/0.9.2-tiling.patch 1206
+MD5 309a7b42f0c4a1580943f0078f90bd50 files/digest-eterm-0.9.2-r6 129
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBLpxRHTu7gpaalycRAkJEAJ0QCMfVXFHoluywrh4NWssb5/IfuACbBUoA
-Vu5Jdbw9NQgtd/kVyOjQEcE=
-=cwoG
+iD8DBQFBUj1sHTu7gpaalycRAt2AAJ98jeGE1+x5LTaz+MfS7Vz0wXIdcACg2uHZ
+u0IvogL6XWKnZm+jKXrBxSc=
+=atkd
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/eterm/eterm-0.9.2-r6.ebuild b/x11-terms/eterm/eterm-0.9.2-r6.ebuild
new file mode 100644
index 000000000000..a97d49dc3039
--- /dev/null
+++ b/x11-terms/eterm/eterm-0.9.2-r6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.2-r6.ebuild,v 1.1 2004/09/23 03:05:03 vapier Exp $
+
+inherit eutils
+
+MY_PN=${PN/et/Et}
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="A vt102 terminal emulator for X"
+HOMEPAGE="http://www.eterm.org/"
+SRC_URI="mirror://sourceforge/eterm/${MY_P}.tar.gz
+	mirror://sourceforge/eterm/${MY_PN}-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.5
+	media-libs/imlib2
+	>=sys-devel/binutils-2.13*
+	etwin? ( app-misc/twin )
+	escreen? ( app-misc/screen )
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	cd ${S}
+	unpack ${MY_PN}-bg-${PV}.tar.gz
+	epatch ${FILESDIR}/${PV}-ansi16.patch
+	epatch ${FILESDIR}/${PV}-tiling.patch
+	sed -i 's:Tw/Tw_1\.h:Tw/Tw1.h:' src/libscream.c
+}
+
+src_compile() {
+	local myconf
+	myconf=""
+	if [ "${ARCH}" == "x86" ]; then
+		myconf="$myconf `use_enable mmx`"
+	else
+		myconf="$myconf --disable-mmx"
+	fi
+
+	econf \
+		--with-imlib \
+		--enable-trans \
+		--with-x \
+		--enable-multi-charset \
+		--with-delete=execute \
+		--with-backspace=auto \
+		`use_enable escreen` \
+		`use_enable etwin` \
+		${myconf} || die "conf failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	dodir /usr/share/terminfo
+	make \
+		DESTDIR=${D} \
+		TIC="tic -o ${D}/usr/share/terminfo" \
+		install || die
+
+	dodoc ChangeLog README ReleaseNotes
+	use escreen && dodoc doc/README.Escreen
+	dodoc bg/README.backgrounds
+}
diff --git a/x11-terms/eterm/files/0.9.2-tiling.patch b/x11-terms/eterm/files/0.9.2-tiling.patch
new file mode 100644
index 000000000000..29c6dc00e96d
--- /dev/null
+++ b/x11-terms/eterm/files/0.9.2-tiling.patch
@@ -0,0 +1,29 @@
+Index: Eterm/src/pixmap.c
+===================================================================
+RCS file: /cvsroot/enlightenment/eterm/Eterm/src/pixmap.c,v
+retrieving revision 1.90
+retrieving revision 1.91
+diff -u -r1.90 -r1.91
+--- Eterm/src/pixmap.c  13 Oct 2002 05:28:36 -0000      1.90
++++ Eterm/src/pixmap.c  27 Nov 2002 20:18:23 -0000      1.91
+@@ -222,15 +222,15 @@
+     D_PIXMAP(("parse_pixmap_ops(str [%s]) called.\n", str));
+ 
+     for (; (token = (char *) strsep(&str, ":"));) {
+-        if (!BEG_STRCASECMP("tiled", token)) {
++        if (!BEG_STRCASECMP(token, "tile")) {
+             op |= OP_TILE;
+-        } else if (!BEG_STRCASECMP("hscaled", token)) {
++        } else if (!BEG_STRCASECMP(token, "hscale")) {
+             op |= OP_HSCALE;
+-        } else if (!BEG_STRCASECMP("vscaled", token)) {
++        } else if (!BEG_STRCASECMP(token, "vscale")) {
+             op |= OP_VSCALE;
+-        } else if (!BEG_STRCASECMP("scaled", token)) {
++        } else if (!BEG_STRCASECMP(token, "scale")) {
+             op |= OP_SCALE;
+-        } else if (!BEG_STRCASECMP("propscaled", token)) {
++        } else if (!BEG_STRCASECMP(token, "propscale")) {
+             op |= OP_PROPSCALE;
+         }
+     }
diff --git a/x11-terms/eterm/files/digest-eterm-0.9.2-r6 b/x11-terms/eterm/files/digest-eterm-0.9.2-r6
new file mode 100644
index 000000000000..04c1c525781f
--- /dev/null
+++ b/x11-terms/eterm/files/digest-eterm-0.9.2-r6
@@ -0,0 +1,2 @@
+MD5 e8c82cf52b25fdd51d16ff76b993ba68 Eterm-0.9.2.tar.gz 662636
+MD5 fb465e84f24de348e31bb9fd4d430071 Eterm-bg-0.9.2.tar.gz 379832