Compare commits
2 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
cfb4d21bc5 | ||
|
9e9d1e0acf |
8 changed files with 385 additions and 1 deletions
20
.gitignore
vendored
Normal file
20
.gitignore
vendored
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
/vte-0.27.0.tar.bz2
|
||||
/vte-0.27.2-gitd512516.tar.bz2
|
||||
/vte-0.27.2.tar.bz2
|
||||
/vte-0.27.3.tar.bz2
|
||||
/vte-0.27.4.tar.bz2
|
||||
/vte-0.27.5.tar.bz2
|
||||
/vte-0.27.90.tar.bz2
|
||||
/vte-0.28.0.tar.bz2
|
||||
/vte-0.28.1.tar.xz
|
||||
/vte-0.29.1.tar.xz
|
||||
/vte-0.30.0.tar.xz
|
||||
/vte-0.30.1.tar.xz
|
||||
/vte-0.31.0.tar.xz
|
||||
/vte-0.32.0.tar.xz
|
||||
/vte-0.32.1.tar.xz
|
||||
/vte-0.32.2.tar.xz
|
||||
/vte-0.33.90.tar.xz
|
||||
/vte-0.34.0.tar.xz
|
||||
/vte-0.34.1.tar.xz
|
||||
/vte-0.34.2.tar.xz
|
||||
39
0001-widget-Only-show-the-cursor-on-motion-if-moved.patch
Normal file
39
0001-widget-Only-show-the-cursor-on-motion-if-moved.patch
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
From 9077ef68bebee9a22d836a00af72aa02d5628ed4 Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Fri, 16 Nov 2012 16:18:05 +0100
|
||||
Subject: [PATCH] widget: Only show the cursor on motion if moved
|
||||
|
||||
Some devices, like Wacom tablets, will emit mouse motion
|
||||
events even when the mouse doesn't move on the tablet. This
|
||||
means that the mouse cursor will show up on the screen very shortly
|
||||
after hiding.
|
||||
|
||||
We now check the motion event against the last location of the
|
||||
mouse cursor to avoid this behaviour.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=688456
|
||||
---
|
||||
src/vte.c | 7 +++++--
|
||||
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/vte.c b/src/vte.c
|
||||
index bbe6cf6..c5922e6 100644
|
||||
--- a/src/vte.c
|
||||
+++ b/src/vte.c
|
||||
@@ -7294,8 +7294,11 @@ vte_terminal_motion_notify(GtkWidget *widget, GdkEventMotion *event)
|
||||
} else {
|
||||
/* Hilite any matches. */
|
||||
vte_terminal_match_hilite(terminal, x, y);
|
||||
- /* Show the cursor. */
|
||||
- _vte_terminal_set_pointer_visible(terminal, TRUE);
|
||||
+ /* Show the cursor if we moved. */
|
||||
+ if (event->type != GDK_MOTION_NOTIFY ||
|
||||
+ x != terminal->pvt->mouse_last_x ||
|
||||
+ y != terminal->pvt->mouse_last_y)
|
||||
+ _vte_terminal_set_pointer_visible(terminal, TRUE);
|
||||
}
|
||||
|
||||
switch (event->type) {
|
||||
--
|
||||
1.8.0
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
Retire vte3 now that all dependencies have been ported to newer vte291.
|
||||
28
honey-I-shrank-the-terminal.patch
Normal file
28
honey-I-shrank-the-terminal.patch
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
diff -up vte-0.27.4/src/vte.c.grow-up vte-0.27.4/src/vte.c
|
||||
--- vte-0.27.4/src/vte.c.grow-up 2011-01-11 13:37:37.000000000 -0500
|
||||
+++ vte-0.27.4/src/vte.c 2011-01-14 11:31:27.159520002 -0500
|
||||
@@ -8133,6 +8133,24 @@ vte_terminal_init(VteTerminal *terminal)
|
||||
|
||||
_vte_debug_print(VTE_DEBUG_LIFECYCLE, "vte_terminal_init()\n");
|
||||
|
||||
+#if GTK_CHECK_VERSION (2, 91, 2)
|
||||
+ static GtkCssProvider *provider;
|
||||
+ GtkStyleContext *context;
|
||||
+
|
||||
+ if (provider == NULL) {
|
||||
+ provider = gtk_css_provider_new ();
|
||||
+ gtk_css_provider_load_from_data (GTK_CSS_PROVIDER (provider),
|
||||
+ "VteTerminal {\n"
|
||||
+ " -VteTerminal-inner-border: 1;\n"
|
||||
+ "}\n", -1, NULL);
|
||||
+ }
|
||||
+
|
||||
+ context = gtk_widget_get_style_context (GTK_WIDGET (terminal));
|
||||
+ gtk_style_context_add_provider (context,
|
||||
+ GTK_STYLE_PROVIDER (provider),
|
||||
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
|
||||
+#endif
|
||||
+
|
||||
/* Initialize private data. */
|
||||
pvt = terminal->pvt = G_TYPE_INSTANCE_GET_PRIVATE (terminal, VTE_TYPE_TERMINAL, VteTerminalPrivate);
|
||||
|
||||
1
sources
Normal file
1
sources
Normal file
|
|
@ -0,0 +1 @@
|
|||
523eae73bd93d58b9427357774956b22 vte-0.34.2.tar.xz
|
||||
74
vte-alt-meta-confusion.patch
Normal file
74
vte-alt-meta-confusion.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
|
||||
|
||||
34
vte3-make_VteCharAttributes_introspectable.patch
Normal file
34
vte3-make_VteCharAttributes_introspectable.patch
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
From 2ba27999b537300f4beb92ca27830fbd4197740e Mon Sep 17 00:00:00 2001
|
||||
From: Simon Schampijer <simon@laptop.org>
|
||||
Date: Wed, 28 Nov 2012 20:14:59 +0000
|
||||
Subject: Move definition of VteCharAttributes up, #676999
|
||||
|
||||
I found the element-type for the attributes in vte_terminal_get_text
|
||||
vte_terminal_get_text_include_trailing_spaces and vte_terminal_get_text_range
|
||||
strange to be of type "Vte.CharAttributes" and not VteCharAttributes but when I
|
||||
changed it I only got a warning. Then I saw that there was already a warning
|
||||
about "Unknown namespace for identifier 'vte_char_attributes'", so I moved the
|
||||
definition of VteCharAttributes and now those functions are introspectable.
|
||||
---
|
||||
diff --git a/src/vte.h b/src/vte.h
|
||||
index ed3fafe..35fb0f4 100644
|
||||
--- a/src/vte.h
|
||||
+++ b/src/vte.h
|
||||
@@ -57,6 +57,7 @@ typedef struct _VteTerminal VteTerminal;
|
||||
typedef struct _VteTerminalPrivate VteTerminalPrivate;
|
||||
typedef struct _VteTerminalClass VteTerminalClass;
|
||||
typedef struct _VteTerminalClassPrivate VteTerminalClassPrivate;
|
||||
+typedef struct _VteCharAttributes VteCharAttributes;
|
||||
|
||||
/**
|
||||
* VteTerminal:
|
||||
@@ -242,7 +243,6 @@ struct _VteCharAttributes {
|
||||
GdkColor fore, back;
|
||||
guint underline:1, strikethrough:1;
|
||||
};
|
||||
-typedef struct _VteCharAttributes VteCharAttributes;
|
||||
|
||||
/* The name of the same structure in the 0.10 series, for API compatibility. */
|
||||
struct vte_char_attributes {
|
||||
--
|
||||
cgit v0.9.0.2
|
||||
189
vte3.spec
Normal file
189
vte3.spec
Normal file
|
|
@ -0,0 +1,189 @@
|
|||
Name: vte3
|
||||
Version: 0.34.2
|
||||
Release: 3%{?dist}
|
||||
Summary: A terminal emulator
|
||||
License: LGPLv2+
|
||||
Group: User Interface/X
|
||||
#VCS: git:git://git.gnome.org/vte
|
||||
Source: http://download.gnome.org/sources/vte/0.34/vte-%{version}.tar.xz
|
||||
Patch0: honey-I-shrank-the-terminal.patch
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=663779
|
||||
Patch1: vte-alt-meta-confusion.patch
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=688456
|
||||
Patch2: 0001-widget-Only-show-the-cursor-on-motion-if-moved.patch
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=676999
|
||||
Patch3: vte3-make_VteCharAttributes_introspectable.patch
|
||||
|
||||
BuildRequires: gtk3-devel >= 3.0.0
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: gettext
|
||||
BuildRequires: libXt-devel
|
||||
BuildRequires: intltool
|
||||
BuildRequires: gobject-introspection-devel
|
||||
|
||||
# initscripts creates the utmp group
|
||||
Requires: initscripts
|
||||
|
||||
%description
|
||||
VTE is a terminal emulator widget for use with GTK+.
|
||||
|
||||
%package devel
|
||||
Summary: Files needed for developing applications which use vte
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: ncurses-devel
|
||||
|
||||
%description devel
|
||||
The vte-devel package includes the header files and developer docs
|
||||
for the vte package.
|
||||
|
||||
Install vte-devel if you want to develop programs which will use
|
||||
vte.
|
||||
|
||||
%prep
|
||||
%setup -q -n vte-%{version}
|
||||
%patch0 -p1 -b .grow-up
|
||||
%patch1 -p1 -b .alt-meta
|
||||
%patch2 -p1 -b .motion
|
||||
%patch3 -p1 -b .VteCharAttributes_introspectable
|
||||
|
||||
%build
|
||||
%configure \
|
||||
--enable-shared \
|
||||
--disable-static \
|
||||
--with-gtk=3.0 \
|
||||
--libexecdir=%{_libdir}/vte-2.90 \
|
||||
--without-glX \
|
||||
--disable-gtk-doc \
|
||||
--enable-introspection
|
||||
make
|
||||
|
||||
%install
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
|
||||
|
||||
%find_lang vte-2.90
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files -f vte-2.90.lang
|
||||
%doc COPYING HACKING NEWS README
|
||||
%doc src/iso2022.txt
|
||||
%doc doc/utmpwtmp.txt doc/boxes.txt doc/openi18n/UTF-8.txt doc/openi18n/wrap.txt
|
||||
%{_sysconfdir}/profile.d/vte.sh
|
||||
%{_libdir}/*.so.*
|
||||
%dir %{_libdir}/vte-2.90
|
||||
%attr(2711,root,utmp) %{_libdir}/vte-2.90/gnome-pty-helper
|
||||
%{_libdir}/girepository-1.0
|
||||
|
||||
%files devel
|
||||
%{_includedir}/*
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/pkgconfig/*
|
||||
%{_bindir}/vte2_90
|
||||
%doc %{_datadir}/gtk-doc/html/vte-2.90
|
||||
%{_datadir}/gir-1.0
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Nov 29 2012 Peter Robinson <pbrobinson@fedoraproject.org> 0.34.2-3
|
||||
- Add patch to fix an introspection issue. Fixes RHBZ #881662
|
||||
|
||||
* Fri Nov 16 2012 Bastien Nocera <bnocera@redhat.com> 0.34.2-2
|
||||
- Only show the cursor on motion if moved
|
||||
|
||||
* Tue Nov 13 2012 Kalev Lember <kalevlember@gmail.com> - 0.34.2-1
|
||||
- Update to 0.34.2
|
||||
|
||||
* Tue Oct 16 2012 Kalev Lember <kalevlember@gmail.com> - 0.34.1-1
|
||||
- Update to 0.34.1
|
||||
|
||||
* Tue Sep 18 2012 Kalev Lember <kalevlember@gmail.com> - 0.34.0-1
|
||||
- Update to 0.34.0
|
||||
- Include /etc/profile.d/vte.sh
|
||||
|
||||
* Wed Aug 22 2012 Richard Hughes <hughsient@gmail.com> - 0.33.90-1
|
||||
- Update to 0.33.90
|
||||
|
||||
* Fri Jul 27 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.32.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Thu Jun 07 2012 Richard Hughes <hughsient@gmail.com> - 0.32.2-1
|
||||
- Update to 0.32.2
|
||||
|
||||
* Tue Apr 17 2012 Kalev Lember <kalevlember@gmail.com> - 0.32.1-1
|
||||
- Update to 0.32.1
|
||||
|
||||
* Wed Mar 21 2012 Kalev Lember <kalevlember@gmail.com> - 0.32.0-1
|
||||
- Update to 0.32.0
|
||||
- Dropped upstreamed vte-scroll-mask.patch
|
||||
|
||||
* Wed Mar 07 2012 Kalev Lember <kalevlember@gmail.com> - 0.31.0-4
|
||||
- Fix scrolling with latest gtk3
|
||||
|
||||
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.31.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Wed Dec 14 2011 Tomas Bzatek <tbzatek@redhat.com> - 0.31.0-2
|
||||
- Fix problems with Alt<>Meta with recent gtk
|
||||
|
||||
* Mon Nov 21 2011 Matthias Clasen <mclasen@redhat.com> - 0.31.0-1
|
||||
- Update to 0.31.0
|
||||
|
||||
* Wed Oct 26 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.30.1-2
|
||||
- Rebuilt for glibc bug#747377
|
||||
|
||||
* Tue Oct 18 2011 Matthias Clasen <mclasen@redhat.com> - 0.30.1-1
|
||||
- Update to 0.30.1
|
||||
|
||||
* Tue Sep 27 2011 Ray <rstrode@redhat.com> - 0.30.0-1
|
||||
- Update to 0.30.0
|
||||
|
||||
* Wed Aug 31 2011 Matthias Clasen <mclasen@redhat.com> - 0.29.1-1
|
||||
- Update to 0.29.1
|
||||
|
||||
* Thu Jun 16 2011 Tomas Bzatek <tbzatek@redhat.com> - 0.28.1-1
|
||||
- Update to 0.28.1
|
||||
|
||||
* Mon Apr 4 2011 Matthias Clasen <mclasen@redhat.com> 0.28.0-1
|
||||
- Update to 0.28.0
|
||||
|
||||
* Thu Feb 24 2011 Matthias Clasen <mclasen@redhat.com> 0.27.90-2
|
||||
- Enable introspection
|
||||
|
||||
* Tue Feb 22 2011 Matthias Clasen <mclasen@redhat.com> 0.27.90-1
|
||||
- Update to 0.27.90
|
||||
|
||||
* Thu Feb 10 2011 Matthias Clasen <mclasen@redhat.com> 0.27.5-3
|
||||
- Rebuild against newer gtk
|
||||
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.27.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Wed Feb 2 2011 Matthias Clasen <mclasen@redhat.com> 0.27.5-1
|
||||
- 0.27.5
|
||||
|
||||
* Fri Jan 14 2011 Matthias Clasen <mclasen@redhat.com> 0.27.4-2
|
||||
- Stop shrinking-terminal disease
|
||||
|
||||
* Tue Jan 11 2011 Matthias Clasen <mclasen@redhat.com> 0.27.4-1
|
||||
- Update to 0.27.4
|
||||
|
||||
* Fri Jan 7 2011 Matthias Clasen <mclasen@redhat.com> 0.27.3-1
|
||||
- Update to 0.27.3
|
||||
|
||||
* Fri Dec 3 2010 Matthias Clasen <mclasen@redhat.com> 0.27.2-2
|
||||
- Rebuild against new gtk
|
||||
|
||||
* Thu Nov 11 2010 Matthias Clasen <mclasen@redhat.com> 0.27.2-1
|
||||
- Update to 0.27.2
|
||||
|
||||
* Mon Nov 1 2010 Matthias Clasen <mclasen@redhat.com> 0.27.2-0.1.git512516
|
||||
- Git snapshot that builds with recent gtk3
|
||||
|
||||
* Mon Oct 4 2010 Matthias Clasen <mclasen@redhat.com> 0.27.0-1
|
||||
- Initial packaging
|
||||
Loading…
Add table
Add a link
Reference in a new issue