diff options
Diffstat (limited to 'devel/readline/files')
| -rw-r--r-- | devel/readline/files/patch-clang18 | 31 | ||||
| -rw-r--r-- | devel/readline/files/patch-doc-readline.3 | 32 | ||||
| -rw-r--r-- | devel/readline/files/patch-doc-readline.info | 28 | ||||
| -rw-r--r-- | devel/readline/files/patch-doc-rluserman.info | 28 |
4 files changed, 47 insertions, 72 deletions
diff --git a/devel/readline/files/patch-clang18 b/devel/readline/files/patch-clang18 deleted file mode 100644 index df9e8b671ddc..000000000000 --- a/devel/readline/files/patch-clang18 +++ /dev/null @@ -1,31 +0,0 @@ ---- readline.h.orig 2022-02-18 16:13:59 UTC -+++ readline.h -@@ -404,10 +404,10 @@ extern int rl_mark_active_p (void); - extern void rl_deactivate_mark (void); - extern int rl_mark_active_p (void); - --#if defined (USE_VARARGS) && defined (PREFER_STDARG) -+#if defined(__GNUC__) || defined(__clang__) - extern int rl_message (const char *, ...) __attribute__((__format__ (printf, 1, 2))); - #else --extern int rl_message (); -+extern int rl_message (const char *, ...); - #endif - - extern int rl_show_char (int); ---- rltypedefs.h.orig 2021-01-22 15:04:18 UTC -+++ rltypedefs.h -@@ -32,10 +32,13 @@ extern "C" { - # define _FUNCTION_DEF - - #if defined(__GNUC__) || defined(__clang__) -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wstrict-prototypes" - typedef int Function () __attribute__((deprecated)); - typedef void VFunction () __attribute__((deprecated)); - typedef char *CPFunction () __attribute__((deprecated)); - typedef char **CPPFunction () __attribute__((deprecated)); -+#pragma GCC diagnostic pop - #else - typedef int Function (); - typedef void VFunction (); diff --git a/devel/readline/files/patch-doc-readline.3 b/devel/readline/files/patch-doc-readline.3 index d7d7b3631b32..41a76b97d73c 100644 --- a/devel/readline/files/patch-doc-readline.3 +++ b/devel/readline/files/patch-doc-readline.3 @@ -1,25 +1,27 @@ ---- doc/readline.3.orig 2020-10-29 20:48:10 UTC +% sed -i .orig 's|/etc/inputrc|%%PREFIX%%&|g' doc/readline.3 doc/readline.info doc/rluserman.info + +--- doc/readline.3.orig 2025-02-03 15:12:54 UTC +++ doc/readline.3 -@@ -118,7 +118,7 @@ The name of this file is taken from the value of the - environment variable. If that variable is unset, the default is - .IR ~/.inputrc . - If that file does not exist or cannot be read, the ultimate default is +@@ -180,7 +180,7 @@ If that file does not exist or cannot be read, \fBrea + If that variable is unset, the default is + .IR \*~/.inputrc . + If that file does not exist or cannot be read, \fBreadline\fP looks for -.IR /etc/inputrc . +.IR %%PREFIX%%/etc/inputrc . - When a program which uses the readline library starts up, the - init file is read, and the key bindings and variables are set. - There are only a few basic constructs allowed in the -@@ -722,11 +722,11 @@ the test fails. - .IP \fB$include\fP + When a program that uses the \fBreadline\fP library starts up, + \fBreadline\fP reads the initialization file + and sets the key bindings and variables found there, +@@ -936,11 +936,11 @@ and key bindings from that file. + .B $include This directive takes a single filename as an argument and reads commands - and bindings from that file. For example, the following directive --would read \fI/etc/inputrc\fP: -+would read \fI%%PREFIX%%/etc/inputrc\fP: - .sp 1 + and key bindings from that file. +-For example, the following directive would read \fI/etc/inputrc\fP: ++For example, the following directive would read \fI%%PREFIX%%/etc/inputrc\fP: + .PP .RS .nf -\fB$include\fP \^ \fI/etc/inputrc\fP +\fB$include\fP \^ \fI%%PREFIX%%/etc/inputrc\fP - .fi + .fi .RE .SH SEARCHING diff --git a/devel/readline/files/patch-doc-readline.info b/devel/readline/files/patch-doc-readline.info index 6eb3350f6d4d..3ac09ea4dafe 100644 --- a/devel/readline/files/patch-doc-readline.info +++ b/devel/readline/files/patch-doc-readline.info @@ -1,21 +1,23 @@ ---- doc/readline.info.orig 2020-10-30 14:07:51 UTC +% sed -i .orig 's|/etc/inputrc|%%PREFIX%%&|g' doc/readline.3 doc/readline.info doc/rluserman.info + +--- doc/readline.info.orig 2025-03-31 14:28:42 UTC +++ doc/readline.info -@@ -313,7 +313,7 @@ putting commands in an "inputrc" file, conventionally +@@ -327,7 +327,7 @@ is ‘~/.inputrc’. If that file does not exist or c directory. The name of this file is taken from the value of the - environment variable 'INPUTRC'. If that variable is unset, the default - is '~/.inputrc'. If that file does not exist or cannot be read, the --ultimate default is '/etc/inputrc'. -+ultimate default is '%%PREFIX%%/etc/inputrc'. + environment variable ‘INPUTRC’. If that variable is unset, the default + is ‘~/.inputrc’. If that file does not exist or cannot be read, +-Readline looks for ‘/etc/inputrc’. ++Readline looks for ‘%%PREFIX%%/etc/inputrc’. - When a program which uses the Readline library starts up, the init - file is read, and the key bindings are set. -@@ -853,8 +853,8 @@ four parser directives used. - '$include' + When a program that uses the Readline library starts up, Readline + reads the init file and sets any variables and key bindings it contains. +@@ -954,8 +954,8 @@ four parser directives available. + ‘$include’ This directive takes a single filename as an argument and reads - commands and bindings from that file. For example, the following -- directive reads from '/etc/inputrc': + commands and key bindings from that file. For example, the +- following directive reads from ‘/etc/inputrc’: - $include /etc/inputrc -+ directive reads from '%%PREFIX%%/etc/inputrc': ++ following directive reads from ‘%%PREFIX%%/etc/inputrc’: + $include %%PREFIX%%/etc/inputrc diff --git a/devel/readline/files/patch-doc-rluserman.info b/devel/readline/files/patch-doc-rluserman.info index 332ba1fc1715..1f1fcdc23b9f 100644 --- a/devel/readline/files/patch-doc-rluserman.info +++ b/devel/readline/files/patch-doc-rluserman.info @@ -1,21 +1,23 @@ ---- doc/rluserman.info.orig 2020-10-30 14:07:52 UTC +% sed -i .orig 's|/etc/inputrc|%%PREFIX%%&|g' doc/readline.3 doc/readline.info doc/rluserman.info + +--- doc/rluserman.info.orig 2025-03-31 14:28:42 UTC +++ doc/rluserman.info -@@ -311,7 +311,7 @@ putting commands in an "inputrc" file, conventionally +@@ -325,7 +325,7 @@ is ‘~/.inputrc’. If that file does not exist or c directory. The name of this file is taken from the value of the - environment variable 'INPUTRC'. If that variable is unset, the default - is '~/.inputrc'. If that file does not exist or cannot be read, the --ultimate default is '/etc/inputrc'. -+ultimate default is '%%PREFIX%%/etc/inputrc'. + environment variable ‘INPUTRC’. If that variable is unset, the default + is ‘~/.inputrc’. If that file does not exist or cannot be read, +-Readline looks for ‘/etc/inputrc’. ++Readline looks for ‘%%PREFIX%%/etc/inputrc’. - When a program which uses the Readline library starts up, the init - file is read, and the key bindings are set. -@@ -851,8 +851,8 @@ four parser directives used. - '$include' + When a program that uses the Readline library starts up, Readline + reads the init file and sets any variables and key bindings it contains. +@@ -952,8 +952,8 @@ four parser directives available. + ‘$include’ This directive takes a single filename as an argument and reads - commands and bindings from that file. For example, the following -- directive reads from '/etc/inputrc': + commands and key bindings from that file. For example, the +- following directive reads from ‘/etc/inputrc’: - $include /etc/inputrc -+ directive reads from '%%PREFIX%%/etc/inputrc': ++ following directive reads from ‘%%PREFIX%%/etc/inputrc’: + $include %%PREFIX%%/etc/inputrc |