[arch-commits] Commit in seahorse-nautilus/trunk (PKGBUILD glib236.patch)

[Balló György]

    Date: Sunday, April 28, 2013 @ 22:39:40
  Author: bgyorgy
Revision: 89361

upgpkg: seahorse-nautilus 3.8.0-2

Fix compatibility with glib 2.36

Added:
  seahorse-nautilus/trunk/glib236.patch
Modified:
  seahorse-nautilus/trunk/PKGBUILD

---------------+
 PKGBUILD      |   11 ++++++++---
 glib236.patch |   12 ++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-28 20:21:26 UTC (rev 89360)
+++ PKGBUILD	2013-04-28 20:39:40 UTC (rev 89361)
@@ -3,7 +3,7 @@
 
 pkgname=seahorse-nautilus
 pkgver=3.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="PGP encryption and signing for nautilus"
 arch=('i686' 'x86_64')
 url="http://git.gnome.org/browse/seahorse-nautilus/"
@@ -12,12 +12,17 @@
 makedepends=('intltool')
 options=('!libtool')
 install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8173ef08a700ff254fb5637a7f2138ba7625b19ed2102a82fd69f1ecb8072863')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        glib236.patch)
+sha256sums=('8173ef08a700ff254fb5637a7f2138ba7625b19ed2102a82fd69f1ecb8072863'
+            '0cefa14a45784c82871815e9bdcebbb96dea50a8e43316475e6a36d5dc47ade5')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # Fix compatibility with glib 2.36
+  patch -Np1 -i "$srcdir/glib236.patch"
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --disable-static --disable-schemas-compile
   make

Added: glib236.patch
===================================================================
--- glib236.patch	                        (rev 0)
+++ glib236.patch	2013-04-28 20:39:40 UTC (rev 89361)
@@ -0,0 +1,12 @@
+diff -Naur seahorse-nautilus-3.8.0.orig/tool/seahorse-tool-progress.c seahorse-nautilus-3.8.0/tool/seahorse-tool-progress.c
+--- seahorse-nautilus-3.8.0.orig/tool/seahorse-tool-progress.c	2011-10-24 09:25:37.000000000 +0200
++++ seahorse-nautilus-3.8.0/tool/seahorse-tool-progress.c	2013-04-28 22:26:54.483276592 +0200
+@@ -226,8 +226,6 @@
+         progress_fd = -1;
+         return;
+     }
+-
+-    g_child_watch_add (progress_pid, progress_cancel, NULL);
+ }
+ 
+ void