Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/
Date: Mon, 27 Apr 2020 13:48:43
Message-Id: 1587995314.14494109832558fc9d3e6faa9e0b5e034ebbaf1c.zlogene@gentoo
1 commit: 14494109832558fc9d3e6faa9e0b5e034ebbaf1c
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 27 13:48:11 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 27 13:48:34 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14494109
7
8 net-p2p/deluge: Drop unused patches
9
10 Package-Manager: Portage-2.3.89, Repoman-2.3.20
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 .../deluge-1.3.15-r1-fix-preferences-ui.patch | 32 -----------------
14 ...ge-1.3.5-disable_libtorrent_internal_copy.patch | 42 ----------------------
15 2 files changed, 74 deletions(-)
16
17 diff --git a/net-p2p/deluge/files/deluge-1.3.15-r1-fix-preferences-ui.patch b/net-p2p/deluge/files/deluge-1.3.15-r1-fix-preferences-ui.patch
18 deleted file mode 100644
19 index a63e5de10de..00000000000
20 --- a/net-p2p/deluge/files/deluge-1.3.15-r1-fix-preferences-ui.patch
21 +++ /dev/null
22 @@ -1,32 +0,0 @@
23 -From 38d7b7cdfde3c50d6263602ffb03af92fcbfa52e Mon Sep 17 00:00:00 2001
24 -From: Calum Lind <calumlind+deluge@×××××.com>
25 -Date: Sat, 13 May 2017 00:05:48 +0100
26 -Subject: [GTKUI] Fix keyerror showing prefs
27 -
28 - * Fix the single_proxy ui to True as unlikely any users using <=0.15
29 - and need to have different proxy type settings.
30 ----
31 - deluge/ui/gtkui/preferences.py | 7 ++-----
32 - 1 file changed, 2 insertions(+), 5 deletions(-)
33 -
34 -diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py
35 -index 645ad26..efcd93d 100644
36 ---- a/deluge/ui/gtkui/preferences.py
37 -+++ b/deluge/ui/gtkui/preferences.py
38 -@@ -318,11 +318,8 @@ class Preferences(component.Component):
39 - }
40 - # Add proxy stuff
41 -
42 -- # Display workaround for single proxy in libtorrent >v0.16
43 -- try:
44 -- lt_single_proxy = component.get("PreferencesManager").LT_SINGLE_PROXY
45 -- except AttributeError:
46 -- lt_single_proxy = False
47 -+ # Display workaround for single proxy in libtorrent >= v0.16
48 -+ lt_single_proxy = True
49 -
50 - for t in ("peer", "web_seed", "tracker", "dht"):
51 - if lt_single_proxy and not t == "peer":
52 ---
53 -cgit v1.1
54 -
55
56 diff --git a/net-p2p/deluge/files/deluge-1.3.5-disable_libtorrent_internal_copy.patch b/net-p2p/deluge/files/deluge-1.3.5-disable_libtorrent_internal_copy.patch
57 deleted file mode 100644
58 index 349261426de..00000000000
59 --- a/net-p2p/deluge/files/deluge-1.3.5-disable_libtorrent_internal_copy.patch
60 +++ /dev/null
61 @@ -1,42 +0,0 @@
62 ---- a/setup.py
63 -+++ b/setup.py
64 -@@ -205,38 +205,7 @@
65 -
66 - _ext_modules = []
67 -
68 --# Check for a system libtorrent and if found, then do not build the libtorrent extension
69 --build_libtorrent = True
70 --try:
71 -- from deluge._libtorrent import lt
72 --except ImportError:
73 -- build_libtorrent = True
74 --else:
75 -- build_libtorrent = False
76 --
77 --if build_libtorrent:
78 -- got_libtorrent = False
79 -- if not os.path.exists("libtorrent"):
80 -- import subprocess
81 -- if subprocess.call(['./get_libtorrent.sh']) > 0:
82 -- got_libtorrent = False
83 -- else:
84 -- got_libtorrent = True
85 -- else:
86 -- got_libtorrent = True
87 --
88 -- if got_libtorrent:
89 -- # There isn't a system libtorrent library, so let's build the one included with deluge
90 -- libtorrent = Extension(
91 -- 'libtorrent',
92 -- extra_compile_args = _extra_compile_args,
93 -- include_dirs = _include_dirs,
94 -- libraries = _libraries,
95 -- library_dirs = _library_dirs,
96 -- sources = _sources
97 -- )
98 --
99 -- _ext_modules = [libtorrent]
100 -+import deluge._libtorrent
101 -
102 - desktop_data = 'deluge/data/share/applications/deluge.desktop'
103 -