Skip to content

Commit 04a4579

Browse files
committed
changes for 0.8.8
1 parent 4d9b53c commit 04a4579

File tree

5 files changed

+58
-10
lines changed

5 files changed

+58
-10
lines changed

docs/rtorrent-extended/build.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ _keybindings=0
3030

3131
# Keep rTorrent version, once it was built in this directory
3232
test -d rtorrent-0.8.6 && { export LT_VERSION=0.12.6; export RT_VERSION=0.8.6; }
33-
test -d rtorrent-0.8.7 && { export LT_VERSION=0.12.7; export RT_VERSION=0.8.7; }
3433
test -d rtorrent-0.8.8 && { export LT_VERSION=0.12.8; export RT_VERSION=0.8.8; }
3534

3635
export INST_DIR="$HOME/lib/rtorrent-$RT_VERSION"
@@ -168,8 +167,8 @@ extend() { # Rebuild and install rTorrent with patches applied
168167
# Unpack original source
169168
tar xfz tarballs/rtorrent-$RT_VERSION.tar.gz
170169

171-
# Version guards
172-
[[ $RT_VERSION == 0.8.6 ]] || { _interface=0; bold "Interface patches disabled"; }
170+
# Version handling
171+
[ $RT_VERSION == 0.8.6 -o "$_interface" == 3 ] || { _interface=0; bold "Interface patches disabled"; }
173172

174173
# Patch it
175174
pushd rtorrent-$RT_VERSION
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
--- orig/src/core/curl_stack.h 2009-11-12 09:03:44.000000000 +0100
2+
+++ rtorrent-0.8.6/src/core/curl_stack.h 2011-06-03 12:07:25.000000000 +0200
3+
@@ -91,2 +91,5 @@
4+
5+
+ int dns_cache_timeout() const { return m_dns_cache_timeout; }
6+
+ void set_dns_cache_timeout(int t) { m_dns_cache_timeout = t; }
7+
+
8+
const std::string& user_agent() const { return m_userAgent; }
9+
@@ -132,2 +138,3 @@
10+
11+
+ int m_dns_cache_timeout;
12+
std::string m_userAgent;
13+
--- orig/src/core/curl_stack.cc 2009-11-12 09:03:44.000000000 +0100
14+
+++ rtorrent-0.8.6/src/core/curl_stack.cc 2011-06-03 12:09:10.000000000 +0200
15+
@@ -52,2 +52,3 @@
16+
m_handle((void*)curl_multi_init()),
17+
+ m_dns_cache_timeout(60),
18+
m_active(0),
19+
@@ -154,2 +156,3 @@
20+
21+
+ curl_easy_setopt(get->handle(), CURLOPT_DNS_CACHE_TIMEOUT, m_dns_cache_timeout);
22+
if (!m_httpProxy.empty())
23+
24+
--- orig/src/command_network.cc 2011-04-23 14:27:56.000000000 +0200
25+
+++ rtorrent-0.8.8/src/command_network.cc 2011-06-05 12:51:36.000000000 +0200
26+
@@ -677,2 +680,5 @@
27+
28+
+ CMD2_ANY ("network.http.dns_cache_timeout", std::bind(&core::CurlStack::dns_cache_timeout, httpStack));
29+
+ CMD2_ANY_VALUE_V ("network.http.dns_cache_timeout.set", std::bind(&core::CurlStack::set_dns_cache_timeout, httpStack, std::placeholders::_2));
30+
+
31+
CMD2_ANY ("network.http.capath", std::bind(&core::CurlStack::http_capath, httpStack));
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
--- orig/src/command_ui.cc 2011-05-07 16:11:02.000000000 +0200
2+
+++ rtorrent-0.8.8/src/command_ui.cc 2011-06-05 12:37:11.000000000 +0200
3+
@@ -293,10 +293,12 @@
4+
torrent::Object apply_less(rpc::target_type target, const torrent::Object::list_type& args) {
5+
torrent::Object result = apply_cmp(target, args);
6+
- return result.is_value() ? result.as_value() < 0 : (int64_t)false;
7+
+ return result.is_value() ? result.as_value() < 0 : (int64_t)
8+
+ (rpc::is_target_pair(target) ? (target.second < target.third) : false);
9+
}
10+
11+
torrent::Object apply_greater(rpc::target_type target, const torrent::Object::list_type& args) {
12+
torrent::Object result = apply_cmp(target, args);
13+
- return result.is_value() ? result.as_value() > 0 : (int64_t)false;
14+
+ return result.is_value() ? result.as_value() > 0 : (int64_t)
15+
+ (rpc::is_target_pair(target) ? (target.second > target.third) : false);
16+
}
17+
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
--- orig/src/rpc/command_variable.h 2009-11-12 09:03:42.000000000 +0100
2+
+++ rtorrent-0.8.6/src/rpc/command_variable.h 2011-05-27 04:06:44.000000000 +0200
3+
@@ -66,2 +66,4 @@
4+
5+
+ static const torrent::Object set_color_string(Command* rawCommand, cleaned_type target, const torrent::Object& args);
6+
+
7+
private:
8+

docs/rtorrent-extended/patches/ui_pyroscope.patch

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@
1414
initialize_command_scheduler();
1515
+ initialize_command_ui_pyroscope();
1616

17-
--- orig/src/rpc/command_variable.h 2009-11-12 09:03:42.000000000 +0100
18-
+++ rtorrent-0.8.6/src/rpc/command_variable.h 2011-05-27 04:06:44.000000000 +0200
19-
@@ -66,2 +66,4 @@
20-
21-
+ static const torrent::Object set_color_string(Command* rawCommand, cleaned_type target, const torrent::Object& args);
22-
+
23-
private:
2417
--- orig/src/display/canvas.h 2009-11-12 09:03:47.000000000 +0100
2518
+++ rtorrent-0.8.6/src/display/canvas.h 2011-05-28 13:42:58.000000000 +0200
2619
@@ -134,4 +134,6 @@

0 commit comments

Comments
 (0)