Package: mathomatic
Severity: normal

Debian's editline package is not updated in a long time. There is the
alternative package libedit which stems from the same source but is
properly maintained in Debian. This patch builds mathomatic with that
instead.
From 8cc0db797a3bf78ab12c189d339654d9ed34e6ed Mon Sep 17 00:00:00 2001
From: Bastian Germann <bastiangerm...@fishpost.de>
Date: Sun, 26 Jul 2020 22:47:47 +0200
Subject: [PATCH] Build with libedit

---
 debian/control                          |  2 +-
 debian/patches/build-with-libedit.patch | 17 +++++++++++++++++
 debian/patches/series                   |  1 +
 debian/rules                            |  2 +-
 4 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 debian/patches/build-with-libedit.patch

diff --git a/debian/control b/debian/control
index 1e58d78..3f0391b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: mathomatic
 Section: math
 Priority: optional
 Maintainer: tony mancill <tmanc...@debian.org>
-Build-Depends: debhelper-compat (= 12), libeditline-dev, rman, htmldoc, tidy
+Build-Depends: debhelper-compat (= 12), libedit-dev, rman, htmldoc, tidy
 Standards-Version: 4.4.1
 Homepage: http://www.mathomatic.org
 Vcs-Browser: https://salsa.debian.org/debian/mathomatic
diff --git a/debian/patches/build-with-libedit.patch b/debian/patches/build-with-libedit.patch
new file mode 100644
index 0000000..6c497d9
--- /dev/null
+++ b/debian/patches/build-with-libedit.patch
@@ -0,0 +1,17 @@
+From: Bastian Germann <bastiangerm...@fishpost.de>
+Date: Sun, 26 Jul 2020 22:21:27 +0200
+Subject: Build with libedit
+---
+diff --git a/includes.h b/includes.h
+index 2e5667a..f9223fc 100644
+--- a/includes.h
++++ b/includes.h
+@@ -106,7 +106,7 @@ George Gesslein II, P.O. Box 224, Lansing, NY  14882-0224  USA.
+ #include <readline/history.h>
+ #endif
+ #if	EDITLINE	/* Editline is a stripped down version of readline. */
+-#include <editline.h>
++#include <editline/readline.h>
+ #endif
+ 
+ /* Include files from the current directory: */
diff --git a/debian/patches/series b/debian/patches/series
index a2fba86..a690f6d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+build-with-libedit.patch
 python3.patch
diff --git a/debian/rules b/debian/rules
index 67a937b..7f0fdf4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ export LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 	dh $@
 
 override_dh_auto_build:
-	CFLAGS="$(CFLAGS) -DEDITLINE" LDLIBS="-leditline" $(MAKE)
+	CFLAGS="$(CFLAGS) -DEDITLINE" LDLIBS="-ledit" $(MAKE)
 	$(MAKE) -C primes
 	$(MAKE) pdf
 
-- 
2.28.0.rc2

Reply via email to