Merge branch '3.0' into 3.1
This commit is contained in:
Danny Rawlins
commit
b30e93caf7
@ -1 +1 @@
|
||||
94cd984321b44ab622aa50f93ee66671 gnupg-2.0.24.tar.bz2
|
||||
048d8de797125f1d8e6cf3bdff9e2d12 gnupg-2.0.25.tar.bz2
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# Depends on: libgcrypt, libassuan, libksba, pinentry, libpth
|
||||
|
||||
name=gnupg
|
||||
version=2.0.24
|
||||
version=2.0.25
|
||||
release=1
|
||||
source=(ftp://ftp.gnupg.org/gcrypt/$name/$name-$version.tar.bz2)
|
||||
|
||||
|
||||
@ -7,9 +7,9 @@ drwxr-xr-x root/root usr/include/
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
-rw-r--r-- root/root usr/lib/libgpg-error.a
|
||||
-rwxr-xr-x root/root usr/lib/libgpg-error.la
|
||||
lrwxrwxrwx root/root usr/lib/libgpg-error.so -> libgpg-error.so.0.10.0
|
||||
lrwxrwxrwx root/root usr/lib/libgpg-error.so.0 -> libgpg-error.so.0.10.0
|
||||
-rwxr-xr-x root/root usr/lib/libgpg-error.so.0.10.0
|
||||
lrwxrwxrwx root/root usr/lib/libgpg-error.so -> libgpg-error.so.0.11.0
|
||||
lrwxrwxrwx root/root usr/lib/libgpg-error.so.0 -> libgpg-error.so.0.11.0
|
||||
-rwxr-xr-x root/root usr/lib/libgpg-error.so.0.11.0
|
||||
drwxr-xr-x root/root usr/share/
|
||||
drwxr-xr-x root/root usr/share/aclocal/
|
||||
-rw-r--r-- root/root usr/share/aclocal/gpg-error.m4
|
||||
|
||||
@ -1 +1 @@
|
||||
8f0eb41a344d19ac2aa9bd101dfb9ce6 libgpg-error-1.12.tar.bz2
|
||||
fe0cfa7e15262ef8fdeee366109e9ff6 libgpg-error-1.13.tar.bz2
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Packager: Matt Housh, jaeger at morpheus dot net
|
||||
|
||||
name=libgpg-error
|
||||
version=1.12
|
||||
version=1.13
|
||||
release=1
|
||||
source=(ftp://ftp.gnupg.org/gcrypt/libgpg-error/$name-$version.tar.bz2)
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
name=squid
|
||||
version=3.4.6
|
||||
release=1
|
||||
release=2
|
||||
source=(http://www.squid-cache.org/Versions/v3/3.4/$name-$version.tar.xz
|
||||
squid)
|
||||
|
||||
@ -23,6 +23,7 @@ build () {
|
||||
--with-default-user=squid \
|
||||
--enable-linux-netfilter \
|
||||
--enable-storeio=ufs,aufs,diskd,rock \
|
||||
--enable-removal-policies=lru,heap \
|
||||
--with-large-files \
|
||||
--with-pthreads \
|
||||
--with-aufs-threads=16 \
|
||||
|
||||
31
vte3/.footprint
Normal file
31
vte3/.footprint
Normal file
@ -0,0 +1,31 @@
|
||||
drwxr-xr-x root/root etc/
|
||||
drwxr-xr-x root/root etc/profile.d/
|
||||
-rw-r--r-- root/root etc/profile.d/vte.sh
|
||||
drwxr-xr-x root/root usr/
|
||||
drwxr-xr-x root/root usr/bin/
|
||||
-rwxr-xr-x root/root usr/bin/vte2_90
|
||||
drwxr-xr-x root/root usr/include/
|
||||
drwxr-xr-x root/root usr/include/vte-2.90/
|
||||
drwxr-xr-x root/root usr/include/vte-2.90/vte/
|
||||
-rw-r--r-- root/root usr/include/vte-2.90/vte/pty.h
|
||||
-rw-r--r-- root/root usr/include/vte-2.90/vte/reaper.h
|
||||
-rw-r--r-- root/root usr/include/vte-2.90/vte/vte.h
|
||||
-rw-r--r-- root/root usr/include/vte-2.90/vte/vteaccess.h
|
||||
-rw-r--r-- root/root usr/include/vte-2.90/vte/vtedeprecated.h
|
||||
-rw-r--r-- root/root usr/include/vte-2.90/vte/vtepty.h
|
||||
-rw-r--r-- root/root usr/include/vte-2.90/vte/vtetypebuiltins.h
|
||||
-rw-r--r-- root/root usr/include/vte-2.90/vte/vteversion.h
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
drwxr-xr-x root/root usr/lib/girepository-1.0/
|
||||
-rw-r--r-- root/root usr/lib/girepository-1.0/Vte-2.90.typelib
|
||||
-rw-r--r-- root/root usr/lib/libvte2_90.a
|
||||
-rwxr-xr-x root/root usr/lib/libvte2_90.la
|
||||
lrwxrwxrwx root/root usr/lib/libvte2_90.so -> libvte2_90.so.9.3600.3
|
||||
lrwxrwxrwx root/root usr/lib/libvte2_90.so.9 -> libvte2_90.so.9.3600.3
|
||||
-rwxr-xr-x root/root usr/lib/libvte2_90.so.9.3600.3
|
||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/vte-2.90.pc
|
||||
drwxr-xr-x root/root usr/lib/vte/
|
||||
drwxr-xr-x root/root usr/share/
|
||||
drwxr-xr-x root/root usr/share/gir-1.0/
|
||||
-rw-r--r-- root/root usr/share/gir-1.0/Vte-2.90.gir
|
||||
2
vte3/.md5sum
Normal file
2
vte3/.md5sum
Normal file
@ -0,0 +1,2 @@
|
||||
6bf2c631a5f51a29d46d63e5333082ce vte-0.30.1-alt-meta.patch
|
||||
3f9df4c9a67b09bf5c660bf5c3bae109 vte-0.36.3.tar.xz
|
||||
33
vte3/Pkgfile
Normal file
33
vte3/Pkgfile
Normal file
@ -0,0 +1,33 @@
|
||||
# Description: Virtual Terminal Emulator widget for use with GTK3.
|
||||
# URL: http://developer.gnome.org/arch/gnome/widgets/vte.html
|
||||
# Maintainer: Danny Rawlins, monster dot romster at gmail dot com
|
||||
# Packager: Danny Rawlins, monster dot romster at gmail dot com
|
||||
# Depends on: gtk3 util-linux xorg-libxdamage
|
||||
|
||||
name=vte3
|
||||
version=0.36.3
|
||||
release=2
|
||||
source=(http://download.gnome.org/sources/vte/${version::4}/vte-$version.tar.xz
|
||||
vte-0.30.1-alt-meta.patch)
|
||||
|
||||
build() {
|
||||
cd vte-$version
|
||||
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=663779
|
||||
patch -p1 -i $SRC/vte-0.30.1-alt-meta.patch
|
||||
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--libexecdir=/usr/lib/vte \
|
||||
--enable-introspection=yes \
|
||||
--disable-nls \
|
||||
--disable-gtk-doc-html
|
||||
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
|
||||
rm -r $PKG/usr/share/{gtk-doc,locale}
|
||||
|
||||
rm $PKG/usr/lib/vte/gnome-pty-helper
|
||||
}
|
||||
74
vte3/vte-0.30.1-alt-meta.patch
Normal file
74
vte3/vte-0.30.1-alt-meta.patch
Normal file
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user