gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-04 01:37:34 -08:00
Code Issues Projects Releases Wiki Activity

app-misc/tdl: port to C23 & non-deprecated readline typedefs

Browse Source 
As promised in the previous commit.

Bug: https://bugs.gentoo.org/944033
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James 2025-09-07 22:39:54 +01:00
parent 0942887557
commit f03da6e3ff
No known key found for this signature in database
GPG Key ID: 738409F520DF9190
2 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app-misc/tdl/files/tdl-1.5.2-readline-obsolete-typedefs.patch
View File

@ -1,13 +1,42 @@
https://bugs.gentoo.org/944033 https://bugs.gentoo.org/944033
--- a/inter.c --- a/inter.c
+++ b/inter.c +++ b/inter.c
@@ -28,7 +28,8 @@ @@ -28,7 +28,7 @@
#include <unistd.h> #include <unistd.h>
#ifdef USE_READLINE #ifdef USE_READLINE
-#if BARE_READLINE_H -#if BARE_READLINE_H
+#define WANT_OBSOLETE_TYPEDEFS
+#if BARE_READLINE_H +#if BARE_READLINE_H
#include <readline.h> #include <readline.h>
#include <history.h> #include <history.h>
#else #else
@@ -556,7 +556,7 @@ static int setup_initval_hook(void)/*{{{*/
static char *interactive_text_readline(char *prompt, char *initval, int *is_blank, int *error)/*{{{*/
{
char *line;
- Function *old_rl_pre_input_hook = NULL;
+ rl_hook_func_t *old_rl_pre_input_hook = NULL;
*error = 0;
old_rl_pre_input_hook = rl_pre_input_hook;
@@ -633,9 +633,9 @@ char *interactive_text (char *prompt, char *initval, int *is_blank, int *error)/
#ifdef USE_READLINE
if (isatty(0)) {
char *result;
- rl_attempted_completion_function = (CPPFunction *) null_tdl_completion;
+ rl_attempted_completion_function = (rl_completion_func_t *) null_tdl_completion;
result = interactive_text_readline(prompt, initval, is_blank, error);
- rl_attempted_completion_function = (CPPFunction *) tdl_completion;
+ rl_attempted_completion_function = (rl_completion_func_t *) tdl_completion;
return result;
} else {
/* In case someone wants to drive tdl from a script, by redirecting stdin to it. */
@@ -653,7 +653,7 @@ void interactive(void)/*{{{*/
#ifdef USE_READLINE
if (isatty(0)) {
rl_completion_entry_function = NULL;
- rl_attempted_completion_function = (CPPFunction *) tdl_completion;
+ rl_attempted_completion_function = (rl_completion_func_t *) tdl_completion;
interactive_readline();
} else {
/* In case someone wants to drive tdl from a script, by redirecting stdin to it. */

17
app-misc/tdl/tdl-1.5.2-r4.ebuild → app-misc/tdl/tdl-1.5.2-r5.ebuild
View File

@ -3,7 +3,7 @@
EAPI=8 EAPI=8
inherit edo flag-o-matic toolchain-funcs inherit edo toolchain-funcs
MY_PV="$(ver_rs 1- '_')" MY_PV="$(ver_rs 1- '_')"
DESCRIPTION="Command line To Do List manager" DESCRIPTION="Command line To Do List manager"
@ -17,13 +17,14 @@ KEYWORDS="amd64 ppc x86"
IUSE="doc readline" IUSE="doc readline"
RDEPEND=" RDEPEND="
sys-libs/ncurses:0= sys-libs/ncurses:=
sys-libs/readline:0=" sys-libs/readline:=
"
DEPEND=" DEPEND="${RDEPEND}"
${RDEPEND} BDEPEND="
sys-apps/texinfo sys-apps/texinfo
doc? ( virtual/texi2dvi )" doc? ( virtual/texi2dvi )
"
PATCHES=( PATCHES=(
"${FILESDIR}"/${PV}-ldflags.patch "${FILESDIR}"/${PV}-ldflags.patch
@ -41,8 +42,6 @@ src_prepare() {
} }
src_configure() { src_configure() {
append-cflags -std=gnu17
local myconf=( local myconf=(
--prefix="${EPREFIX}"/usr --prefix="${EPREFIX}"/usr
) )