From bff68c8db01d4631d9c302631c4d80d9bb5cf5cf Mon Sep 17 00:00:00 2001
From: Luis Guzman <ark@switnet.org>
Date: Mon, 10 Jun 2024 17:10:32 +0000
Subject: [PATCH] electrum: replace distutils StrictVersion with
 packaging.version

---
 .../replace_distutils_by_packaging.patch      | 43 +++++++++++++++++++
 helpers/make-electrum                         | 14 ++++--
 2 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 helpers/DATA/electrum/replace_distutils_by_packaging.patch

diff --git a/helpers/DATA/electrum/replace_distutils_by_packaging.patch b/helpers/DATA/electrum/replace_distutils_by_packaging.patch
new file mode 100644
index 0000000..01263b5
--- /dev/null
+++ b/helpers/DATA/electrum/replace_distutils_by_packaging.patch
@@ -0,0 +1,43 @@
+diff --git a/electrum/gui/qt/update_checker.py b/electrum/gui/qt/update_checker.py
+index fa3ad989..998e746f 100644
+--- a/electrum/gui/qt/update_checker.py
++++ b/electrum/gui/qt/update_checker.py
+@@ -16,7 +16,7 @@ from electrum.i18n import _
+ from electrum.util import make_aiohttp_session
+ from electrum.logging import Logger
+ from electrum.network import Network
+-from electrum._vendor.distutils.version import StrictVersion
++import packaging.version
+ 
+ 
+ class UpdateCheck(QDialog, Logger):
+@@ -76,7 +76,7 @@ class UpdateCheck(QDialog, Logger):
+ 
+     @staticmethod
+     def is_newer(latest_version):
+-        return latest_version > StrictVersion(version.ELECTRUM_VERSION)
++        return latest_version > packaging.version(version.ELECTRUM_VERSION)
+ 
+     def update_view(self, latest_version=None):
+         if latest_version:
+@@ -129,7 +129,7 @@ class UpdateCheckThread(QThread, Logger):
+                         break
+                 else:
+                     raise Exception('no valid signature for version announcement')
+-                return StrictVersion(version_num.strip())
++                return packaging.version(version_num.strip())
+ 
+     def run(self):
+         if not self.network:
+diff --git a/debian/control b/debian/control
+index 6b24e90c..2a3f3436 100644
+--- a/debian/control
++++ b/debian/control
+@@ -24,6 +24,7 @@ Build-Depends:
+  python3-dnspython (>= 2.0),
+  python3-ecdsa (>= 0.14),
+  python3-kivy,
++ python3-packaging,
+  python3-pbkdf2,
+  python3-protobuf (>= 3.12),
+  python3-pyaes,
diff --git a/helpers/make-electrum b/helpers/make-electrum
index cccd5d1..2bf2e9b 100644
--- a/helpers/make-electrum
+++ b/helpers/make-electrum
@@ -17,13 +17,19 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=1
-EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main'
+VERSION=3
+EXTERNAL='deb-src http://ftp.debian.org/debian bookworm main'
 REPOKEY=0E98404D386FA1D9
-DEPENDS=aiorpcx,aiohttp-socks,protobuf
 
 . ./config
 
-changelog "Backported from debian bullseye"
+# Replace deprecated distutils :
+# electrum/_vendor/distutils/version.py should be provided by
+# /usr/lib/python3/dist-packages/packaging/version.py, confirm.
+sed -i 's|python3-distutils,|python3-packaging,|' debian/control
+remove_patch Replace-vendored-distutils.patch
+patch_p1 $DATA/replace_distutils_by_packaging.patch
+
+changelog "Backported from debian bookworm"
 
 package