Package: src:cmd2
Version: 2.1.2-1
Severity: wishlist


Quack,

I needed a newer version and made a port for myself. The bump requires a small patch but is otherwise rather trivial.

Here is the bug I opened upstream about the "not libedit" requirement, which is not true anymore with our version of Python 3.10 in unstable:
  https://github.com/python-cmd2/cmd2/issues/1186

Attached is the diff for the new version.

Regards.
\_o<

--
Marc Dequènes
diff --git a/debian/changelog b/debian/changelog
index 995dd2e..4e7c1c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cmd2 (2.3.3-1) UNRELEASED; urgency=medium
+
+  * NUR.
+  * Add patch to allow using libedit.
+
+ -- Marc Dequènes (Duck) <d...@duckcorp.org>  Wed, 22 Dec 2021 20:36:25 +0900
+
 cmd2 (2.1.2-1) unstable; urgency=medium
 
   * New upstream release (Closes: #984798)
diff --git a/debian/control b/debian/control
index 17fd8c6..47ef611 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Build-Depends-Indep:
  dh-python,
  python3-all,
  python3-attr,
- python3-colorama,
  python3-contextlib2,
  python3-pyperclip,
  python3-pytest,
diff --git a/debian/patches/py3.10_libedit.patch b/debian/patches/py3.10_libedit.patch
new file mode 100644
index 0000000..29c54c8
--- /dev/null
+++ b/debian/patches/py3.10_libedit.patch
@@ -0,0 +1,11 @@
+--- a/cmd2/rl_utils.py
++++ b/cmd2/rl_utils.py
+@@ -126,7 +126,7 @@
+ 
+ elif 'gnureadline' in sys.modules or 'readline' in sys.modules:
+     # We don't support libedit
+-    if 'libedit' not in readline.__doc__:
++    if 'libedit' not in readline.__doc__ or True:
+         try:
+             # Load the readline lib so we can access members of it
+             import ctypes
diff --git a/debian/patches/series b/debian/patches/series
index 8d193a1..1390604 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 001-drop-setuptools_scm.patch
+py3.10_libedit.patch

Reply via email to