1 |
commit: d91eae898ccf827917d9fea1fcc01f49e91a7602 |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Sat Jun 4 18:48:11 2022 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 5 23:03:27 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d91eae89 |
7 |
|
8 |
net-p2p/deluge: remove unused patches |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/25753 |
13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
14 |
|
15 |
net-p2p/deluge/files/deluge-2.0.3-fix-pickle.patch | 143 --------------------- |
16 |
net-p2p/deluge/files/deluge-2.0.3-gettext.patch | 11 -- |
17 |
net-p2p/deluge/files/deluge-2.0.3-log.patch | 13 -- |
18 |
3 files changed, 167 deletions(-) |
19 |
|
20 |
diff --git a/net-p2p/deluge/files/deluge-2.0.3-fix-pickle.patch b/net-p2p/deluge/files/deluge-2.0.3-fix-pickle.patch |
21 |
deleted file mode 100644 |
22 |
index 446ae2e9a0e1..000000000000 |
23 |
--- a/net-p2p/deluge/files/deluge-2.0.3-fix-pickle.patch |
24 |
+++ /dev/null |
25 |
@@ -1,143 +0,0 @@ |
26 |
-https://dev.deluge-torrent.org/changeset/23b3f144fce3424ae |
27 |
- |
28 |
-Index: deluge/core/torrentmanager.py |
29 |
-=================================================================== |
30 |
---- deluge-2.0.3/deluge/core/torrentmanager.py (revision 8b62e50eb8bf81a177c4d62484a44b766c6f54a6) |
31 |
-+++ deluge-2.0.3/deluge/core/torrentmanager.py (revision 23b3f144fce3424ae874d54a659cb7b8dd624ade) |
32 |
-@@ -26,5 +26,5 @@ |
33 |
- import deluge.component as component |
34 |
- from deluge._libtorrent import lt |
35 |
--from deluge.common import archive_files, decode_bytes, get_magnet_info, is_magnet |
36 |
-+from deluge.common import PY2, archive_files, decode_bytes, get_magnet_info, is_magnet |
37 |
- from deluge.configmanager import ConfigManager, get_config_dir |
38 |
- from deluge.core.authmanager import AUTH_LEVEL_ADMIN |
39 |
-@@ -810,5 +810,8 @@ |
40 |
- try: |
41 |
- with open(filepath, 'rb') as _file: |
42 |
-- state = pickle.load(_file) |
43 |
-+ if PY2: |
44 |
-+ state = pickle.load(_file) |
45 |
-+ else: |
46 |
-+ state = pickle.load(_file, encoding='utf8') |
47 |
- except (IOError, EOFError, pickle.UnpicklingError) as ex: |
48 |
- message = 'Unable to load {}: {}'.format(filepath, ex) |
49 |
-Index: deluge/tests/data/utf8_filename_torrents.state |
50 |
-=================================================================== |
51 |
---- deluge-2.0.3/deluge/tests/data/utf8_filename_torrents.state (revision 23b3f144fce3424ae874d54a659cb7b8dd624ade) |
52 |
-+++ deluge-2.0.3/deluge/tests/data/utf8_filename_torrents.state (revision 23b3f144fce3424ae874d54a659cb7b8dd624ade) |
53 |
-@@ -0,0 +1,85 @@ |
54 |
-+(ideluge.core.torrentmanager |
55 |
-+TorrentManagerState |
56 |
-+p1 |
57 |
-+(dp2 |
58 |
-+S'torrents' |
59 |
-+p3 |
60 |
-+(lp4 |
61 |
-+(ideluge.core.torrentmanager |
62 |
-+TorrentState |
63 |
-+p5 |
64 |
-+(dp6 |
65 |
-+S'max_download_speed' |
66 |
-+p7 |
67 |
-+I-1 |
68 |
-+sS'move_completed_path' |
69 |
-+p8 |
70 |
-+S'/home/calum/Downloads' |
71 |
-+p9 |
72 |
-+sS'paused' |
73 |
-+p10 |
74 |
-+I00 |
75 |
-+sS'max_upload_slots' |
76 |
-+p11 |
77 |
-+I-1 |
78 |
-+sS'prioritize_first_last' |
79 |
-+p12 |
80 |
-+I00 |
81 |
-+sS'max_connections' |
82 |
-+p13 |
83 |
-+I-1 |
84 |
-+sS'compact' |
85 |
-+p14 |
86 |
-+I00 |
87 |
-+sS'queue' |
88 |
-+p15 |
89 |
-+I0 |
90 |
-+sS'file_priorities' |
91 |
-+p16 |
92 |
-+(lp17 |
93 |
-+I4 |
94 |
-+asS'filename' |
95 |
-+p18 |
96 |
-+S'\xc2\xa2.torrent' |
97 |
-+p19 |
98 |
-+sS'max_upload_speed' |
99 |
-+p20 |
100 |
-+I-1 |
101 |
-+sS'save_path' |
102 |
-+p21 |
103 |
-+S'/home/calum/Downloads' |
104 |
-+p22 |
105 |
-+sS'time_added' |
106 |
-+p23 |
107 |
-+F1573563097.749759 |
108 |
-+sS'total_uploaded' |
109 |
-+p24 |
110 |
-+I0 |
111 |
-+sS'torrent_id' |
112 |
-+p25 |
113 |
-+S'80d81d55ef3b85f3c1b634c362e014b35594dc71' |
114 |
-+p26 |
115 |
-+sS'auto_managed' |
116 |
-+p27 |
117 |
-+I01 |
118 |
-+sS'stop_at_ratio' |
119 |
-+p28 |
120 |
-+I00 |
121 |
-+sS'move_completed' |
122 |
-+p29 |
123 |
-+I00 |
124 |
-+sS'trackers' |
125 |
-+p30 |
126 |
-+(lp31 |
127 |
-+sS'magnet' |
128 |
-+p32 |
129 |
-+NsS'remove_at_ratio' |
130 |
-+p33 |
131 |
-+I00 |
132 |
-+sS'stop_ratio' |
133 |
-+p34 |
134 |
-+F2 |
135 |
-+sS'is_finished' |
136 |
-+p35 |
137 |
-+I00 |
138 |
-+sbasb. |
139 |
-Index: deluge/tests/test_torrentmanager.py |
140 |
-=================================================================== |
141 |
---- deluge-2.0.3/deluge/tests/test_torrentmanager.py (revision c6b6902e9f3e37f5b15184eb509b48b43817a331) |
142 |
-+++ deluge-2.0.3/deluge/tests/test_torrentmanager.py (revision 23b3f144fce3424ae874d54a659cb7b8dd624ade) |
143 |
-@@ -8,4 +8,6 @@ |
144 |
- from __future__ import unicode_literals |
145 |
- |
146 |
-+import os |
147 |
-+import shutil |
148 |
- import warnings |
149 |
- from base64 import b64encode |
150 |
-@@ -29,5 +31,5 @@ |
151 |
- class TorrentmanagerTestCase(BaseTestCase): |
152 |
- def set_up(self): |
153 |
-- common.set_tmp_config_dir() |
154 |
-+ self.config_dir = common.set_tmp_config_dir() |
155 |
- self.rpcserver = RPCServer(listen=False) |
156 |
- self.core = Core() |
157 |
-@@ -119,2 +121,11 @@ |
158 |
- InvalidTorrentError, self.tm.remove, 'torrentidthatdoesntexist' |
159 |
- ) |
160 |
-+ |
161 |
-+ def test_open_state_from_python2(self): |
162 |
-+ """Open a Python2 state with a UTF-8 encoded torrent filename.""" |
163 |
-+ shutil.copy( |
164 |
-+ common.get_test_data_file('utf8_filename_torrents.state'), |
165 |
-+ os.path.join(self.config_dir, 'state', 'torrents.state'), |
166 |
-+ ) |
167 |
-+ state = self.tm.open_state() |
168 |
-+ self.assertEqual(len(state.torrents), 1) |
169 |
|
170 |
diff --git a/net-p2p/deluge/files/deluge-2.0.3-gettext.patch b/net-p2p/deluge/files/deluge-2.0.3-gettext.patch |
171 |
deleted file mode 100644 |
172 |
index 41cf743749c6..000000000000 |
173 |
--- a/net-p2p/deluge/files/deluge-2.0.3-gettext.patch |
174 |
+++ /dev/null |
175 |
@@ -1,11 +0,0 @@ |
176 |
---- a/deluge/i18n/util.py |
177 |
-+++ b/deluge/i18n/util.py |
178 |
-@@ -114,7 +114,7 @@ |
179 |
- # Workaround for Python 2 unicode gettext (keyword removed in Py3). |
180 |
- kwargs = {} if not deluge.common.PY2 else {'unicode': True} |
181 |
- |
182 |
-- gettext.install(I18N_DOMAIN, translations_path, names='ngettext', **kwargs) |
183 |
-+ gettext.install(I18N_DOMAIN, translations_path, names=['ngettext'], **kwargs) |
184 |
- builtins.__dict__['_n'] = builtins.__dict__['ngettext'] |
185 |
- |
186 |
- libintl = None |
187 |
|
188 |
diff --git a/net-p2p/deluge/files/deluge-2.0.3-log.patch b/net-p2p/deluge/files/deluge-2.0.3-log.patch |
189 |
deleted file mode 100644 |
190 |
index 45dd9896a915..000000000000 |
191 |
--- a/net-p2p/deluge/files/deluge-2.0.3-log.patch |
192 |
+++ /dev/null |
193 |
@@ -1,13 +0,0 @@ |
194 |
-https://dev.deluge-torrent.org/changeset/351664ec071daa04 |
195 |
-https://dev.deluge-torrent.org/ticket/3327 |
196 |
-Index: deluge/log.py |
197 |
-=================================================================== |
198 |
---- a/deluge/log.py |
199 |
-+++ b/deluge/log.py |
200 |
-@@ -87,5 +87,5 @@ |
201 |
- yield LoggingLoggerClass.exception(self, msg, *args, **kwargs) |
202 |
- |
203 |
-- def findCaller(self, stack_info=False): # NOQA: N802 |
204 |
-+ def findCaller(self, *args, **kwargs): # NOQA: N802 |
205 |
- f = logging.currentframe().f_back |
206 |
- rv = '(unknown file)', 0, '(unknown function)' |