[packages/vte] - updated to 0.38.1 (note: new library name; 0.36.x left on vte-0.36 branch) - updated alt-meta patc

qboosh qboosh at pld-linux.org
Sun Oct 19 09:09:45 CEST 2014 

commit c9db6ca21b826fee38bccb4dc493522d463a5a91
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Oct 19 09:10:28 2014 +0200

    - updated to 0.38.1 (note: new library name; 0.36.x left on vte-0.36 branch)
    - updated alt-meta patch (is it still needed?)
    - removed obsolete am patch

 vte-alt-meta.patch | 24 +++++++++++--------
 vte-am.patch       | 10 --------
 vte.spec           | 67 +++++++++++++++++++++++++++++++++++-------------------
 3 files changed, 57 insertions(+), 44 deletions(-)
---
diff --git a/vte.spec b/vte.spec
index 90a4a44..5c9218e 100644
--- a/vte.spec
+++ b/vte.spec
@@ -1,35 +1,37 @@
+# TODO: is alt-meta patch still needed?
 Summary:	VTE terminal widget library
 Summary(pl.UTF-8):	Biblioteka z kontrolką terminala VTE
 Name:		vte
-Version:	0.36.3
+Version:	0.38.1
 Release:	1
-License:	LGPL v2+
+License:	LGPL v2.1+
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/vte/0.36/%{name}-%{version}.tar.xz
-# Source0-md5:	3f9df4c9a67b09bf5c660bf5c3bae109
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/vte/0.38/%{name}-%{version}.tar.xz
+# Source0-md5:	b34acede2cabc2a4f86775365352aabc
 # https://bugzilla.gnome.org/show_bug.cgi?id=663779
 Patch0:		%{name}-alt-meta.patch
-Patch1:		%{name}-am.patch
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.32.0
+BuildRequires:	glib2-devel >= 1:2.40.0
 BuildRequires:	gobject-introspection-devel >= 0.10.0
-BuildRequires:	gtk+3-devel >= 3.2.0
+BuildRequires:	gtk+3-devel >= 3.8.0
 BuildRequires:	gtk-doc >= 1.13
 BuildRequires:	gtk-doc-automake >= 1.13
 BuildRequires:	intltool >= 0.40.0
 BuildRequires:	libtool >= 2:2.2
+BuildRequires:	libxml2-progs >= 2
 BuildRequires:	ncurses-devel
 BuildRequires:	pango-devel >= 1:1.22.0
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.592
 BuildRequires:	tar >= 1:1.22
+#BuildRequires:	vala >= 2:0.18
 BuildRequires:	xz
 Requires:	%{name}-common = %{version}-%{release}
-Requires:	glib2 >= 1:2.32.0
-Requires:	gtk+3 >= 3.2.0
+Requires:	glib2 >= 1:2.40.0
+Requires:	gtk+3 >= 3.8.0
 Requires:	pango >= 1:1.22.0
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
@@ -60,8 +62,8 @@ Summary:	Header files for VTE for GTK+ 3
 Summary(pl.UTF-8):	Pliki nagłówkowe VTE dla GTK+ 3
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.32.0
-Requires:	gtk+3-devel >= 3.2.0
+Requires:	glib2-devel >= 1:2.40.0
+Requires:	gtk+3-devel >= 3.8.0
 Requires:	ncurses-devel
 Requires:	pango-devel >= 1:1.22.0
 Conflicts:	gnome-libs-devel < 1.4.1.2
@@ -86,6 +88,19 @@ Static version of VTE library for GTK+ 3.
 %description static -l pl.UTF-8
 Statyczna wersja biblioteki VTE dla GTK+ 3.
 
+%package -n vala-vte
+Summary:	Vala API for VTE library
+Summary(pl.UTF-8):	API języka Vala dla biblioteki VTE
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	vala >= 2:0.18
+
+%description -n vala-vte
+Vala API for VTE library.
+
+%description -n vala-vte -l pl.UTF-8
+API języka Vala dla biblioteki VTE.
+
 %package apidocs
 Summary:	VTE API documentation (GTK+ 3 version)
 Summary(pl.UTF-8):	Dokumentacja API VTE (wersja dla GTK+ 3)
@@ -101,7 +116,6 @@ Dokumentacja API VTE (wersja dla GTK+ 3).
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__gtkdocize}
@@ -121,6 +135,7 @@ cd gnome-pty-helper
 cd ..
 %configure \
 	--disable-silent-rules \
+	--enable-gnome-pty-helper \
 	--enable-gtk-doc \
 	--enable-introspection \
 	--with-default-emulation=xterm \
@@ -135,7 +150,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
-%find_lang %{name}-2.90
+%find_lang %{name}-2.91
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -143,12 +158,12 @@ rm -rf $RPM_BUILD_ROOT
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
-%files -f vte-2.90.lang
+%files -f vte-2.91.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/vte2_90
-%attr(755,root,root) %{_libdir}/libvte2_90.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libvte2_90.so.9
-%{_libdir}/girepository-1.0/Vte-2.90.typelib
+%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
@@ -158,15 +173,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libvte2_90.so
-%{_includedir}/vte-2.90
-%{_pkgconfigdir}/vte-2.90.pc
-%{_datadir}/gir-1.0/Vte-2.90.gir
+%attr(755,root,root) %{_libdir}/libvte-2.91.so
+%{_includedir}/vte-2.91
+%{_pkgconfigdir}/vte-2.91.pc
+%{_datadir}/gir-1.0/Vte-2.91.gir
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libvte2_90.a
+%{_libdir}/libvte-2.91.a
+
+%files -n vala-vte
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/vte-2.91.vapi
 
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/vte-2.90
+%{_gtkdocdir}/vte-2.91
diff --git a/vte-alt-meta.patch b/vte-alt-meta.patch
index bd364be..e842ec4 100644
--- a/vte-alt-meta.patch
+++ b/vte-alt-meta.patch
@@ -20,14 +20,18 @@ 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},
+@@ -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)
@@ -35,19 +39,19 @@ index 9a21669..95b4c5b 100644
 +	return modifiers & mask;
 +}
 +
- /* Map the specified keyval/modifier setup, dependent on the mode, to either
-  * a literal string or a capability name. */
+ /* Map the specified keyval/modifier setup, dependent on the mode, to
+  * a literal string. */
  void
-@@ -1104,7 +1115,7 @@ _vte_keymap_map(guint keyval,
- 	} else {
- 		fkey_mode = fkey_default;
- 	}
+@@ -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 || entries[i].special[0]; i++)
-@@ -1375,7 +1386,7 @@ _vte_keymap_key_add_key_modifiers(guint keyval,
+ 	for (i = 0; entries[i].normal_length; i++)
+@@ -952,7 +967,7 @@
  		return;
  	}
  
diff --git a/vte-am.patch b/vte-am.patch
deleted file mode 100644
index e108e6e..0000000
--- a/vte-am.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- vte-0.34.3/gnome-pty-helper/configure.in.automake	2013-03-25 21:47:53.571692354 +0100
-+++ vte-0.34.3/gnome-pty-helper/configure.in	2013-03-25 21:48:01.931646994 +0100
-@@ -8,7 +8,6 @@ AC_CONFIG_SRCDIR([gnome-pty.h])
- AC_ISC_POSIX
- AC_PROG_CC
- AC_STDC_HEADERS
--AM_PROG_CC_STDC
- 
- if test -z "$enable_maintainer_mode"; then
-   enable_maintainer_mode=yes
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vte.git/commitdiff/c9db6ca21b826fee38bccb4dc493522d463a5a91

More information about the pld-cvs-commit mailing list