[arch-commits] Commit in file-roller/trunk (PKGBUILD fr-process-kill.patch)

[Jan de Groot]

    Date: Sunday, November 30, 2008 @ 14:34:14
  Author: jgc
Revision: 20163

upgpkg: file-roller 2.24.2-2
    Fix FS#12290

Added:
  file-roller/trunk/fr-process-kill.patch
Modified:
  file-roller/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |    9 ++++++---
 fr-process-kill.patch |   11 +++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-11-30 18:44:20 UTC (rev 20162)
+++ PKGBUILD	2008-11-30 19:34:14 UTC (rev 20163)
@@ -3,7 +3,7 @@
 
 pkgname=file-roller
 pkgver=2.24.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Archive manipulator for GNOME2"
 arch=(i686 x86_64)
 license=('GPL')
@@ -13,11 +13,14 @@
 options=('!libtool' '!emptydirs')
 install=file-roller.install
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('886c5201e8609aadd69798aa745ada4a')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2
+	fr-process-kill.patch)
+md5sums=('886c5201e8609aadd69798aa745ada4a'
+	 '9da94cd67fee551bec5290844a48d76e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np0 -i "${srcdir}/fr-process-kill.patch" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/file-roller \
               --localstatedir=/var --disable-static \

Added: fr-process-kill.patch
===================================================================
--- fr-process-kill.patch	                        (rev 0)
+++ fr-process-kill.patch	2008-11-30 19:34:14 UTC (rev 20163)
@@ -0,0 +1,11 @@
+--- src/fr-process.c.orig	2008-11-30 20:10:50.000000000 +0100
++++ src/fr-process.c	2008-11-30 20:11:54.000000000 +0100
+@@ -981,7 +981,7 @@
+ 	if (command_is_sticky (process, process->priv->current_command))
+ 		allow_sticky_processes_only (process, emit_signal);
+ 
+-	else if (process->term_on_stop)
++	else if (process->term_on_stop && process->priv->command_pid > 0)
+ 		kill (process->priv->command_pid, SIGTERM);
+ 
+ 	else {