diff --git a/.gitignore b/.gitignore index 952c007..820bab4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/vte-0.34.6.tar.xz +SOURCES/vte-0.36.4.tar.xz diff --git a/.vte3.metadata b/.vte3.metadata index 25b36e1..6a7f17d 100644 --- a/.vte3.metadata +++ b/.vte3.metadata @@ -1 +1 @@ -e393ff91e431b6faf0661259fb7635c6e5a64875 SOURCES/vte-0.34.6.tar.xz +661286334559c028fdc72ffb954807c048c44109 SOURCES/vte-0.36.4.tar.xz diff --git a/SOURCES/honey-I-shrank-the-terminal.patch b/SOURCES/honey-I-shrank-the-terminal.patch deleted file mode 100644 index f8f19db..0000000 --- a/SOURCES/honey-I-shrank-the-terminal.patch +++ /dev/null @@ -1,28 +0,0 @@ -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); - diff --git a/SOURCES/vte-alt-meta-confusion.patch b/SOURCES/vte-alt-meta-confusion.patch deleted file mode 100644 index bd364be..0000000 --- a/SOURCES/vte-alt-meta-confusion.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 180dcc578e13c6096e277fb853e7162db640f207 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -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/SPECS/vte3.spec b/SPECS/vte3.spec index daf5b33..731807e 100644 --- a/SPECS/vte3.spec +++ b/SPECS/vte3.spec @@ -1,14 +1,14 @@ +%global apiver 2.90 + Name: vte3 -Version: 0.34.6 -Release: 3%{?dist} -Summary: A terminal emulator +Version: 0.36.4 +Release: 1%{?dist} +Summary: Terminal emulator library License: LGPLv2+ Group: User Interface/X +URL: http://www.gnome.org/ #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 +Source: http://download.gnome.org/sources/vte/0.36/vte-%{version}.tar.xz # https://bugzilla.gnome.org/show_bug.cgi?id=688456 Patch2: 0001-widget-Only-show-the-cursor-on-motion-if-moved.patch @@ -21,27 +21,28 @@ BuildRequires: gobject-introspection-devel # initscripts creates the utmp group Requires: initscripts +Requires: vte-profile %description -VTE is a terminal emulator widget for use with GTK+. +VTE is a library implementing a terminal emulator widget for GTK+. VTE +is mainly used in gnome-terminal, but can also be used to embed a +console/terminal in games, editors, IDEs, etc. + +VTE supports Unicode and character set conversion, as well as emulating +any terminal known to the system's terminfo database. %package devel -Summary: Files needed for developing applications which use vte +Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: ncurses-devel +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: ncurses-devel%{?_isa} %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. +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. %prep %setup -q -n vte-%{version} -%patch0 -p1 -b .grow-up -%patch1 -p1 -b .alt-meta %patch2 -p1 -b .motion %build @@ -52,32 +53,32 @@ LDFLAGS="$LDFLAGS -Wl,-z,relro -Wl,-z,now -pie" \ --enable-shared \ --disable-static \ --with-gtk=3.0 \ - --libexecdir=%{_libdir}/vte-2.90 \ + --libexecdir=%{_libdir}/vte-%{apiver} \ --without-glX \ --disable-gtk-doc \ --enable-introspection -make V=1 +make %{?_smp_mflags} V=1 %install make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_libdir}/*.a +# Remove the vte.sh built here and use the one from the vte-profile package +# instead. +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/vte.sh + rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -%find_lang vte-2.90 +%find_lang vte-%{apiver} %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 +%files -f vte-%{apiver}.lang +%doc COPYING NEWS README %{_libdir}/*.so.* -%dir %{_libdir}/vte-2.90 -%attr(2711,root,utmp) %{_libdir}/vte-2.90/gnome-pty-helper +%dir %{_libdir}/vte-%{apiver} +%attr(2711,root,utmp) %{_libdir}/vte-%{apiver}/gnome-pty-helper %{_libdir}/girepository-1.0 %files devel @@ -85,11 +86,14 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/*.so %{_libdir}/pkgconfig/* %{_bindir}/vte2_90 -%doc %{_datadir}/gtk-doc/html/vte-2.90 +%doc %{_datadir}/gtk-doc/ %{_datadir}/gir-1.0 %changelog +* Tue May 19 2015 David King - 0.36.4-1 +- Update to 0.36.4 (#1222692) + * Fri Jan 24 2014 Daniel Mach - 0.34.6-3 - Mass rebuild 2014-01-24