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

[Eric Bélanger]

    Date: Tuesday, December 2, 2008 @ 19:32:49
  Author: eric
Revision: 20357

Merged revisions 20329,20333 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/deluge/trunk

........
  r20329 | hugo | 2008-12-02 13:44:09 -0500 (Tue, 02 Dec 2008) | 1 line
  
  upgpkg: deluge 1.0.6-1
........
  r20333 | hugo | 2008-12-02 14:07:40 -0500 (Tue, 02 Dec 2008) | 1 line
  
  patch added
........

Added:
  deluge/repos/extra-x86_64/shutdown-fix.patch
    (from rev 20333, deluge/trunk/shutdown-fix.patch)
Modified:
  deluge/repos/extra-x86_64/	(properties)
  deluge/repos/extra-x86_64/PKGBUILD

--------------------+
 PKGBUILD           |   13 +++++++++----
 shutdown-fix.patch |   13 +++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)


Property changes on: deluge/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /deluge/trunk:1-18921
   + /deluge/trunk:1-20356

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-12-03 00:30:56 UTC (rev 20356)
+++ extra-x86_64/PKGBUILD	2008-12-03 00:32:49 UTC (rev 20357)
@@ -2,7 +2,7 @@
 # Maintainer: Hugo Doria <hugo at archlinux.org>
 
 pkgname=deluge
-pkgver=1.0.5
+pkgver=1.0.6
 pkgrel=1
 pkgdesc="A bittorrent client written with python and pygtk"
 arch=('i686' 'x86_64')
@@ -10,14 +10,19 @@
 license=('GPL2')
 depends=('pygtk' 'boost>=1.36.0' 'pyxdg' 'dbus-python' 'librsvg' 'setuptools')
 makedepends=('subversion' 'intltool')
-source=(http://download.deluge-torrent.org/source/${pkgver}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('24fd36978b2713212cf1ae679f8066d5')
+source=(http://download.deluge-torrent.org/source/${pkgver}/${pkgname}-${pkgver}.tar.gz shutdown-fix.patch)
+md5sums=('96be98b4e7f8c66ec243e8148b897291' 'bf3a4c0b246a1dadcf6c05b37a7deded')
 options=('!emptydirs')
 
 build() {
 
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}
 
+  # used to fix a problem with deluge shutdown
+  # remove it after 1.0.6 release
+  patch -Np0 -i ${srcdir}/shutdown-fix.patch
+
+  cd ${srcdir}/${pkgname}-${pkgver}/
   sed -i 's|boost_thread|boost_thread-mt|' setup.py
   python setup.py install --prefix=/usr --root=${pkgdir}
 

Copied: deluge/repos/extra-x86_64/shutdown-fix.patch (from rev 20333, deluge/trunk/shutdown-fix.patch)
===================================================================
--- extra-x86_64/shutdown-fix.patch	                        (rev 0)
+++ extra-x86_64/shutdown-fix.patch	2008-12-03 00:32:49 UTC (rev 20357)
@@ -0,0 +1,13 @@
+--- component.py	2008-11-23 10:28:01.000000000 +0530
++++ component-patched.py	2008-12-02 02:25:29.619655571 +0530
+@@ -169,7 +169,8 @@
+         for component in self.components.keys():
+             log.debug("Shutting down component %s..", component)
+             try:
+-                self.components[component].shutdown()
++                if self.components[component].get_state() != COMPONENT_STATE.index("Stopped"):
++                    self.components[component].shutdown()
+             except Exception, e:
+                 log.debug("Unable to call shutdown(): %s", e)
+ 
+