aboutsummaryrefslogtreecommitdiffstats
path: root/net-p2p
diff options
context:
space:
mode:
authorrm <rm@FreeBSD.org>2015-09-22 15:01:16 +0800
committerrm <rm@FreeBSD.org>2015-09-22 15:01:16 +0800
commit2f462ec52c6c211de829eec26795cc4fc9cffaaa (patch)
treeb9b8a176749c1554721bb13de598f2fc476a201b /net-p2p
parent49aa6eca113b7bec99579f291753db0d64291f61 (diff)
downloadfreebsd-ports-gnome-2f462ec52c6c211de829eec26795cc4fc9cffaaa.tar.gz
freebsd-ports-gnome-2f462ec52c6c211de829eec26795cc4fc9cffaaa.tar.zst
freebsd-ports-gnome-2f462ec52c6c211de829eec26795cc4fc9cffaaa.zip
net-p2p/deluge: update to 1.3.12
- update to 1.3.12 - remove patch, included upstream - add NO_ARCH, sort USES changelog: http://dev.deluge-torrent.org/wiki/ChangeLog#Deluge1.3.1213September2015
Diffstat (limited to 'net-p2p')
-rw-r--r--net-p2p/deluge/Makefile7
-rw-r--r--net-p2p/deluge/distinfo4
-rw-r--r--net-p2p/deluge/files/patch-deluge_httpdownloader.py44
-rw-r--r--net-p2p/deluge/files/patch-setup.py70
4 files changed, 36 insertions, 89 deletions
diff --git a/net-p2p/deluge/Makefile b/net-p2p/deluge/Makefile
index c46b8e8e42cf..8f56525fa787 100644
--- a/net-p2p/deluge/Makefile
+++ b/net-p2p/deluge/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= deluge
-PORTVERSION= 1.3.11
-PORTREVISION= 2
+PORTVERSION= 1.3.12
PORTEPOCH= 1
CATEGORIES= net-p2p python
MASTER_SITES= http://download.deluge-torrent.org/source/
@@ -22,10 +21,10 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>=0.18:${PORTSDIR}/devel/py-xdg \
USE_RC_SUBR= deluged deluge_web
SUB_LIST+= PYTHON_CMD=${PYTHON_CMD}
-USES= gettext tar:lzma python:2 twisted:run,web
+NO_ARCH= yes
+USES= gettext python:2 tar:lzma twisted:run,web
USE_PYTHON= autoplist distutils
USE_OPENSSL= yes
-WANT_GNOME= yes
OPTIONS_DEFINE= GTK2
OPTIONS_DEFAULT=GTK2
diff --git a/net-p2p/deluge/distinfo b/net-p2p/deluge/distinfo
index 60bbfbf9339a..51222cbd0599 100644
--- a/net-p2p/deluge/distinfo
+++ b/net-p2p/deluge/distinfo
@@ -1,2 +1,2 @@
-SHA256 (deluge-1.3.11.tar.lzma) = 1079e07e33b836bec5e93823a0c08b90ad75e640a4414b097091e9580742d7cb
-SIZE (deluge-1.3.11.tar.lzma) = 1441344
+SHA256 (deluge-1.3.12.tar.lzma) = eb875724a8f52ac36c3890bdcee9f77c648ef03b6375387af5c26d5229fdc65e
+SIZE (deluge-1.3.12.tar.lzma) = 1449148
diff --git a/net-p2p/deluge/files/patch-deluge_httpdownloader.py b/net-p2p/deluge/files/patch-deluge_httpdownloader.py
deleted file mode 100644
index 1edfc741adf8..000000000000
--- a/net-p2p/deluge/files/patch-deluge_httpdownloader.py
+++ /dev/null
@@ -1,44 +0,0 @@
-This patch is fixing new blocklist plugin incompatibility with newer
-versions of Twisted. The fix will be included in deluge 1.3.12.
-
-References:
- * bug-report: http://dev.deluge-torrent.org/ticket/2737
- * commit: http://dev.deluge-torrent.org/changeset/d40dfcd53c243
-
-Index: deluge/httpdownloader.py
-===================================================================
---- deluge/httpdownloader.py (revision 8bf18d6694db24e04cb65f20f2e219ec14043f8e)
-+++ deluge/httpdownloader.py (revision d40dfcd53c2439de121ddaff476e66194dc2c738)
-@@ -147,5 +147,5 @@
- # Only use the basename
- filename = os.path.basename(filename)
--
-+
- filename = filename.strip()
- if filename.startswith(".") or ";" in filename or "|" in filename:
-@@ -193,15 +193,20 @@
- 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":
diff --git a/net-p2p/deluge/files/patch-setup.py b/net-p2p/deluge/files/patch-setup.py
index 26d5a3d279e7..1cb95f17fe6c 100644
--- a/net-p2p/deluge/files/patch-setup.py
+++ b/net-p2p/deluge/files/patch-setup.py
@@ -1,14 +1,6 @@
---- setup.py.orig 2014-07-09 19:08:22 UTC
+--- setup.py.orig 2015-09-13 20:32:11 UTC
+++ setup.py
-@@ -208,7 +208,6 @@
- _ext_modules = []
-
- # Check for a system libtorrent and if found, then do not build the libtorrent extension
--build_libtorrent = True
- try:
- from deluge._libtorrent import lt
- except ImportError:
-@@ -216,6 +215,8 @@
+@@ -216,6 +216,8 @@ except ImportError:
else:
build_libtorrent = False
@@ -17,36 +9,36 @@
if build_libtorrent:
got_libtorrent = False
if not os.path.exists("libtorrent"):
-@@ -488,31 +489,7 @@
- }
-
- # Data files to be installed to the system
--_data_files = [
-- ('share/icons/hicolor/scalable/apps', ['deluge/data/icons/scalable/apps/deluge.svg']),
-- ('share/icons/hicolor/128x128/apps', ['deluge/data/icons/hicolor/128x128/apps/deluge.png']),
-- ('share/icons/hicolor/16x16/apps', ['deluge/data/icons/hicolor/16x16/apps/deluge.png']),
-- ('share/icons/hicolor/192x192/apps', ['deluge/data/icons/hicolor/192x192/apps/deluge.png']),
-- ('share/icons/hicolor/22x22/apps', ['deluge/data/icons/hicolor/22x22/apps/deluge.png']),
-- ('share/icons/hicolor/24x24/apps', ['deluge/data/icons/hicolor/24x24/apps/deluge.png']),
-- ('share/icons/hicolor/256x256/apps', ['deluge/data/icons/hicolor/256x256/apps/deluge.png']),
-- ('share/icons/hicolor/32x32/apps', ['deluge/data/icons/hicolor/32x32/apps/deluge.png']),
-- ('share/icons/hicolor/36x36/apps', ['deluge/data/icons/hicolor/36x36/apps/deluge.png']),
-- ('share/icons/hicolor/48x48/apps', ['deluge/data/icons/hicolor/48x48/apps/deluge.png']),
-- ('share/icons/hicolor/64x64/apps', ['deluge/data/icons/hicolor/64x64/apps/deluge.png']),
-- ('share/icons/hicolor/72x72/apps', ['deluge/data/icons/hicolor/72x72/apps/deluge.png']),
-- ('share/icons/hicolor/96x96/apps', ['deluge/data/icons/hicolor/96x96/apps/deluge.png']),
-- ('share/pixmaps', ['deluge/data/pixmaps/deluge.png', 'deluge/data/pixmaps/deluge.xpm']),
-- ('share/man/man1', [
-- 'docs/man/deluge.1',
-- 'docs/man/deluged.1',
-- 'docs/man/deluge-gtk.1',
-- 'docs/man/deluge-web.1',
-- 'docs/man/deluge-console.1'])
--]
+@@ -490,31 +492,7 @@ cmdclass = {
+ # Data files to be installed to the system.
+ _data_files = []
+ if not windows_check():
+- _data_files = [
+- ('share/icons/hicolor/scalable/apps', ['deluge/data/icons/scalable/apps/deluge.svg']),
+- ('share/icons/hicolor/128x128/apps', ['deluge/data/icons/hicolor/128x128/apps/deluge.png']),
+- ('share/icons/hicolor/16x16/apps', ['deluge/data/icons/hicolor/16x16/apps/deluge.png']),
+- ('share/icons/hicolor/192x192/apps', ['deluge/data/icons/hicolor/192x192/apps/deluge.png']),
+- ('share/icons/hicolor/22x22/apps', ['deluge/data/icons/hicolor/22x22/apps/deluge.png']),
+- ('share/icons/hicolor/24x24/apps', ['deluge/data/icons/hicolor/24x24/apps/deluge.png']),
+- ('share/icons/hicolor/256x256/apps', ['deluge/data/icons/hicolor/256x256/apps/deluge.png']),
+- ('share/icons/hicolor/32x32/apps', ['deluge/data/icons/hicolor/32x32/apps/deluge.png']),
+- ('share/icons/hicolor/36x36/apps', ['deluge/data/icons/hicolor/36x36/apps/deluge.png']),
+- ('share/icons/hicolor/48x48/apps', ['deluge/data/icons/hicolor/48x48/apps/deluge.png']),
+- ('share/icons/hicolor/64x64/apps', ['deluge/data/icons/hicolor/64x64/apps/deluge.png']),
+- ('share/icons/hicolor/72x72/apps', ['deluge/data/icons/hicolor/72x72/apps/deluge.png']),
+- ('share/icons/hicolor/96x96/apps', ['deluge/data/icons/hicolor/96x96/apps/deluge.png']),
+- ('share/pixmaps', ['deluge/data/pixmaps/deluge.png', 'deluge/data/pixmaps/deluge.xpm']),
+- ('share/man/man1', [
+- 'docs/man/deluge.1',
+- 'docs/man/deluged.1',
+- 'docs/man/deluge-gtk.1',
+- 'docs/man/deluge-web.1',
+- 'docs/man/deluge-console.1'])
+- ]
-
--if not windows_check() and os.path.exists(desktop_data):
-- _data_files.append(('share/applications', [desktop_data]))
-+_data_files = []
+- if os.path.exists(desktop_data):
+- _data_files.append(('share/applications', [desktop_data]))
++ _data_files = []
entry_points = {
"console_scripts": [