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

[Jan Steffens]

    Date: Tuesday, September 24, 2013 @ 12:02:57
  Author: heftig
Revision: 194939

3.10.0

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

---------------+
 PKGBUILD      |   16 ++++++----------
 glib236.patch |   12 ------------
 2 files changed, 6 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-24 09:59:47 UTC (rev 194938)
+++ PKGBUILD	2013-09-24 10:02:57 UTC (rev 194939)
@@ -1,9 +1,10 @@
 # $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=seahorse-nautilus
-pkgver=3.8.0
-pkgrel=2
+pkgver=3.10.0
+pkgrel=1
 pkgdesc="PGP encryption and signing for nautilus"
 arch=('i686' 'x86_64')
 url="http://git.gnome.org/browse/seahorse-nautilus/"
@@ -12,17 +13,12 @@
 makedepends=('intltool')
 options=('!libtool')
 install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        glib236.patch)
-sha256sums=('8173ef08a700ff254fb5637a7f2138ba7625b19ed2102a82fd69f1ecb8072863'
-            '0cefa14a45784c82871815e9bdcebbb96dea50a8e43316475e6a36d5dc47ade5')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('d54c5fbc2bade03296d39999f8412708cfa87e82bda3c5af8e0b8ad86b2fadf3')
 
 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

Deleted: glib236.patch
===================================================================
--- glib236.patch	2013-09-24 09:59:47 UTC (rev 194938)
+++ glib236.patch	2013-09-24 10:02:57 UTC (rev 194939)
@@ -1,12 +0,0 @@
-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