[packages/vte] Update to 0.42.0
megabajt
megabajt at pld-linux.org
Mon Sep 28 18:39:46 CEST 2015
commit e91a0acd48d7bbe66db25b845ea4eb9dcd11eead
Author: Marcin Banasiak <marcin.banasiak at gmail.com>
Date: Mon Sep 28 18:39:08 2015 +0200
Update to 0.42.0
- removed obsolete -alt-meta.patch
- removed common subpackage
vte-alt-meta.patch | 78 ------------------------------------------------------
vte.spec | 33 +++++++----------------
2 files changed, 9 insertions(+), 102 deletions(-)
---
diff --git a/vte.spec b/vte.spec
index 00420ac..1322a72 100644
--- a/vte.spec
+++ b/vte.spec
@@ -2,20 +2,18 @@
Summary: VTE terminal widget library
Summary(pl.UTF-8): Biblioteka z kontrolką terminala VTE
Name: vte
-Version: 0.40.2
-Release: 2
+Version: 0.42.0
+Release: 1
License: LGPL v2.1+
Group: X11/Libraries
-Source0: http://ftp.gnome.org/pub/GNOME/sources/vte/0.40/%{name}-%{version}.tar.xz
-# Source0-md5: 6a7a6af8eb0ebadaf3338e820a7229a3
-# https://bugzilla.gnome.org/show_bug.cgi?id=663779
-Patch0: %{name}-alt-meta.patch
+Source0: http://ftp.gnome.org/pub/GNOME/sources/vte/0.42/%{name}-%{version}.tar.xz
+# Source0-md5: 6dd98fd69b66508dcc2707bcdbdab93c
BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1:1.9
BuildRequires: docbook-dtd412-xml
BuildRequires: gettext-devel
BuildRequires: glib2-devel >= 1:2.40.0
-BuildRequires: gnutls-devel >= 3.2.0
+BuildRequires: gnutls-devel >= 3.2.7
BuildRequires: gobject-introspection-devel >= 0.10.0
BuildRequires: gtk+3-devel >= 3.8.0
BuildRequires: gtk-doc >= 1.13
@@ -31,11 +29,11 @@ BuildRequires: tar >= 1:1.22
#BuildRequires: vala >= 2:0.18
BuildRequires: xz
BuildRequires: zlib-devel
-Requires: %{name}-common = %{version}-%{release}
Requires: glib2 >= 1:2.40.0
-Requires: gnutls >= 3.2.0
+Requires: gnutls >= 3.2.7
Requires: gtk+3 >= 3.8.0
Requires: pango >= 1:1.22.0
+Obsoletes: vte-common < 0.42.0
# sr at Latn vs. sr at latin
Conflicts: glibc-misc < 6:2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -66,7 +64,7 @@ Summary(pl.UTF-8): Pliki nagłówkowe VTE dla GTK+ 3
Group: X11/Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: glib2-devel >= 1:2.40.0
-Requires: gnutls-devel >= 3.2.0
+Requires: gnutls-devel >= 3.2.7
Requires: gtk+3-devel >= 3.8.0
Requires: ncurses-devel
Requires: pango-devel >= 1:1.22.0
@@ -123,7 +121,6 @@ Dokumentacja API VTE (wersja dla GTK+ 3).
%prep
%setup -q
-%patch0 -p1
%build
%{__gtkdocize}
@@ -134,16 +131,8 @@ Dokumentacja API VTE (wersja dla GTK+ 3).
%{__autoheader}
%{__automake}
%{__autoconf}
-cd gnome-pty-helper
-%{__libtoolize}
-%{__aclocal}
-%{__autoheader}
-%{__automake}
-%{__autoconf}
-cd ..
%configure \
--disable-silent-rules \
- --enable-gnome-pty-helper \
--enable-gtk-doc \
--enable-introspection \
--with-default-emulation=xterm \
@@ -168,17 +157,13 @@ rm -rf $RPM_BUILD_ROOT
%files -f vte-2.91.lang
%defattr(644,root,root,755)
+%doc AUTHORS ChangeLog MAINTAINERS NEWS README
%attr(755,root,root) %{_bindir}/vte-2.91
%attr(755,root,root) %{_libdir}/libvte-2.91.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libvte-2.91.so.0
%{_libdir}/girepository-1.0/Vte-2.91.typelib
%config(noreplace) %verify(not md5 mtime size) /etc/profile.d/vte.sh
-%files common
-%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog MAINTAINERS NEWS README
-%attr(2755,root,utmp) %{_libdir}/gnome-pty-helper
-
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libvte-2.91.so
diff --git a/vte-alt-meta.patch b/vte-alt-meta.patch
deleted file mode 100644
index e842ec4..0000000
--- a/vte-alt-meta.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 180dcc578e13c6096e277fb853e7162db640f207 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino at 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
-@@ -708,6 +708,21 @@
- {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);
-+
-+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
- * a literal string. */
- void
-@@ -751,7 +766,7 @@
- /* Build mode masks. */
- cursor_mode = app_cursor_keys ? cursor_app : cursor_default;
- keypad_mode = app_keypad_keys ? keypad_app : keypad_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; i++)
-@@ -952,7 +967,7 @@
- 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
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vte.git/commitdiff/e91a0acd48d7bbe66db25b845ea4eb9dcd11eead
More information about the pld-cvs-commit
mailing list