vte: Split non-standard multi-file patch into separate files.

Avoids issues when developing with mkpatches from pkgtools/pkgdiff.

3 files changed, 33 insertions, 27 deletions

diff --git a/x11/vte/distinfo b/x11/vte/distinfo
index d6fc4049962..815003f72bc 100644
--- a/x11/vte/distinfo
+++ b/x11/vte/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.55 2017/10/19 13:51:34 jperkin Exp $
+$NetBSD: distinfo,v 1.56 2017/10/19 13:59:01 jperkin Exp $
 
 SHA1 (vte-0.28.1.tar.bz2) = 9867f84c6be65ff485d8a1a3c41a359709b6f84c
 RMD160 (vte-0.28.1.tar.bz2) = e0748777f5a57266762b3dd88f7a10b143e412d9
@@ -10,7 +10,8 @@ SHA1 (patch-ac) = 3b357bf9d1bca93c24f5b09dae1adec82323be0d
 SHA1 (patch-af) = 69ea7e022f6c495c3c9af681d05644b9d70e7bdc
 SHA1 (patch-ah) = 28cee2661439d7d6f1959ebf3c7d1b7b3fe0a764
 SHA1 (patch-ai) = 4c365d1d05faa2d9bd0f8f21d500a72605f092d9
-SHA1 (patch-altmeta) = 1fc77f879dfb76220ebe6a6e5769c2662fec58a9
 SHA1 (patch-config.h.in) = 1d80496a6f4299adc0749cf65339ee8407309a17
 SHA1 (patch-configure) = dc8dd91cfee84eaf62c6813defcbf311ebdcfedc
 SHA1 (patch-gnome-pty-helper_config.h.in) = bee681f4e5102213eeeee6a825d02d31b3d0c63d
+SHA1 (patch-src_keymap.c) = 165ef9ec2a46eb78ade34b5651dcd97bf6e5c96e
+SHA1 (patch-src_keymap.h) = de51c3182a4ce3adabc3c2ab6180202b47b282fd
diff --git a/x11/vte/patches/patch-altmeta b/x11/vte/patches/patch-src_keymap.c
index 56a353812ca..4824cd4552f 100644
--- a/x11/vte/patches/patch-altmeta
+++ b/x11/vte/patches/patch-src_keymap.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-altmeta,v 1.2 2015/12/29 04:04:32 dholland Exp $
+$NetBSD: patch-src_keymap.c,v 1.1 2017/10/19 13:59:01 jperkin Exp $
 
 From 180dcc578e13c6096e277fb853e7162db640f207 Mon Sep 17 00:00:00 2001
 From: Alexandre Rostovtsev <tetromino@gentoo.org>
@@ -13,14 +13,8 @@ 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
---- src/keymap.c
+--- src/keymap.c.orig	2011-06-14 21:29:20.000000000 +0000
 +++ src/keymap.c
 @@ -990,6 +990,17 @@ static const struct _vte_keymap_group {
  	{GDK_KEY (F35),		_vte_keymap_GDK_F35},
@@ -49,7 +43,7 @@ index 9a21669..95b4c5b 100644
  
  	/* 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,
+@@ -1375,7 +1386,7 @@ _vte_keymap_key_add_key_modifiers(guint 
  		return;
  	}
  
@@ -58,19 +52,3 @@ index 9a21669..95b4c5b 100644
  	case 0:
  		modifier = 0;
  		break;
-diff --git a/src/keymap.h b/src/keymap.h
-index 243e22e..21d9b8e 100644
---- src/keymap.h
-+++ 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/x11/vte/patches/patch-src_keymap.h b/x11/vte/patches/patch-src_keymap.h
new file mode 100644
index 00000000000..b299c96d24f
--- /dev/null
+++ b/x11/vte/patches/patch-src_keymap.h
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_keymap.h,v 1.1 2017/10/19 13:59:01 jperkin Exp $
+
+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.h.orig	2011-06-07 17:01:32.000000000 +0000
++++ 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