[packages/giggle] - fix building with vte 0.38 - rel 3

[baggins]

commit a1dc3607586184f7870b0eb2498582c366430a08
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Nov 19 20:22:12 2014 +0100

    - fix building with vte 0.38
    - rel 3

 giggle.spec    |  9 ++++++---
 vte-0.38.patch | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)
---
diff --git a/giggle.spec b/giggle.spec
index 440e64e..24618ed 100644
--- a/giggle.spec
+++ b/giggle.spec
@@ -6,13 +6,14 @@ Summary:	Graphical frontend for git
 Summary(pl.UTF-8):	Graficzna nakładka na git
 Name:		giggle
 Version:	0.7
-Release:	2
+Release:	3
 License:	GPL v2
 Group:		X11/Development/Tools
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/giggle/0.7/%{name}-%{version}.tar.xz
 # Source0-md5:	f5e756c13d9b59843c05b648901b9f28
 URL:		http://live.gnome.org/giggle
 Patch0:		gtksourceview-3.8.patch
+Patch1:		vte-0.38.patch
 BuildRequires:	autoconf >= 2.64
 BuildRequires:	automake >= 1.11
 BuildRequires:	evolution-data-server-devel >= 3.2
@@ -27,7 +28,7 @@ BuildRequires:	libtool >= 2.2.6
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	tar >= 1:1.22
-BuildRequires:	vte-devel >= 0.28
+BuildRequires:	vte-devel >= 0.38
 BuildRequires:	xz
 BuildRequires:	yelp-tools
 Requires(post,postun):	/sbin/ldconfig
@@ -63,6 +64,7 @@ Pliki programistyczne libgiggle.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__intltoolize}
@@ -71,7 +73,8 @@ Pliki programistyczne libgiggle.
 %{__autoconf}
 %{__automake}
 %configure \
-	--disable-silent-rules
+	--disable-silent-rules \
+	--enable-terminal
 %{__make}
 
 %install
diff --git a/vte-0.38.patch b/vte-0.38.patch
new file mode 100644
index 0000000..7620711
--- /dev/null
+++ b/vte-0.38.patch
@@ -0,0 +1,36 @@
+--- giggle-0.7/configure.ac~	2012-11-01 06:29:01.000000000 +0100
++++ giggle-0.7/configure.ac	2014-11-19 20:07:29.896975342 +0100
+@@ -109,7 +109,7 @@
+ AS_IF([test "x$enable_terminal" = "xyes"],
+       [
+         PKG_CHECK_MODULES([VTE],
+-                          [vte-2.90 >= $VTE_REQUIRED_VERSION],
++                          [vte-2.91 >= $VTE_REQUIRED_VERSION],
+                           [have_vte=yes
+                            AC_DEFINE([HAVE_VTE], [1],
+                                      [Use features from vte])
+--- giggle-0.7/plugins/giggle-view-terminal.c.orig	2014-11-19 20:19:10.433636937 +0100
++++ giggle-0.7/plugins/giggle-view-terminal.c	2014-11-19 20:19:26.986970150 +0100
+@@ -186,19 +186,19 @@
+ 	real_argv[1] = NULL;
+ 	spawn_flags = G_SPAWN_CHILD_INHERITS_STDIN | G_SPAWN_SEARCH_PATH | G_SPAWN_FILE_AND_ARGV_ZERO;
+ 
+-	succes = vte_terminal_fork_command_full (VTE_TERMINAL (terminal),
++	succes = vte_terminal_spawn_sync (VTE_TERMINAL (terminal),
+ 	                                         pty_flags,
+ 	                                         directory,
+ 	                                         real_argv,
+ 	                                         NULL,
+ 	                                         spawn_flags,
+ 	                                         NULL, NULL,
+-	                                         NULL,
++	                                         NULL, NULL,
+ 	                                         &error);
+ 	g_strfreev (real_argv);
+ 
+ 	if (succes == FALSE) {
+-		g_warning ("%s: %s: vte_terminal_fork_command_full failed %s",
++		g_warning ("%s: %s: vte_terminal_spawn_sync failed %s",
+ 		           G_STRLOC, G_STRFUNC, error->message);
+ 		g_error_free (error);
+ 	}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/giggle.git/commitdiff/a1dc3607586184f7870b0eb2498582c366430a08