diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-02-19 16:30:23 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-02-19 16:44:38 +0000 |
commit | 51ec63396e2ab21cf326457047d052cc97b481e2 (patch) | |
tree | a5b9e613722fa6d2075153fb865fde6fce5d192c /debian/patches/debian | |
parent | Removing Fix-warning-related-to-gettext.patch, included upstream. (diff) | |
download | deluge-51ec63396e2ab21cf326457047d052cc97b481e2.tar.xz deluge-51ec63396e2ab21cf326457047d052cc97b481e2.zip |
Refreshing setuptools-60.patch.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/debian')
-rw-r--r-- | debian/patches/debian/0002-setuptools-60.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/debian/patches/debian/0002-setuptools-60.patch b/debian/patches/debian/0002-setuptools-60.patch new file mode 100644 index 0000000..6027650 --- /dev/null +++ b/debian/patches/debian/0002-setuptools-60.patch @@ -0,0 +1,34 @@ +Author: Stefano Rivera <stefanor@debian.org> +Description: Import setuptools before distutils (Closes: #1022491). + 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. + . + https://github.com/deluge-torrent/deluge/pull/400 + +diff -Naurp deluge.orig/setup.py deluge/setup.py +--- deluge.orig/setup.py ++++ deluge/setup.py +@@ -12,14 +12,15 @@ import glob + import os + import platform + import sys +-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 shutil import rmtree, which + + from setuptools import Command, find_packages, setup + from setuptools.command.test import test as _test + ++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 ++ + import msgfmt + from version import get_version + |