From 51ec63396e2ab21cf326457047d052cc97b481e2 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 19 Feb 2023 17:30:23 +0100 Subject: Refreshing setuptools-60.patch. Signed-off-by: Daniel Baumann --- debian/patches/debian/0002-setuptools-60.patch | 34 ++++++++++++++++++++ debian/patches/series | 2 +- debian/patches/setuptools-60.patch | 43 -------------------------- 3 files changed, 35 insertions(+), 44 deletions(-) create mode 100644 debian/patches/debian/0002-setuptools-60.patch delete mode 100644 debian/patches/setuptools-60.patch 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 +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 + diff --git a/debian/patches/series b/debian/patches/series index c1fae5e..dac2c55 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ debian/0001-release-check.patch -setuptools-60.patch +debian/0002-setuptools-60.patch systemd-debian.patch diff --git a/debian/patches/setuptools-60.patch b/debian/patches/setuptools-60.patch deleted file mode 100644 index af27c9e..0000000 --- a/debian/patches/setuptools-60.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Stefano Rivera -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 -- cgit v1.2.3