diff options
author | Marty E. Plummer <hanetzer@startmail.com> | 2018-03-25 07:43:15 -0500 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2018-04-12 17:29:51 +0200 |
commit | a19fc243299db597a1897e8c423c98d19b092998 (patch) | |
tree | 527be526d451ece5443cdd1d902b91d1772a17c9 /sys-libs/readline/files | |
parent | sys-fs/multipath-tools: Removed old. (diff) | |
download | gentoo-a19fc243299db597a1897e8c423c98d19b092998.tar.gz gentoo-a19fc243299db597a1897e8c423c98d19b092998.tar.bz2 gentoo-a19fc243299db597a1897e8c423c98d19b092998.zip |
sys-libs/readline: EAPI bump and mingw-w64 patch
EAPI 6, patches reformatted to be -p1 (still usable for the older
ebuilds), upstreamish[1] patch added to support mingw-w64.
dohtml changed to HTML_DOCS einstalldocs. Removed src_unpack as
unneeded (probably a holdover from a much older version).
[1]: http://lists.gnu.org/archive/html/bug-readline/2018-01/msg00001.html
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7616
Diffstat (limited to 'sys-libs/readline/files')
4 files changed, 158 insertions, 6 deletions
diff --git a/sys-libs/readline/files/readline-5.0-no_rpath.patch b/sys-libs/readline/files/readline-5.0-no_rpath.patch index 624b2d7dea2b..befad63e4253 100644 --- a/sys-libs/readline/files/readline-5.0-no_rpath.patch +++ b/sys-libs/readline/files/readline-5.0-no_rpath.patch @@ -1,7 +1,7 @@ ripped from Fedora ---- support/shobj-conf -+++ support/shobj-conf +--- a/support/shobj-conf ++++ b/support/shobj-conf @@ -102,7 +102,7 @@ SHOBJ_LD='${CC}' SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' diff --git a/sys-libs/readline/files/readline-7.0-headers.patch b/sys-libs/readline/files/readline-7.0-headers.patch index dfe4e22ad1ae..892ec21f51e5 100644 --- a/sys-libs/readline/files/readline-7.0-headers.patch +++ b/sys-libs/readline/files/readline-7.0-headers.patch @@ -9,8 +9,8 @@ Subject: [PATCH] include ctype.h for isdigit usage diff --git a/lib/readline/histexpand.c b/lib/readline/histexpand.c index 46a99aa62e30..13248db83048 100644 ---- a/lib/readline/histexpand.c -+++ b/lib/readline/histexpand.c +--- a/histexpand.c ++++ b/histexpand.c @@ -26,6 +26,7 @@ #endif diff --git a/sys-libs/readline/files/readline-7.0-mingw.patch b/sys-libs/readline/files/readline-7.0-mingw.patch new file mode 100644 index 000000000000..f003038d2c0f --- /dev/null +++ b/sys-libs/readline/files/readline-7.0-mingw.patch @@ -0,0 +1,152 @@ +--- a/colors.c ++++ b/colors.c +@@ -37,6 +37,10 @@ + #include "posixstat.h" // stat related macros (S_ISREG, ...) + #include <fcntl.h> // S_ISUID + ++#ifndef S_ISDIR ++#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) ++#endif ++ + // strlen() + #if defined (HAVE_STRING_H) + # include <string.h> +@@ -182,12 +186,17 @@ _rl_print_color_indicator (const char *f + if (S_ISREG (mode)) + { + colored_filetype = C_FILE; +- ++#ifdef S_ISUID + if ((mode & S_ISUID) != 0 && is_colored (C_SETUID)) + colored_filetype = C_SETUID; +- else if ((mode & S_ISGID) != 0 && is_colored (C_SETGID)) ++ else ++#endif ++#ifdef S_ISGID ++ if ((mode & S_ISGID) != 0 && is_colored (C_SETGID)) + colored_filetype = C_SETGID; +- else if (is_colored (C_CAP) && 0) //f->has_capability) ++ else ++#endif ++ if (is_colored (C_CAP) && 0) //f->has_capability) + colored_filetype = C_CAP; + else if ((mode & S_IXUGO) != 0 && is_colored (C_EXEC)) + colored_filetype = C_EXEC; +@@ -211,12 +220,16 @@ _rl_print_color_indicator (const char *f + colored_filetype = C_STICKY; + #endif + } ++#if defined (S_ISLNK) + else if (S_ISLNK (mode)) + colored_filetype = C_LINK; ++#endif + else if (S_ISFIFO (mode)) + colored_filetype = C_FIFO; ++#if defined (S_ISSOCK) + else if (S_ISSOCK (mode)) + colored_filetype = C_SOCK; ++#endif + else if (S_ISBLK (mode)) + colored_filetype = C_BLK; + else if (S_ISCHR (mode)) +--- a/histfile.c ++++ b/histfile.c +@@ -606,12 +606,14 @@ history_truncate_file (fname, lines) + history_lines_written_to_file = 0; + } + ++#if defined (HAVE_CHOWN) + /* Make sure the new filename is owned by the same user as the old. If one + user is running this, it's a no-op. If the shell is running after sudo + with a shared history file, we don't want to leave the history file + owned by root. */ + if (rv == 0 && exists) + r = chown (filename, finfo.st_uid, finfo.st_gid); ++#endif + + xfree (filename); + FREE (tempname); +@@ -753,12 +755,14 @@ mmap_error: + history_lines_written_to_file = 0; + } + ++#if defined (HAVE_CHOWN) + /* Make sure the new filename is owned by the same user as the old. If one + user is running this, it's a no-op. If the shell is running after sudo + with a shared history file, we don't want to leave the history file + owned by root. */ + if (rv == 0 && exists) + mode = chown (histname, finfo.st_uid, finfo.st_gid); ++#endif + + FREE (histname); + FREE (tempname); +--- a/input.c ++++ b/input.c +@@ -71,6 +71,10 @@ extern int errno; + #include "rlshell.h" + #include "xmalloc.h" + ++#if defined (__MINGW32__) ++#include <conio.h> ++#endif ++ + /* What kind of non-blocking I/O do we have? */ + #if !defined (O_NDELAY) && defined (O_NONBLOCK) + # define O_NDELAY O_NONBLOCK /* Posix style */ +--- a/posixstat.h ++++ b/posixstat.h +@@ -78,30 +78,44 @@ + + #if defined (S_IFBLK) && !defined (S_ISBLK) + #define S_ISBLK(m) (((m)&S_IFMT) == S_IFBLK) /* block device */ ++#elif !defined (S_IFBLK) ++#define S_ISBLK(m) 0 + #endif + + #if defined (S_IFCHR) && !defined (S_ISCHR) + #define S_ISCHR(m) (((m)&S_IFMT) == S_IFCHR) /* character device */ ++#elif !defined (S_IFCHR) ++#define S_ISCHR(m) 0 + #endif + + #if defined (S_IFDIR) && !defined (S_ISDIR) + #define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR) /* directory */ ++#elif !defined (S_IFDIR) ++#define S_ISDIR(m) 0 + #endif + + #if defined (S_IFREG) && !defined (S_ISREG) + #define S_ISREG(m) (((m)&S_IFMT) == S_IFREG) /* file */ ++#elif !defined (S_IFREG) ++#define S_ISREG(m) 0 + #endif + + #if defined (S_IFIFO) && !defined (S_ISFIFO) + #define S_ISFIFO(m) (((m)&S_IFMT) == S_IFIFO) /* fifo - named pipe */ ++#elif !defined (S_IFIFO) ++#define S_ISFIFO(m) 0 + #endif + + #if defined (S_IFLNK) && !defined (S_ISLNK) + #define S_ISLNK(m) (((m)&S_IFMT) == S_IFLNK) /* symbolic link */ ++#elif !defined (S_IFLNK) ++#define S_ISLNK(m) 0 + #endif + + #if defined (S_IFSOCK) && !defined (S_ISSOCK) + #define S_ISSOCK(m) (((m)&S_IFMT) == S_IFSOCK) /* socket */ ++#elif !defined (S_IFSOCK) ++#define S_ISSOCK(m) 0 + #endif + + /* +@@ -137,6 +151,8 @@ + /* These are non-standard, but are used in builtins.c$symbolic_umask() */ + #define S_IRUGO (S_IRUSR | S_IRGRP | S_IROTH) + #define S_IWUGO (S_IWUSR | S_IWGRP | S_IWOTH) ++#if defined(S_IXUSR) && defined(S_IXOTH) + #define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH) ++#endif + + #endif /* _POSIXSTAT_H_ */ diff --git a/sys-libs/readline/files/readline-7.0-missing-echo-proto.patch b/sys-libs/readline/files/readline-7.0-missing-echo-proto.patch index fe945be72530..cad3c8ca2c44 100644 --- a/sys-libs/readline/files/readline-7.0-missing-echo-proto.patch +++ b/sys-libs/readline/files/readline-7.0-missing-echo-proto.patch @@ -2,8 +2,8 @@ https://lists.gnu.org/archive/html/bug-readline/2016-11/msg00000.html fix from upstream ---- a/lib/readline/readline.h -+++ b/lib/readline/readline.h +--- a/readline.h ++++ b/readline.h @@ -413,6 +413,7 @@ extern void rl_tty_set_default_bindings PARAMS((Keymap)); extern void rl_tty_unset_default_bindings PARAMS((Keymap)); |