[arch-commits] Commit in giggle/trunk (PKGBUILD vte2.91.patch)

[Jan Steffens]

    Date: Sunday, September 28, 2014 @ 23:48:34
  Author: heftig
Revision: 119715

vte2.91

Added:
  giggle/trunk/vte2.91.patch
Modified:
  giggle/trunk/PKGBUILD

---------------+
 PKGBUILD      |   11 +++++++----
 vte2.91.patch |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-28 20:40:39 UTC (rev 119714)
+++ PKGBUILD	2014-09-28 21:48:34 UTC (rev 119715)
@@ -4,22 +4,25 @@
 
 pkgname=giggle
 pkgver=0.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Git repository viewer"
 arch=(i686 x86_64)
 url="https://wiki.gnome.org/Apps/giggle"
 license=(GPL)
 depends=(git gtksourceview3 vte3 desktop-file-utils hicolor-icon-theme)
-makedepends=(intltool itstool)
+makedepends=(intltool itstool gnome-common yelp-tools)
 install=giggle.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/giggle/0.7/$pkgname-$pkgver.tar.xz
-        gtksourceview3.7.patch)
+        gtksourceview3.7.patch vte2.91.patch)
 sha256sums=('ae2e2237fa0d0999d99d0a0ee9b7ec147e80bd2472d59a045b2b01eb02261f59'
-            'ca0b841d11bb5072741784dbeb72705eddf8e2bde780b8712355d5b66e456b37')
+            'ca0b841d11bb5072741784dbeb72705eddf8e2bde780b8712355d5b66e456b37'
+            '2eba9ff9b11ac8ae2d1f3d104a61026b0b04e745f810f719c8f4657f8c23ce02')
 
 prepare() {
   cd $pkgname-$pkgver
   patch -Np1 -i ../gtksourceview3.7.patch
+  patch -Np1 -i ../vte2.91.patch
+  NOCONFIGURE=1 AUTOPOINT=intltoolize gnome-autogen.sh
 }
 
 build() {

Added: vte2.91.patch
===================================================================
--- vte2.91.patch	                        (rev 0)
+++ vte2.91.patch	2014-09-28 21:48:34 UTC (rev 119715)
@@ -0,0 +1,50 @@
+diff -u -r giggle-0.7/configure.ac giggle-0.7-vte2.91/configure.ac
+--- giggle-0.7/configure.ac	2012-11-01 06:29:01.000000000 +0100
++++ giggle-0.7-vte2.91/configure.ac	2014-09-28 23:31:40.389429740 +0200
+@@ -56,7 +56,7 @@
+ GTK_REQUIRED_VERSION=3.3.12
+ GTKSOURCE_REQUIRED_VERSION=3.0
+ EDS_REQUIRED_VERSION=3.2
+-VTE_REQUIRED_VERSION=0.28
++VTE_REQUIRED_VERSION=0.38
+ 
+ 
+ PKG_CHECK_MODULES(GIGGLE, [
+@@ -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])
+diff -u -r giggle-0.7/plugins/giggle-view-terminal.c giggle-0.7-vte2.91/plugins/giggle-view-terminal.c
+--- giggle-0.7/plugins/giggle-view-terminal.c	2012-11-01 06:29:01.000000000 +0100
++++ giggle-0.7-vte2.91/plugins/giggle-view-terminal.c	2014-09-28 23:46:07.965686517 +0200
+@@ -186,15 +186,16 @@
+ 	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),
+-	                                         pty_flags,
+-	                                         directory,
+-	                                         real_argv,
+-	                                         NULL,
+-	                                         spawn_flags,
+-	                                         NULL, NULL,
+-	                                         NULL,
+-	                                         &error);
++	succes = vte_terminal_spawn_sync (VTE_TERMINAL (terminal),
++	                                  pty_flags,
++	                                  directory,
++	                                  real_argv,
++	                                  NULL,
++	                                  spawn_flags,
++	                                  NULL, NULL,
++	                                  NULL,
++                                          NULL,
++	                                  &error);
+ 	g_strfreev (real_argv);
+ 
+ 	if (succes == FALSE) {