From 21913db38ee9199ee400bb7c91547be87dea6e44 Mon Sep 17 00:00:00 2001
From: Willy Sudiarto Raharjo <willysr@slackware-id.org>
Date: Sun, 5 May 2013 00:17:32 -0500
Subject: [PATCH] libraries/vte3: Updated for version 0.34.4.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 libraries/vte3/fix_meta_alt_keybinding.patch  |  74 ++++++++++++++++++
 .../vte3/fix_meta_alt_keybinding.patch.gz     | Bin 1246 -> 0 bytes
 libraries/vte3/vte3.SlackBuild                |  11 +--
 libraries/vte3/vte3.info                      |   6 +-
 4 files changed, 83 insertions(+), 8 deletions(-)
 create mode 100644 libraries/vte3/fix_meta_alt_keybinding.patch
 delete mode 100644 libraries/vte3/fix_meta_alt_keybinding.patch.gz

diff --git a/libraries/vte3/fix_meta_alt_keybinding.patch b/libraries/vte3/fix_meta_alt_keybinding.patch
new file mode 100644
index 0000000000..bd364be584
--- /dev/null
+++ b/libraries/vte3/fix_meta_alt_keybinding.patch
@@ -0,0 +1,74 @@
+From 180dcc578e13c6096e277fb853e7162db640f207 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 15 Nov 2011 03:06:40 -0500
+Subject: [PATCH] Map both gdk's Meta and Alt to vte's Meta for >=gtk+-3.2.2
+ compatibility
+
+Also, since VTE_META_MASK is now a mask with multiple bits set, code that
+compares gdk key modifiers to VTE_META_MASK by numerical equality is no
+longer guaranteed to work. Therefore, for such comparisons a new function,
+vte_keymap_fixup_modifiers, is introduced; it ensures that if any bits
+matching matching VTE_META_MASK are set, then all are set.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=663779
+---
+ src/keymap.c |   15 +++++++++++++--
+ src/keymap.h |    2 +-
+ 2 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/src/keymap.c b/src/keymap.c
+index 9a21669..95b4c5b 100644
+--- a/src/keymap.c
++++ b/src/keymap.c
+@@ -990,6 +990,17 @@ static const struct _vte_keymap_group {
+ 	{GDK_KEY (F35),		_vte_keymap_GDK_F35},
+ };
+ 
++/* Restrict modifiers to the specified mask and ensure that VTE_META_MASK,
++ * despite being a compound mask, is treated as indivisible. */
++GdkModifierType
++_vte_keymap_fixup_modifiers(GdkModifierType modifiers,
++		GdkModifierType mask)
++{
++	if (modifiers & VTE_META_MASK)
++		modifiers |= VTE_META_MASK;
++	return modifiers & mask;
++}
++
+ /* Map the specified keyval/modifier setup, dependent on the mode, to either
+  * a literal string or a capability name. */
+ void
+@@ -1104,7 +1115,7 @@ _vte_keymap_map(guint keyval,
+ 	} else {
+ 		fkey_mode = fkey_default;
+ 	}
+-	modifiers &= (GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
++	modifiers = _vte_keymap_fixup_modifiers(modifiers, GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
+ 
+ 	/* Search for the conditions. */
+ 	for (i = 0; entries[i].normal_length || entries[i].special[0]; i++)
+@@ -1375,7 +1386,7 @@ _vte_keymap_key_add_key_modifiers(guint keyval,
+ 		return;
+ 	}
+ 
+-	switch (modifiers & significant_modifiers) {
++	switch (_vte_keymap_fixup_modifiers(modifiers, significant_modifiers)) {
+ 	case 0:
+ 		modifier = 0;
+ 		break;
+diff --git a/src/keymap.h b/src/keymap.h
+index 243e22e..21d9b8e 100644
+--- a/src/keymap.h
++++ b/src/keymap.h
+@@ -27,7 +27,7 @@
+ 
+ G_BEGIN_DECLS
+ 
+-#define VTE_META_MASK		GDK_META_MASK
++#define VTE_META_MASK		(GDK_META_MASK | GDK_MOD1_MASK)
+ #define VTE_NUMLOCK_MASK	GDK_MOD2_MASK
+ 
+ /* Map the specified keyval/modifier setup, dependent on the mode, to either
+-- 
+1.7.8.rc3
+
diff --git a/libraries/vte3/fix_meta_alt_keybinding.patch.gz b/libraries/vte3/fix_meta_alt_keybinding.patch.gz
deleted file mode 100644
index d28d9d0a067e62c3acbedc48d95cfe5b7d098418..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1246
zcmV<41R?t$iwFp{n%_<W17>M>Uu|V{VP9cvbYE*_d17g9WNB_^E^uLVV`u=aRc%k>
zMiBm-{S_lsx+XYrZ0C)Ha)t7CCkRxKR;o@XYi&>LEza8YuEWuT|K3?UK+Kh@A1=z<
z&g{<4JoC)s(;{1eyX!<@IGXIDI|#?lbd26)vJ7@d1Dv>HFABy(XX!Z;m}e4hFb8)6
zjx(#?;5m-VPASX`4paQXWmF(sXG&*lt#A!LY1HHuGCPP->MXOfB7V<~xyBhRO6-C=
zg3D}8fm|1y!OR)Yh7R<ck>jwNGWZiiJ%dlb9xjePe1<vCA;@$Badi8mf;nmqbR}J_
zL1(bm_+(vX1-##n^{v$#*q-e%2(wkrwFpEi^gUyTsmi*bgbWdWU!3^!lf|JwKfE~y
zp+IJLz+uJJE!+vZZdImQ<S9ZRv;u{?OW`5}op8;nzy&Ik6x`xHtg=Wf1s2NW)Qlb6
zgDh8Ah>)j%f0f)MQ{TwaOvYG1T=IfTjTo8ZcUf_3!y>@~sU(8S6sF2Bsp~0(%A}%P
zCEmfZl%W=x>@otvr%YBn_m|>JnfuQvb<Jf$Qct2X#ApwM29&Ba`I~A$ED6#3s!+D#
zI!uI&;rUOq8mhVmLnkPKr|FZ$W-QS<SF?UUDC56HnsPgq*$Pef`zp!qe6rhNEPfWz
z{&+l?Os1^Y>oHJ8*sn9ULwEo%^su&HuQnysCh))_y9Y~=QXyf&3Cf7LHKbY<76uj7
zwmMxHK!hpQ>t2U3f@KN4UQ96Xe&h0>v1CF<_ywlibI0SUZBIwRFdPNoI?i}FG`YVz
z&nVZ|F%Ax(H=R1&F<9n@=7=mx6Dvb%r&O92MHy=Fw;C81S((FE2Cc7W$LId}$sf=@
z9gI5NR%?5k@satl%iwX30kir$aE%mCP`m~ssac?M42>nKNp5DSW<gDYMw`3Lf*pcQ
z<wDa0py2_p=$DnU4p6a57f4eb0XGDT#9Am3q-euVpIK+o?R=BN;yy=a`EOIS{c7_|
z_LNDh^^KSA?=b5t`G~vimr~y~%jlTHFW!g!rhAXv1?sYpupPogC)Xph7!aaHfSUMG
z4QrnEpUxQemwA`q%8?i&HIQhU6SRS*m*7Vd6f77JrW|Peu^=fheIi(Cwh39D^ID}q
z@>LBWtTPc+{Bd1p*qwmoy6&i35ojAq`n2Pc=6jPDv7z+{m@2Fo)LN3+AdRpO)&B^W
zoWyO<>|?zxeBSLt+i>dU!^hJ_J?;-+3`bX&i|eb4CsR`q>h<Ms^NXva^BQ&o>`T~v
z_^-}y$<%kc8>leq+YR!9G}DNuX$B2jBq|Z8(QO$=TTph+9t{FD1Jx(-*_K(c;;Ema
zjOi)x@UZQxD8SQC&Sw%)%j(qK8B9i1cLuxTZ@Xgv=TYQuny@MQb-y+=tXl%q6h+S<
zO1?pDC1Od7ke(DTp*mou;A#8+1p412bt=AuoQUJhOj6GTHy9a1K;urM@s@xlP4P=M
z0_qJ1=y_<{o*PYrU3^nOlWzqysUY?y2H@)Z;K20v%>U)&?Bk_>d~$SgV*vYsNG;^6
z$2tiI5$JiztT%SG8{0O#n_nHf8xeu+bK7KVZ8my!eE80KLHID&p4hu~5e^vp2Q2{o
Irn(6L05T<GdjJ3c

diff --git a/libraries/vte3/vte3.SlackBuild b/libraries/vte3/vte3.SlackBuild
index 4182387917..61a4884722 100644
--- a/libraries/vte3/vte3.SlackBuild
+++ b/libraries/vte3/vte3.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for vte3
 
-# Copyright 2012 Willy Sudiarto Raharjo <willysr@slackware-id.org>
+# Copyright 2012-2013 Willy Sudiarto Raharjo <willysr@slackware-id.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,11 +24,10 @@
 
 SRCNAM=vte
 PRGNAM=vte3
-VERSION=${VERSION:-0.34.2}
+VERSION=${VERSION:-0.34.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) export ARCH=i486 ;;
@@ -56,11 +55,13 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
 cd $SRCNAM-$VERSION
 
 # Make sure ownerships and permissions are sane:
@@ -72,7 +73,7 @@ find . \
   -exec chmod 644 {} \;
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=663779
-zcat $CWD/fix_meta_alt_keybinding.patch.gz | patch -p1 || exit 1
+patch -p1 < $CWD/fix_meta_alt_keybinding.patch
 
 # Configure:
 CFLAGS="$SLKCFLAGS" \
diff --git a/libraries/vte3/vte3.info b/libraries/vte3/vte3.info
index f8bb427c4b..187bc5fc2f 100644
--- a/libraries/vte3/vte3.info
+++ b/libraries/vte3/vte3.info
@@ -1,8 +1,8 @@
 PRGNAM="vte3"
-VERSION="0.34.2"
+VERSION="0.34.4"
 HOMEPAGE="http://www.gnome.org/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/vte/0.34/vte-0.34.2.tar.xz"
-MD5SUM="523eae73bd93d58b9427357774956b22"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/vte/0.34/vte-0.34.4.tar.xz"
+MD5SUM="894a9b165f7992966134b6be9c775196"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""