summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-nntp/sabnzbd/files')
-rw-r--r--net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch6
-rw-r--r--net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch6
-rw-r--r--net-nntp/sabnzbd/files/patches/0003-use-gntp-1.0.patch8
-rw-r--r--net-nntp/sabnzbd/files/patches/0004-cfg-disable-NtfOSD-by-default.patch25
-rw-r--r--net-nntp/sabnzbd/files/patches/0004-cfg-disable-growl-by-default.patch34
5 files changed, 35 insertions, 44 deletions
diff --git a/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch b/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch
index bca7f1eb2efa..7da07926ca27 100644
--- a/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch
+++ b/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch
@@ -1,7 +1,7 @@
-From 55328c07986010fd7c91c7da42bca136fc4cd2e9 Mon Sep 17 00:00:00 2001
+From c12601b509ab66ac1b076679fe69fe7698455fb1 Mon Sep 17 00:00:00 2001
From: Justin Bronder <jsbronder@gmail.com>
Date: Mon, 13 Feb 2017 18:20:39 -0500
-Subject: [PATCH 1/5] use system configobj
+Subject: [PATCH 1/4] use system configobj
---
sabnzbd/config.py | 3 ++-
@@ -24,5 +24,5 @@ index 93dd9bb..aab1648 100644
SAVE_CONFIG_LOCK = threading.Lock()
--
-2.10.2
+2.13.0
diff --git a/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch b/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch
index 790e86f3c551..cb9d9310576c 100644
--- a/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch
+++ b/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch
@@ -1,7 +1,7 @@
-From 6a28d8ba51e902e9d49ad6c18fa2de6511908119 Mon Sep 17 00:00:00 2001
+From 7095a430201d0a9ec28e2c8f7e05f76eea59431e Mon Sep 17 00:00:00 2001
From: Justin Bronder <jsbronder@gmail.com>
Date: Mon, 13 Feb 2017 18:21:28 -0500
-Subject: [PATCH 2/5] use system feedparser
+Subject: [PATCH 2/4] use system feedparser
---
sabnzbd/rss.py | 4 ++--
@@ -30,5 +30,5 @@ index 9987e91..8ee1552 100644
--
-2.10.2
+2.13.0
diff --git a/net-nntp/sabnzbd/files/patches/0003-use-gntp-1.0.patch b/net-nntp/sabnzbd/files/patches/0003-use-gntp-1.0.patch
index d4d97fe208eb..da87c01a6bd7 100644
--- a/net-nntp/sabnzbd/files/patches/0003-use-gntp-1.0.patch
+++ b/net-nntp/sabnzbd/files/patches/0003-use-gntp-1.0.patch
@@ -1,14 +1,14 @@
-From 821a02104149aa65a6581730457eddbe082153cc Mon Sep 17 00:00:00 2001
+From 1530dc98302cd8a57cf8c3a4616341a7f2c08e50 Mon Sep 17 00:00:00 2001
From: Justin Bronder <jsbronder@gmail.com>
Date: Mon, 13 Feb 2017 18:23:46 -0500
-Subject: [PATCH 3/5] use >=gntp-1.0
+Subject: [PATCH 3/4] use >=gntp-1.0
---
sabnzbd/notifier.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sabnzbd/notifier.py b/sabnzbd/notifier.py
-index f99083f..581eda0 100644
+index 38d0678..4742b3d 100644
--- a/sabnzbd/notifier.py
+++ b/sabnzbd/notifier.py
@@ -39,7 +39,7 @@ from sabnzbd.constants import NOTIFY_KEYS
@@ -21,5 +21,5 @@ index f99083f..581eda0 100644
try:
import Growl
--
-2.10.2
+2.13.0
diff --git a/net-nntp/sabnzbd/files/patches/0004-cfg-disable-NtfOSD-by-default.patch b/net-nntp/sabnzbd/files/patches/0004-cfg-disable-NtfOSD-by-default.patch
new file mode 100644
index 000000000000..25856801af7c
--- /dev/null
+++ b/net-nntp/sabnzbd/files/patches/0004-cfg-disable-NtfOSD-by-default.patch
@@ -0,0 +1,25 @@
+From 31eec0d37bcb962afb1b0f0974411dae728dcd9f Mon Sep 17 00:00:00 2001
+From: Justin Bronder <jsbronder@gmail.com>
+Date: Sat, 5 Aug 2017 17:38:03 -0400
+Subject: [PATCH 4/4] cfg: disable NtfOSD by default
+
+---
+ sabnzbd/cfg.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sabnzbd/cfg.py b/sabnzbd/cfg.py
+index baf5678..f9646fb 100644
+--- a/sabnzbd/cfg.py
++++ b/sabnzbd/cfg.py
+@@ -270,7 +270,7 @@ acenter_prio_queue_done = OptionBool('acenter', 'acenter_prio_queue_done', True)
+ acenter_prio_other = OptionBool('acenter', 'acenter_prio_other', False)
+
+ # [ntfosd]
+-ntfosd_enable = OptionBool('ntfosd', 'ntfosd_enable', not sabnzbd.WIN32 and not sabnzbd.DARWIN)
++ntfosd_enable = OptionBool('ntfosd', 'ntfosd_enable', False)
+ ntfosd_prio_startup = OptionBool('ntfosd', 'ntfosd_prio_startup', True)
+ ntfosd_prio_download = OptionBool('ntfosd', 'ntfosd_prio_download', False)
+ ntfosd_prio_pp = OptionBool('ntfosd', 'ntfosd_prio_pp', False)
+--
+2.13.0
+
diff --git a/net-nntp/sabnzbd/files/patches/0004-cfg-disable-growl-by-default.patch b/net-nntp/sabnzbd/files/patches/0004-cfg-disable-growl-by-default.patch
deleted file mode 100644
index 072c3d014626..000000000000
--- a/net-nntp/sabnzbd/files/patches/0004-cfg-disable-growl-by-default.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6574da3da07b789a6cdbeebc8e36da8a0559924b Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Tue, 14 Jun 2016 08:38:54 -0400
-Subject: [PATCH 4/5] cfg: disable growl by default
-
----
- sabnzbd/cfg.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sabnzbd/cfg.py b/sabnzbd/cfg.py
-index f06b79e..c66fe91 100644
---- a/sabnzbd/cfg.py
-+++ b/sabnzbd/cfg.py
-@@ -277,7 +277,7 @@ acenter_prio_queue_done = OptionBool('acenter', 'acenter_prio_queue_done', True)
- acenter_prio_other = OptionBool('acenter', 'acenter_prio_other', False)
-
- # [ntfosd]
--ntfosd_enable = OptionBool('ntfosd', 'ntfosd_enable', not sabnzbd.WIN32 and not sabnzbd.DARWIN)
-+ntfosd_enable = OptionBool('ntfosd', 'ntfosd_enable', False)
- ntfosd_prio_startup = OptionBool('ntfosd', 'ntfosd_prio_startup', True)
- ntfosd_prio_download = OptionBool('ntfosd', 'ntfosd_prio_download', False)
- ntfosd_prio_pp = OptionBool('ntfosd', 'ntfosd_prio_pp', False)
-@@ -291,7 +291,7 @@ ntfosd_prio_queue_done = OptionBool('ntfosd', 'ntfosd_prio_queue_done', True)
- ntfosd_prio_other = OptionBool('ntfosd', 'ntfosd_prio_other', False)
-
- # [growl]
--growl_enable = OptionBool('growl', 'growl_enable', sabnzbd.DARWIN and sabnzbd.DARWIN_VERSION < 8)
-+growl_enable = OptionBool('growl', 'growl_enable', False)
- growl_server = OptionStr('growl', 'growl_server')
- growl_password = OptionPassword('growl', 'growl_password')
- growl_prio_startup = OptionBool('growl', 'growl_prio_startup', True)
---
-2.10.2
-