[arch-commits] Commit in file-roller/repos (3 files)

[Jan de Groot]

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

Merged revisions 20163 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/file-roller/trunk

........
  r20163 | jgc | 2008-11-30 19:34:14 +0000 (Sun, 30 Nov 2008) | 2 lines
  
  upgpkg: file-roller 2.24.2-2
      Fix FS#12290
........

Added:
  file-roller/repos/extra-i686/fr-process-kill.patch
    (from rev 20163, file-roller/trunk/fr-process-kill.patch)
Modified:
  file-roller/repos/extra-i686/	(properties)
  file-roller/repos/extra-i686/PKGBUILD

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


Property changes on: file-roller/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /file-roller/trunk:1-19776
   + /file-roller/trunk:1-20163

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-30 19:34:14 UTC (rev 20163)
+++ extra-i686/PKGBUILD	2008-11-30 19:34:27 UTC (rev 20164)
@@ -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 \

Copied: file-roller/repos/extra-i686/fr-process-kill.patch (from rev 20163, file-roller/trunk/fr-process-kill.patch)
===================================================================
--- extra-i686/fr-process-kill.patch	                        (rev 0)
+++ extra-i686/fr-process-kill.patch	2008-11-30 19:34:27 UTC (rev 20164)
@@ -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 {