diff options
| -rw-r--r-- | libraries/vte3/fix_meta_alt_keybinding.patch | 74 | ||||
| -rw-r--r-- | libraries/vte3/vte3.SlackBuild | 8 | ||||
| -rw-r--r-- | libraries/vte3/vte3.info | 6 |
3 files changed, 4 insertions, 84 deletions
diff --git a/libraries/vte3/fix_meta_alt_keybinding.patch b/libraries/vte3/fix_meta_alt_keybinding.patch deleted file mode 100644 index bd364be584..0000000000 --- a/libraries/vte3/fix_meta_alt_keybinding.patch +++ /dev/null @@ -1,74 +0,0 @@ -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/vte3.SlackBuild b/libraries/vte3/vte3.SlackBuild index 1f642d8ea6..5a674034fa 100644 --- a/libraries/vte3/vte3.SlackBuild +++ b/libraries/vte3/vte3.SlackBuild @@ -24,7 +24,7 @@ SRCNAM=vte PRGNAM=vte3 -VERSION=${VERSION:-0.36.5} +VERSION=${VERSION:-0.42.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,9 +71,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# https://bugzilla.gnome.org/show_bug.cgi?id=663779 -patch -p1 < $CWD/fix_meta_alt_keybinding.patch - # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -92,9 +89,6 @@ CFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make make install DESTDIR=$PKG -# Remove this, it's included in the stock vte package: -rm $PKG/usr/libexec/gnome-pty-helper - find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/libraries/vte3/vte3.info b/libraries/vte3/vte3.info index 343dd44ccb..084f26aa4a 100644 --- a/libraries/vte3/vte3.info +++ b/libraries/vte3/vte3.info @@ -1,8 +1,8 @@ PRGNAM="vte3" -VERSION="0.36.5" +VERSION="0.42.1" HOMEPAGE="http://www.gnome.org/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/vte/0.36/vte-0.36.5.tar.xz" -MD5SUM="96f102ef9e178b6238edcfdb1fa9dbcc" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/vte/0.42/vte-0.42.1.tar.xz" +MD5SUM="f3775983b48771884466608ad123fe97" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |