Date: Monday, September 14, 2015 @ 01:27:44 Author: heftig Revision: 246026
1.3.12 Modified: deluge/trunk/PKGBUILD Deleted: deluge/trunk/twisted15.patch -----------------+ PKGBUILD | 12 +++++------- twisted15.patch | 49 ------------------------------------------------- 2 files changed, 5 insertions(+), 56 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-09-13 22:00:40 UTC (rev 246025) +++ PKGBUILD 2015-09-13 23:27:44 UTC (rev 246026) @@ -4,8 +4,8 @@ # Contributor: Hugo Doria <[email protected]> pkgname=deluge -pkgver=1.3.11 -pkgrel=3 +pkgver=1.3.12 +pkgrel=1 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server model" arch=('any') url="http://deluge-torrent.org/"; @@ -19,15 +19,13 @@ 'python2-mako: needed for web ui') install=deluge.install source=(http://download.deluge-torrent.org/source/$pkgname-$pkgver.tar.lzma - deluged.service deluge-web.service twisted15.patch) -md5sums=('49f9f5fc751d49ddd415f02123de77a8' + deluged.service deluge-web.service) +md5sums=('56f5c1cd3f671fecc58a9168f5bd6d48' '17f51ac9a90f0dc41a20291444a7489b' - '2a73f62c04e8b147c731fbb50666e846' - '6ff539de47871258bb484fc5b0590fe2') + '2a73f62c04e8b147c731fbb50666e846') prepare() { cd $pkgname-$pkgver - patch -Np1 -i ../twisted15.patch sed -i '1s/python$/&2/' deluge/ui/Win32IconImagePlugin.py } Deleted: twisted15.patch =================================================================== --- twisted15.patch 2015-09-13 22:00:40 UTC (rev 246025) +++ twisted15.patch 2015-09-13 23:27:44 UTC (rev 246026) @@ -1,49 +0,0 @@ -From d40dfcd53c2439de121ddaff476e66194dc2c738 Mon Sep 17 00:00:00 2001 -From: Andrew Resch <[email protected]> -Date: Mon, 23 Feb 2015 08:31:00 +0000 -Subject: Fix for Twisted 15.0 URI class rename - ---- -diff --git a/deluge/httpdownloader.py b/deluge/httpdownloader.py -index b146477..14dcdc3 100644 ---- a/deluge/httpdownloader.py -+++ b/deluge/httpdownloader.py -@@ -146,7 +146,7 @@ def sanitise_filename(filename): - log.warning("Potentially malicious server: trying to write to file '%s'" % filename) - # Only use the basename - filename = os.path.basename(filename) -- -+ - filename = filename.strip() - if filename.startswith(".") or ";" in filename or "|" in filename: - # Dodgy server, log it -@@ -192,17 +192,22 @@ def download_file(url, filename, callback=None, headers=None, force_filename=Fal - headers = {} - headers["accept-encoding"] = "deflate, gzip, x-gzip" - -- # In twisted 13.1.0 the _parse() function was replaced by the _URI class -- if hasattr(client, '_parse'): -+ # In Twisted 13.1.0 _parse() function replaced by _URI class. -+ # In Twisted 15.0.0 _URI class renamed to URI. -+ if hasattr(client, "_parse"): - scheme, host, port, path = client._parse(url) - else: -- from twisted.web.client import _URI -- uri = _URI.fromBytes(url) -+ try: -+ from twisted.web.client import _URI as URI -+ except ImportError: -+ from twisted.web.client import URI -+ -+ uri = URI.fromBytes(url) - scheme = uri.scheme - host = uri.host - port = uri.port - path = uri.path -- -+ - factory = HTTPDownloader(url, filename, callback, headers, force_filename, allow_compression) - if scheme == "https": - from twisted.internet import ssl --- -cgit v0.9.2
