[libreadline-java] 01/09: add patch for FTBFS against libedit 3.1-20160903 (closes: #844872)

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository libreadline-java.

commit ba9c39e58e62271dbae11a3a0938b5bd6c4d19fc
Author: tony mancill <tmancill at debian.org>
Date:   Sun Nov 20 19:45:45 2016 -0800

    add patch for FTBFS against libedit 3.1-20160903 (closes: #844872)
---
 debian/control                            |  2 +-
 debian/patches/libedit-3.1-20160903.patch | 20 ++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 488d938..7c531fc 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Niels Thykier <niels at thykier.net>,
 Build-Depends: debhelper (>= 9),
  default-jdk,
  default-jdk-doc,
- libedit-dev,
+ libedit-dev (>= 3.1-20160903~),
  libreadline-dev,
  javahelper
 Standards-Version: 3.9.5
diff --git a/debian/patches/libedit-3.1-20160903.patch b/debian/patches/libedit-3.1-20160903.patch
new file mode 100644
index 0000000..479bb2b
--- /dev/null
+++ b/debian/patches/libedit-3.1-20160903.patch
@@ -0,0 +1,20 @@
+Description: Address compilation problem againt libedit 3.1-20160903
+ libedit now defines rl_compentry_func_t just like readline, so the
+ conditional code is no longer required.
+Author: tony mancill <tmancill at debian.org>
+Forwarded: not-needed
+
+--- a/src/native/org_gnu_readline_Readline.c
++++ b/src/native/org_gnu_readline_Readline.c
+@@ -696,11 +696,7 @@
+       rl_completion_entry_function = NULL;
+       return;
+     }
+-#ifdef JavaEditline
+-    rl_completion_entry_function = (CPFunction *) java_completer;
+-#else
+     rl_completion_entry_function = (rl_compentry_func_t *) java_completer;
+-#endif
+   }
+   else {
+     rl_completion_entry_function = NULL;
diff --git a/debian/patches/series b/debian/patches/series
index 56657db..069bd4b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ native-makefile.patch
 makefile-fix.patch
 clang_FTBFS_Wreturn-type.patch
 makefile-CFLAGS.patch
+libedit-3.1-20160903.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libreadline-java.git