From a6ed53489290e484d2f09d217d27bbb3378d6c21 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 21 Mar 2024 19:04:39 +0000 Subject: [PATCH] mingw-readline package is retired on branch c10s for BAKERY-412 --- .gitignore | 5 - dead.package | 1 + mingw-readline.spec | 268 --------------------------------------- readline-8.0-shlib.patch | 29 ----- readline_mingw.patch | 57 --------- sources | 1 - 6 files changed, 1 insertion(+), 360 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 mingw-readline.spec delete mode 100644 readline-8.0-shlib.patch delete mode 100644 readline_mingw.patch delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index fb07ad7..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..4d87762 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +mingw-readline package is retired on branch c10s for BAKERY-412 \ No newline at end of file diff --git a/mingw-readline.spec b/mingw-readline.spec deleted file mode 100644 index 0e9ebe7..0000000 --- a/mingw-readline.spec +++ /dev/null @@ -1,268 +0,0 @@ -%{?mingw_package_header} - -Name: mingw-readline -Version: 8.2 -Release: 3%{?dist} -Summary: MinGW port of readline for editing typed command lines - -License: GPL-2.0-or-later -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 -# Fix mingw build -Patch2: readline_mingw.patch - -BuildArch: noarch - -BuildRequires: make - -BuildRequires: mingw32-filesystem >= 95 -BuildRequires: mingw32-gcc -BuildRequires: mingw32-binutils -BuildRequires: mingw32-termcap - -BuildRequires: mingw64-filesystem >= 95 -BuildRequires: mingw64-gcc -BuildRequires: mingw64-binutils -BuildRequires: mingw64-termcap - - -%description -The Readline library provides a set of functions that allow users to -edit command lines. Both Emacs and vi editing modes are available. The -Readline library includes additional functions for maintaining a list -of previously-entered command lines for recalling or editing those -lines, and for performing csh-like history expansion on previous -commands. - -This is a port of the library and development tools to Windows. - - -# Win32 -%package -n mingw32-readline -Summary: MinGW port of readline for editing typed command lines - -%description -n mingw32-readline -The Readline library provides a set of functions that allow users to -edit command lines. Both Emacs and vi editing modes are available. The -Readline library includes additional functions for maintaining a list -of previously-entered command lines for recalling or editing those -lines, and for performing csh-like history expansion on previous -commands. - -This is a port of the library and development tools to Windows. - -%package -n mingw32-readline-static -Summary: Static version of the cross compiled readline library -Requires: mingw32-readline = %{version}-%{release} - -%description -n mingw32-readline-static -Static version of the cross compiled readline library. - -# Win64 -%package -n mingw64-readline -Summary: MinGW port of readline for editing typed command lines - -%description -n mingw64-readline -The Readline library provides a set of functions that allow users to -edit command lines. Both Emacs and vi editing modes are available. The -Readline library includes additional functions for maintaining a list -of previously-entered command lines for recalling or editing those -lines, and for performing csh-like history expansion on previous -commands. - -This is a port of the library and development tools to Windows. - -%package -n mingw64-readline-static -Summary: Static version of the cross compiled readline library -Requires: mingw64-readline = %{version}-%{release} - -%description -n mingw64-readline-static -Static version of the cross compiled readline library. - - -%{?mingw_debug_package} - - -%prep -%autosetup -p1 -n readline-%{version} - - -%build -%mingw_configure --enable-shared -%mingw_make SHLIB_LIBS=-ltermcap - - -%install -%mingw_make_install - -# Don't want the info files or manpages which duplicate the native package. -rm -rf %{buildroot}%{mingw32_mandir} -rm -rf %{buildroot}%{mingw32_infodir} - -rm -rf %{buildroot}%{mingw64_mandir} -rm -rf %{buildroot}%{mingw64_infodir} - -# The examples also duplicate the native package so they can be removed as well -rm -f %{buildroot}%{mingw32_datadir}/readline/*.c -rm -f %{buildroot}%{mingw64_datadir}/readline/*.c - - -# Win32 -%files -n mingw32-readline -%license COPYING -%{mingw32_bindir}/libreadline8.dll -%{mingw32_bindir}/libhistory8.dll -%{mingw32_docdir}/readline/CHANGES -%{mingw32_docdir}/readline/INSTALL -%{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/ - -%files -n mingw32-readline-static -%{mingw32_libdir}/libhistory.a -%{mingw32_libdir}/libreadline.a - -# Win64 -%files -n mingw64-readline -%license COPYING -%{mingw64_bindir}/libreadline8.dll -%{mingw64_bindir}/libhistory8.dll -%{mingw64_docdir}/readline/CHANGES -%{mingw64_docdir}/readline/INSTALL -%{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/ - -%files -n mingw64-readline-static -%{mingw64_libdir}/libhistory.a -%{mingw64_libdir}/libreadline.a - - -%changelog -* Thu Jul 20 2023 Fedora Release Engineering - 8.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 8.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Oct 07 2022 Sandro Mani - 8.2-1 -- Update to 8.2 - -* Thu Jul 21 2022 Fedora Release Engineering - 8.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Mar 25 2022 Sandro Mani - 8.1-5 -- Rebuild with mingw-gcc-12 - -* Thu Jan 20 2022 Fedora Release Engineering - 8.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 8.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 8.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sat Jan 09 2021 Sandro Mani - 8.1-1 -- Update to 8.1 - -* Tue Jul 28 2020 Fedora Release Engineering - 8.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Aug 14 2019 Fabiano Fidêncio - 8.0-1 -- Update the sources accordingly to its native counter part, rhbz#1740751 - -* Thu Jul 25 2019 Fedora Release Engineering - 6.2-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 6.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 6.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 08 2018 Fedora Release Engineering - 6.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 6.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 6.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 6.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 6.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 6.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 29 2014 Erik van Pienbroek - 6.2-4 -- Fix CVE-2014-2524 (RHBZ #1077035) - -* Sat Aug 03 2013 Fedora Release Engineering - 6.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 6.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Nov 22 2012 Erik van Pienbroek - 6.2-1 -- Update to 6.2 -- Cleaned up old patches and obsolete hacks - -* Fri Jul 20 2012 Fedora Release Engineering - 5.2-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Mar 10 2012 Erik van Pienbroek - 5.2-12 -- Added win64 support -- Automatically generate debuginfo subpackage -- Added -static subpackage - -* Wed Mar 07 2012 Kalev Lember - 5.2-11 -- Renamed the source package to mingw-readline (#801022) -- Modernize the spec file -- Use mingw macros without leading underscore - -* Mon Feb 27 2012 Erik van Pienbroek - 5.2-10 -- Rebuild against the mingw-w64 toolchain - -* Fri Jan 13 2012 Fedora Release Engineering - 5.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 5.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Jul 25 2009 Fedora Release Engineering - 5.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 5.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Fri Feb 20 2009 Richard W.M. Jones - 5.2-5 -- Rebuild for mingw32-gcc 4.4 - -* Sat Nov 22 2008 Richard W.M. Jones - 5.2-4 -- Rename *.dll.a to lib*.dll.a so that libtool can use these libraries. - -* Wed Nov 19 2008 Richard W.M. Jones - 5.2-3 -- Fix paths to mandir, infodir. - -* Fri Oct 31 2008 Richard W.M. Jones - 5.2-2 -- Rebuild against latest termcap. - -* Thu Sep 25 2008 Richard W.M. Jones - 5.2-1 -- Initial RPM release. diff --git a/readline-8.0-shlib.patch b/readline-8.0-shlib.patch deleted file mode 100644 index d1e5bba..0000000 --- a/readline-8.0-shlib.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 - $(RM) $@ -- $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so $(SHLIB_LIBS) -+ $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so - - # 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.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-*|midnightbsd*|freebsd*|dragonfly*) - SHOBJ_CFLAGS=-fPIC - SHOBJ_LD='${CC}' -- SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' -+ SHOBJ_LDFLAGS='$(CFLAGS) -shared -Wl,-soname,$@' - -- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`' -+ SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`' - SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' -+ SHLIB_LIBS='-ltinfo' - ;; - - # Darwin/MacOS X diff --git a/readline_mingw.patch b/readline_mingw.patch deleted file mode 100644 index d45e4ae..0000000 --- a/readline_mingw.patch +++ /dev/null @@ -1,57 +0,0 @@ -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 - -+#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 - #endif - -+#ifndef __MINGW32__ - #include "posixselect.h" -+#endif - - #if defined (HAVE_STRING_H) - # include diff --git a/sources b/sources deleted file mode 100644 index d331424..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (readline-8.2.tar.gz) = 383161b8113241e81fce01d4a9570da8aceadedc9b88ac6d6fefa90741c097363c140225a7248b8e841969a5be47936d8bc2058c5ccc6f888d06a91cf6bf99ca