Date: Sun, 2 Apr 2017 09:54:38 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437542 - in head/devel/libreadline-java: . files Message-ID: <201704020954.v329scGM016094@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sun Apr 2 09:54:38 2017 New Revision: 437542 URL: https://svnweb.freebsd.org/changeset/ports/437542 Log: Fix build with newer libedit which has better compat with readline Modified: head/devel/libreadline-java/Makefile head/devel/libreadline-java/files/patch-src_native_org__gnu__readline__Readline.c Modified: head/devel/libreadline-java/Makefile ============================================================================== --- head/devel/libreadline-java/Makefile Sun Apr 2 09:51:29 2017 (r437541) +++ head/devel/libreadline-java/Makefile Sun Apr 2 09:54:38 2017 (r437542) @@ -4,7 +4,7 @@ PORTNAME= libreadline-java PORTVERSION= 0.8.0 DISTVERSIONSUFFIX= -src -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel java MASTER_SITES= SF/java-readline/java-readline/${PORTVERSION} Modified: head/devel/libreadline-java/files/patch-src_native_org__gnu__readline__Readline.c ============================================================================== --- head/devel/libreadline-java/files/patch-src_native_org__gnu__readline__Readline.c Sun Apr 2 09:51:29 2017 (r437541) +++ head/devel/libreadline-java/files/patch-src_native_org__gnu__readline__Readline.c Sun Apr 2 09:54:38 2017 (r437542) @@ -1,6 +1,6 @@ ---- src/native/org_gnu_readline_Readline.c.orig 2003-01-07 10:14:35 UTC +--- src/native/org_gnu_readline_Readline.c.orig 2017-04-02 09:52:09 UTC +++ src/native/org_gnu_readline_Readline.c -@@ -430,7 +430,7 @@ const char *java_completer(char *text, i +@@ -430,7 +430,7 @@ const char *java_completer(char *text, int state) { jtext = (*jniEnv)->NewStringUTF(jniEnv,text); if (jniMethodId == 0) { @@ -9,10 +9,26 @@ } completion = (*jniEnv)->CallObjectMethod(jniEnv, jniObject, -@@ -560,6 +560,21 @@ JNIEXPORT void JNICALL - #endif - - /* -------------------------------------------------------------------------- */ +@@ -472,11 +472,7 @@ JNIEXPORT void JNICALL Java_org_gnu_readline_Readline_ + 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; +@@ -556,6 +552,21 @@ JNIEXPORT void JNICALL + return; + } + rl_completer_word_break_characters = word_break_buffer; ++} ++#endif ++ ++/* -------------------------------------------------------------------------- */ +/* Sets/gets rl_completion_append_character */ +/* -------------------------------------------------------------------------- */ + @@ -24,10 +40,6 @@ + + rl_completion_append_character = (int)appendCharacter; + return (jchar)previous_setting; -+} -+#endif -+ -+/* -------------------------------------------------------------------------- */ - /* Convert utf8-string to ucs1-string . */ - /* -------------------------------------------------------------------------- */ + } + #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704020954.v329scGM016094>