rpms/mingw-readline
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 8.2

Browse Source
This commit is contained in:
Sandro Mani 2022-10-07 12:00:45 +02:00
parent a119fc9891
commit 3db56ecd39
6 changed files with 79 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ readline-5.2.tar.gz
/readline-6.2.tar.gz
/readline-8.0.tar.gz
/readline-8.1.tar.gz
/readline-8.2.tar.gz

20
mingw-readline.spec
View File

@ -1,22 +1,23 @@
%{?mingw_package_header}
Name: mingw-readline
Version: 8.1
Release: 6%{?dist}
Version: 8.2
Release: 1%{?dist}
Summary: MinGW port of readline for editing typed command lines
License: GPLv2+
URL: http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
Source0: ftp://ftp.gnu.org/gnu/readline/readline-%{version}.tar.gz
URL: https://tiswww.case.edu/php/chet/readline/rltop.html
Source0: https://git.savannah.gnu.org/cgit/readline.git/snapshot/readline-%{version}.tar.gz
# Remove RPATH, use CFLAGS
Patch1: readline-8.0-shlib.patch
# SIG_BLOCK is not available on MINGW, its use should have been guaded by HAVE_POSIX_SIGNALS
Patch2: readline-8.1-posix-signals.patch
# Fix mingw build
Patch2: readline_mingw.patch
BuildArch: noarch
BuildRequires: make
BuildRequires: make
BuildRequires: mingw32-filesystem >= 95
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
@ -119,6 +120,7 @@ rm -f %{buildroot}%{mingw64_datadir}/readline/*.c
%{mingw32_docdir}/readline/README
%{mingw32_libdir}/libreadline.dll.a
%{mingw32_libdir}/libhistory.dll.a
%{mingw32_libdir}/pkgconfig/history.pc
%{mingw32_libdir}/pkgconfig/readline.pc
%{mingw32_includedir}/readline/
@ -136,6 +138,7 @@ rm -f %{buildroot}%{mingw64_datadir}/readline/*.c
%{mingw64_docdir}/readline/README
%{mingw64_libdir}/libreadline.dll.a
%{mingw64_libdir}/libhistory.dll.a
%{mingw64_libdir}/pkgconfig/history.pc
%{mingw64_libdir}/pkgconfig/readline.pc
%{mingw64_includedir}/readline/
@ -145,6 +148,9 @@ rm -f %{buildroot}%{mingw64_datadir}/readline/*.c
%changelog
* Fri Oct 07 2022 Sandro Mani <manisandro@gmail.com> - 8.2-1
- Update to 8.2
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

14
readline-8.0-shlib.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference readline-8.1/shlib/Makefile.in readline-8.1-new/shlib/Makefile.in
--- readline-8.1/shlib/Makefile.in 2020-10-29 20:47:57.000000000 +0100
+++ readline-8.1-new/shlib/Makefile.in 2021-01-09 10:49:54.218777248 +0100
diff -rupN --no-dereference readline-8.2/shlib/Makefile.in readline-8.2-new/shlib/Makefile.in
--- readline-8.2/shlib/Makefile.in 2022-09-26 17:53:27.000000000 +0200
+++ readline-8.2-new/shlib/Makefile.in 2022-10-07 10:52:46.226939179 +0200
@@ -178,7 +178,7 @@ $(SHARED_READLINE): $(SHARED_OBJ)
$(SHARED_HISTORY): $(SHARED_HISTOBJ) xmalloc.so xfree.so
@ -10,11 +10,11 @@ diff -rupN --no-dereference readline-8.1/shlib/Makefile.in readline-8.1-new/shli
# Since tilde.c is shared between readline and bash, make sure we compile
# it with the right flags when it's built as part of readline
diff -rupN --no-dereference readline-8.1/support/shobj-conf readline-8.1-new/support/shobj-conf
--- readline-8.1/support/shobj-conf 2019-12-13 15:51:17.000000000 +0100
+++ readline-8.1-new/support/shobj-conf 2021-01-09 10:49:54.219777248 +0100
diff -rupN --no-dereference readline-8.2/support/shobj-conf readline-8.2-new/support/shobj-conf
--- readline-8.2/support/shobj-conf 2022-09-26 17:53:27.000000000 +0200
+++ readline-8.2-new/support/shobj-conf 2022-10-07 10:52:46.226939179 +0200
@@ -126,10 +126,11 @@ sunos5*|solaris2*)
linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*|dragonfly*)
linux*-*|gnu*-*|k*bsd*-gnu-*|midnightbsd*|freebsd*|dragonfly*)
SHOBJ_CFLAGS=-fPIC
SHOBJ_LD='${CC}'
- SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'

14
readline-8.1-posix-signals.patch
View File

@ -1,14 +0,0 @@
diff -rupN readline-8.1/signals.c readline-8.1-new/signals.c
--- readline-8.1/signals.c 2020-08-06 22:30:02.000000000 +0200
+++ readline-8.1-new/signals.c 2021-01-09 10:58:27.861297748 +0100
@@ -266,8 +266,10 @@ _rl_handle_signal (int sig)
case SIGQUIT:
#endif
+#if defined (HAVE_POSIX_SIGNALS)
if (block_sig)
sigprocmask (SIG_BLOCK, &set, &oset);
+#endif
rl_echo_signal_char (sig);
rl_cleanup_after_signal ();

57
readline_mingw.patch Normal file
View File

@ -0,0 +1,57 @@
diff -rupN readline-8.2/input.c readline-8.2-new/input.c
--- readline-8.2/input.c 2022-09-26 17:53:27.000000000 +0200
+++ readline-8.2-new/input.c 2022-10-07 11:44:02.142758291 +0200
@@ -49,7 +49,9 @@
#include <signal.h>
+#ifndef __MINGW32__
#include "posixselect.h"
+#endif
#include "posixtime.h"
#if defined (FIONREAD_IN_SYS_IOCTL)
@@ -151,7 +153,9 @@ int rl_timeout_remaining (unsigned int *
int _rl_timeout_init (void);
int _rl_timeout_sigalrm_handler (void);
+#if defined (_POSIXSELECT_H_)
int _rl_timeout_select (int, fd_set *, fd_set *, fd_set *, const struct timeval *, const sigset_t *);
+#endif
static void _rl_timeout_handle (void);
#if defined (RL_TIMEOUT_USE_SIGALRM)
@@ -534,6 +538,11 @@ reset_alarm ()
setitimer (ITIMER_REAL, &it, NULL);
}
# else
+
+# ifndef USEC_PER_SEC
+# define USEC_PER_SEC 1000000
+# endif
+
static int
set_alarm (unsigned int *secs, unsigned int *usecs)
{
@@ -818,7 +827,7 @@ rl_getc (FILE *stream)
/* We know at this point that _rl_caught_signal == 0 */
#if defined (__MINGW32__)
- if (isatty (fd)
+ if (isatty (fd))
return (_getch ()); /* "There is no error return." */
#endif
result = 0;
diff -rupN readline-8.2/parens.c readline-8.2-new/parens.c
--- readline-8.2/parens.c 2022-09-26 17:53:27.000000000 +0200
+++ readline-8.2-new/parens.c 2022-10-07 11:16:05.059856917 +0200
@@ -38,7 +38,9 @@
# include <unistd.h>
#endif
+#ifndef __MINGW32__
#include "posixselect.h"
+#endif
#if defined (HAVE_STRING_H)
# include <string.h>

2
sources
View File

@ -1 +1 @@
SHA512 (readline-8.1.tar.gz) = 27790d0461da3093a7fee6e89a51dcab5dc61928ec42e9228ab36493b17220641d5e481ea3d8fee5ee0044c70bf960f55c7d3f1a704cf6b9c42e5c269b797e00
SHA512 (readline-8.2.tar.gz) = 383161b8113241e81fce01d4a9570da8aceadedc9b88ac6d6fefa90741c097363c140225a7248b8e841969a5be47936d8bc2058c5ccc6f888d06a91cf6bf99ca