# HG changeset patch
# User Xander Ziiryanoff <psychomaniak@xakep.ru>
# Date 1452237381 0
# Node ID 4464f66eb0d24b5e273f9dd1f94986e9759d47f4
# Parent  11ab1ba10fc3b9a41be296c61768cfb3433a048e
vte: fix alt-key patch.  xterm: use smaller libxaw3D

diff -r 11ab1ba10fc3 -r 4464f66eb0d2 vte/receipt
--- a/vte/receipt	Thu Jan 07 22:13:24 2016 +0100
+++ b/vte/receipt	Fri Jan 08 07:16:21 2016 +0000
@@ -27,6 +27,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
+	patch -p1 -i $stuff/AltKey.patch
 	./configure \
 		--libexecdir=/usr/lib/vte \
 		--with-html-dir=/usr/share/doc \
diff -r 11ab1ba10fc3 -r 4464f66eb0d2 vte/stuff/AltKey.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vte/stuff/AltKey.patch	Fri Jan 08 07:16:21 2016 +0000
@@ -0,0 +1,50 @@
+From a9d6a34708f846952f423d078397352858f7b1a4 Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@gnome.org>
+Date: Sat, 12 May 2012 18:48:05 +0200
+Subject: [PATCH] keymap: Treat ALT as META
+
+https://bugzilla.gnome.org/show_bug.cgi?id=663779
+---
+ src/vte.c |   23 ++++++++++++++---------
+ 1 files changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/src/vte.c b/src/vte.c
+index dd27e9a..0657921 100644
+--- a/src/vte.c
++++ b/src/vte.c
+@@ -5170,19 +5170,24 @@ static void
+ vte_terminal_read_modifiers (VteTerminal *terminal,
+ 			     GdkEvent *event)
+ {
++        GdkKeymap *keymap;
+ 	GdkModifierType modifiers;
+ 
+ 	/* Read the modifiers. */
+-	if (gdk_event_get_state((GdkEvent*)event, &modifiers)) {
+-		GdkKeymap *keymap;
+-#if GTK_CHECK_VERSION (2, 90, 8)
+-                keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window));
+-#else
+-                keymap = gdk_keymap_get_for_display(gdk_drawable_get_display(((GdkEventAny*)event)->window));
++	if (!gdk_event_get_state((GdkEvent*)event, &modifiers))
++                return;
++
++        keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window));
++
++        gdk_keymap_add_virtual_modifiers (keymap, &modifiers);
++
++#if 1
++        /* HACK! Treat ALT as META; see bug #663779. */
++        if (modifiers & GDK_MOD1_MASK)
++                modifiers |= VTE_META_MASK;
+ #endif
+-                gdk_keymap_add_virtual_modifiers (keymap, &modifiers);
+-		terminal->pvt->modifiers = modifiers;
+-	}
++
++        terminal->pvt->modifiers = modifiers;
+ }
+ 
+ /* Read and handle a keypress event. */
+-- 
+1.7.5.1.217.g4e3aa.dirty
\ No newline at end of file
diff -r 11ab1ba10fc3 -r 4464f66eb0d2 xterm/receipt
--- a/xterm/receipt	Thu Jan 07 22:13:24 2016 +0100
+++ b/xterm/receipt	Fri Jan 08 07:16:21 2016 +0000
@@ -13,9 +13,10 @@
 TAGS="terminal"
 HOST_ARCH="i486 arm"
 
-DEPENDS="expat fontconfig freetype ncurses xorg-libXft xorg-libXt xorg-libXaw"
+DEPENDS="expat fontconfig freetype ncurses xorg-libXft xorg-libXt \
+xorg-libXaw3d xorg-libXpm"
 BUILD_DEPENDS="expat-dev fontconfig-dev freetype-dev ncurses-dev \
-xorg-libXft-dev xorg-libXt-dev xorg-libXaw-dev"
+xorg-libXft-dev xorg-libXt-dev xorg-libXaw3d-dev"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -26,6 +27,7 @@
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--localstatedir=/var \
+		--with-Xaw3d \
 		--with-app-defaults=/usr/share/X11/app-defaults \
 		--enable-wide-chars \
 		--enable-freetype \