summaryrefslogtreecommitdiffstats
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/0001-Fix-warning-related-to-gettext.patch25
-rw-r--r--debian/patches/new_release_check.patch19
-rw-r--r--debian/patches/series4
-rw-r--r--debian/patches/setuptools-60.patch43
-rw-r--r--debian/patches/systemd-debian.patch32
5 files changed, 123 insertions, 0 deletions
diff --git a/debian/patches/0001-Fix-warning-related-to-gettext.patch b/debian/patches/0001-Fix-warning-related-to-gettext.patch
new file mode 100644
index 0000000..cc385d6
--- /dev/null
+++ b/debian/patches/0001-Fix-warning-related-to-gettext.patch
@@ -0,0 +1,25 @@
+From d6c96d629183e8bab2167ef56457f994017e7c85 Mon Sep 17 00:00:00 2001
+From: neeshy <neeshy@tfwno.gf>
+Date: Sat, 18 Apr 2020 23:23:51 -0400
+Subject: Fix warning related to gettext
+
+---
+ deluge/i18n/util.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/deluge/i18n/util.py b/deluge/i18n/util.py
+index bd002f7a2..90568fc5b 100644
+--- a/deluge/i18n/util.py
++++ b/deluge/i18n/util.py
+@@ -114,7 +114,7 @@ def setup_translation():
+ # Workaround for Python 2 unicode gettext (keyword removed in Py3).
+ kwargs = {} if not deluge.common.PY2 else {'unicode': True}
+
+- gettext.install(I18N_DOMAIN, translations_path, names='ngettext', **kwargs)
++ gettext.install(I18N_DOMAIN, translations_path, names=['ngettext'], **kwargs)
+ builtins.__dict__['_n'] = builtins.__dict__['ngettext']
+
+ libintl = None
+--
+2.20.1
+
diff --git a/debian/patches/new_release_check.patch b/debian/patches/new_release_check.patch
new file mode 100644
index 0000000..7b4b539
--- /dev/null
+++ b/debian/patches/new_release_check.patch
@@ -0,0 +1,19 @@
+Description: Disable checking for new upstream releases enabled by default
+ Users can still enable it through the preferences menus.
+Forwarded: not-needed
+Origin: vendor
+Author: Adam Cécile (Le_Vert) <gandalf@le-vert.net>
+
+Index: deluge/deluge/core/preferencesmanager.py
+===================================================================
+--- deluge.orig/deluge/core/preferencesmanager.py 2019-08-25 12:15:43.673234687 -0400
++++ deluge/deluge/core/preferencesmanager.py 2019-08-25 12:16:35.742629247 -0400
+@@ -106,7 +106,7 @@
+ 'path_chooser_accelerator_string': 'Tab',
+ 'path_chooser_max_popup_rows': 20,
+ 'path_chooser_show_hidden_files': False,
+- 'new_release_check': True,
++ 'new_release_check': False,
+ 'proxy': {
+ 'type': 0,
+ 'hostname': '',
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7af5bdb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+new_release_check.patch
+0001-Fix-warning-related-to-gettext.patch
+setuptools-60.patch
+systemd-debian.patch
diff --git a/debian/patches/setuptools-60.patch b/debian/patches/setuptools-60.patch
new file mode 100644
index 0000000..af27c9e
--- /dev/null
+++ b/debian/patches/setuptools-60.patch
@@ -0,0 +1,43 @@
+From: Stefano Rivera <stefanor@debian.org>
+Date: Sat, 12 Nov 2022 22:34:04 +0200
+Subject: Import setuptools before distutils
+
+setuptools 60 uses its own bundled version of distutils, by default. It
+injects this into sys.modules, at import time. So we need to make sure
+that it is imported, before anything else imports distutils, to ensure
+everything is using the same distutils version.
+
+This change in setuptools is to prepare for Python 3.12, which will drop
+distutils.
+
+Bug-Debian: https://bugs.debian.org/1022491
+Forwarded: https://github.com/deluge-torrent/deluge/pull/400
+---
+ setup.py | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 5cae466..fb49f10 100755
+--- a/setup.py
++++ b/setup.py
+@@ -15,15 +15,16 @@ import glob
+ import os
+ import platform
+ import sys
++from shutil import rmtree
++
++from setuptools import find_packages, setup
++from setuptools.command.test import test as _test
++
+ from distutils import cmd
+ from distutils.command.build import build as _build
+ from distutils.command.clean import clean as _clean
+ from distutils.command.install_data import install_data as _install_data
+ from distutils.spawn import find_executable
+-from shutil import rmtree
+-
+-from setuptools import find_packages, setup
+-from setuptools.command.test import test as _test
+
+ import msgfmt
+ from version import get_version
diff --git a/debian/patches/systemd-debian.patch b/debian/patches/systemd-debian.patch
new file mode 100644
index 0000000..212ae76
--- /dev/null
+++ b/debian/patches/systemd-debian.patch
@@ -0,0 +1,32 @@
+Index: deluge-2.0.3/packaging/systemd/deluge-web.service
+===================================================================
+--- deluge-2.0.3.orig/packaging/systemd/deluge-web.service
++++ deluge-2.0.3/packaging/systemd/deluge-web.service
+@@ -7,8 +7,9 @@ Wants=deluged.service
+ [Service]
+ Type=simple
+ UMask=027
+-
+-ExecStart=/usr/bin/deluge-web -d
++User=debian-deluged
++Group=debian-deluged
++ExecStart=/usr/bin/deluge-web -d -c /var/lib/deluged/config
+
+ Restart=on-failure
+
+Index: deluge-2.0.3/packaging/systemd/deluged.service
+===================================================================
+--- deluge-2.0.3.orig/packaging/systemd/deluged.service
++++ deluge-2.0.3/packaging/systemd/deluged.service
+@@ -6,8 +6,9 @@ After=network-online.target
+ [Service]
+ Type=simple
+ UMask=007
+-
+-ExecStart=/usr/bin/deluged -d
++User=debian-deluged
++Group=debian-deluged
++ExecStart=/usr/bin/deluged -d -c /var/lib/deluged/config -l /var/log/deluged/daemon.log -L info
+
+ Restart=on-failure
+