wok rev 18795

vte: fix alt-key patch. xterm: use smaller libxaw3D
author Xander Ziiryanoff <psychomaniak@xakep.ru>
date Fri Jan 08 07:16:21 2016 +0000 (2016-01-08)
parents 11ab1ba10fc3
children d7cfb1a5464d
files vte/receipt vte/stuff/AltKey.patch xterm/receipt
line diff
     1.1 --- a/vte/receipt	Thu Jan 07 22:13:24 2016 +0100
     1.2 +++ b/vte/receipt	Fri Jan 08 07:16:21 2016 +0000
     1.3 @@ -27,6 +27,7 @@
     1.4  # Rules to configure and make the package.
     1.5  compile_rules()
     1.6  {
     1.7 +	patch -p1 -i $stuff/AltKey.patch
     1.8  	./configure \
     1.9  		--libexecdir=/usr/lib/vte \
    1.10  		--with-html-dir=/usr/share/doc \
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/vte/stuff/AltKey.patch	Fri Jan 08 07:16:21 2016 +0000
     2.3 @@ -0,0 +1,50 @@
     2.4 +From a9d6a34708f846952f423d078397352858f7b1a4 Mon Sep 17 00:00:00 2001
     2.5 +From: Christian Persch <chpe@gnome.org>
     2.6 +Date: Sat, 12 May 2012 18:48:05 +0200
     2.7 +Subject: [PATCH] keymap: Treat ALT as META
     2.8 +
     2.9 +https://bugzilla.gnome.org/show_bug.cgi?id=663779
    2.10 +---
    2.11 + src/vte.c |   23 ++++++++++++++---------
    2.12 + 1 files changed, 14 insertions(+), 9 deletions(-)
    2.13 +
    2.14 +diff --git a/src/vte.c b/src/vte.c
    2.15 +index dd27e9a..0657921 100644
    2.16 +--- a/src/vte.c
    2.17 ++++ b/src/vte.c
    2.18 +@@ -5170,19 +5170,24 @@ static void
    2.19 + vte_terminal_read_modifiers (VteTerminal *terminal,
    2.20 + 			     GdkEvent *event)
    2.21 + {
    2.22 ++        GdkKeymap *keymap;
    2.23 + 	GdkModifierType modifiers;
    2.24 + 
    2.25 + 	/* Read the modifiers. */
    2.26 +-	if (gdk_event_get_state((GdkEvent*)event, &modifiers)) {
    2.27 +-		GdkKeymap *keymap;
    2.28 +-#if GTK_CHECK_VERSION (2, 90, 8)
    2.29 +-                keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window));
    2.30 +-#else
    2.31 +-                keymap = gdk_keymap_get_for_display(gdk_drawable_get_display(((GdkEventAny*)event)->window));
    2.32 ++	if (!gdk_event_get_state((GdkEvent*)event, &modifiers))
    2.33 ++                return;
    2.34 ++
    2.35 ++        keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window));
    2.36 ++
    2.37 ++        gdk_keymap_add_virtual_modifiers (keymap, &modifiers);
    2.38 ++
    2.39 ++#if 1
    2.40 ++        /* HACK! Treat ALT as META; see bug #663779. */
    2.41 ++        if (modifiers & GDK_MOD1_MASK)
    2.42 ++                modifiers |= VTE_META_MASK;
    2.43 + #endif
    2.44 +-                gdk_keymap_add_virtual_modifiers (keymap, &modifiers);
    2.45 +-		terminal->pvt->modifiers = modifiers;
    2.46 +-	}
    2.47 ++
    2.48 ++        terminal->pvt->modifiers = modifiers;
    2.49 + }
    2.50 + 
    2.51 + /* Read and handle a keypress event. */
    2.52 +-- 
    2.53 +1.7.5.1.217.g4e3aa.dirty
    2.54 \ No newline at end of file
     3.1 --- a/xterm/receipt	Thu Jan 07 22:13:24 2016 +0100
     3.2 +++ b/xterm/receipt	Fri Jan 08 07:16:21 2016 +0000
     3.3 @@ -13,9 +13,10 @@
     3.4  TAGS="terminal"
     3.5  HOST_ARCH="i486 arm"
     3.6  
     3.7 -DEPENDS="expat fontconfig freetype ncurses xorg-libXft xorg-libXt xorg-libXaw"
     3.8 +DEPENDS="expat fontconfig freetype ncurses xorg-libXft xorg-libXt \
     3.9 +xorg-libXaw3d xorg-libXpm"
    3.10  BUILD_DEPENDS="expat-dev fontconfig-dev freetype-dev ncurses-dev \
    3.11 -xorg-libXft-dev xorg-libXt-dev xorg-libXaw-dev"
    3.12 +xorg-libXft-dev xorg-libXt-dev xorg-libXaw3d-dev"
    3.13  
    3.14  # Rules to configure and make the package.
    3.15  compile_rules()
    3.16 @@ -26,6 +27,7 @@
    3.17  		--sysconfdir=/etc \
    3.18  		--mandir=/usr/share/man \
    3.19  		--localstatedir=/var \
    3.20 +		--with-Xaw3d \
    3.21  		--with-app-defaults=/usr/share/X11/app-defaults \
    3.22  		--enable-wide-chars \
    3.23  		--enable-freetype \