From 6e15c8070ede2f329882e1fc69830a2831e1e287 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 3 Apr 2022 19:47:41 +0200 Subject: [PATCH 1/3] readline: drop install script handled by a hook now --- readline/PKGBUILD | 3 +-- readline/readline.install | 17 ----------------- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 readline/readline.install diff --git a/readline/PKGBUILD b/readline/PKGBUILD index 8ceb91a5..f1fa9a73 100644 --- a/readline/PKGBUILD +++ b/readline/PKGBUILD @@ -5,7 +5,7 @@ pkgname=('libreadline' 'libreadline-devel') _basever=8.1 _patchlevel=001 #prepare for some patches pkgver=${_basever}.${_patchlevel} -pkgrel=1 +pkgrel=2 pkgdesc="GNU readline library" arch=('i686' 'x86_64') url="https://tiswww.case.edu/php/chet/readline/rltop.html" @@ -65,7 +65,6 @@ build() { package_libreadline() { depends=('ncurses') groups=('libraries') - install=readline.install mkdir -p ${pkgdir}/usr cp -rf ${srcdir}/dest/usr/bin ${pkgdir}/usr/ diff --git a/readline/readline.install b/readline/readline.install deleted file mode 100644 index 1e6a6852..00000000 --- a/readline/readline.install +++ /dev/null @@ -1,17 +0,0 @@ -infodir=usr/share/info -filelist="history.info readline.info rluserman.info" - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - From 81c94d6a0812cc6ed7e5615df7a14a82d612276b Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 3 Apr 2022 19:59:58 +0200 Subject: [PATCH 2/3] readline: drop msysize patch --- readline/PKGBUILD | 10 ++- readline/readline-6.3-msys2.patch | 143 +++--------------------------- 2 files changed, 20 insertions(+), 133 deletions(-) diff --git a/readline/PKGBUILD b/readline/PKGBUILD index f1fa9a73..4fad017c 100644 --- a/readline/PKGBUILD +++ b/readline/PKGBUILD @@ -5,7 +5,7 @@ pkgname=('libreadline' 'libreadline-devel') _basever=8.1 _patchlevel=001 #prepare for some patches pkgver=${_basever}.${_patchlevel} -pkgrel=2 +pkgrel=3 pkgdesc="GNU readline library" arch=('i686' 'x86_64') url="https://tiswww.case.edu/php/chet/readline/rltop.html" @@ -27,7 +27,7 @@ sha256sums=('f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02' 'SKIP' '2fd3b112ad7cb16258efe960e59fdb1252d7a18397d45273c05ad2d216a63cf7' 'cdb4f97d641acde59ada6f22141e6a6743f756fc183f5cb43d6c9f8ae563da29' - '05c08602b5aacd937a2237720f5974836a0c40e77da8451866bff2885d70637f' + '96d002c8815b29ed5dbe89d9b251182c6e60111acc3d236acb8d1bbb2f896457' '8ce80150b6da67c551ffebb18650cfceef8d5e0eddbc848bcef20b8ec176af05' '682a465a68633650565c43d59f0b8cdf149c13a874682d3c20cb4af6709b9144' 'SKIP') @@ -51,10 +51,12 @@ build() { # Remove RPATH from shared objects (FS#14366) sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf + local CYGWIN_CHOST="$(echo "${CHOST}" | sed 's|-msys$|-cygwin|')" + ./configure \ --prefix=/usr \ - --build=${CHOST} \ - --host=${CHOST} \ + --build=${CYGWIN_CHOST} \ + --host=${CYGWIN_CHOST} \ --with-curses \ bash_cv_termcap_lib=libncurses make VERBOSE=1 diff --git a/readline/readline-6.3-msys2.patch b/readline/readline-6.3-msys2.patch index 16775908..876bf766 100644 --- a/readline/readline-6.3-msys2.patch +++ b/readline/readline-6.3-msys2.patch @@ -1,137 +1,22 @@ -diff -Naur readline-6.3-orig/configure readline-6.3/configure ---- readline-6.3-orig/configure 2013-03-13 18:14:53.000000000 +0400 -+++ readline-6.3/configure 2014-02-28 06:55:23.119200000 +0400 -@@ -2404,7 +2404,7 @@ - CROSS_COMPILE= - if test "x$cross_compiling" = "xyes"; then - case "${host}" in -- *-cygwin*) -+ *-cygwin* | *-msys*) - cross_cache=${srcdir}/cross-build/cygwin.cache - ;; - *-mingw*) -diff -Naur readline-6.3-orig/configure.ac readline-6.3/configure.ac ---- readline-6.3-orig/configure.ac 2014-02-12 02:12:39.000000000 +0400 -+++ readline-6.3/configure.ac 2014-02-28 06:55:23.493600000 +0400 +--- readline-8.1/support/shobj-conf.orig 2022-04-03 19:55:30.572733400 +0200 ++++ readline-8.1/support/shobj-conf 2022-04-03 19:56:53.391583400 +0200 +@@ -479,7 +479,7 @@ + cygwin*) + SHOBJ_LD='$(CC)' + SHOBJ_LDFLAGS='-shared -Wl,--enable-auto-import -Wl,--enable-auto-image-base -Wl,--export-all -Wl,--out-implib=$(@).a' +- SHLIB_LIBPREF='cyg' ++ SHLIB_LIBPREF='msys-' + SHLIB_LIBSUFF='dll' + SHLIB_LIBVERSION='$(SHLIB_DLLVERSION).$(SHLIB_LIBSUFF)' + SHLIB_LIBS='$(TERMCAP_LIB)' +--- readline-8.1/support/shlib-install.orig 2019-12-13 15:46:13.000000000 +0100 ++++ readline-8.1/support/shlib-install 2022-04-03 20:13:03.666999100 +0200 @@ -77,7 +77,7 @@ - CROSS_COMPILE= - if test "x$cross_compiling" = "xyes"; then - case "${host}" in -- *-cygwin*) -+ *-cygwin* | *-msys*) - cross_cache=${srcdir}/cross-build/cygwin.cache - ;; - *-mingw*) -diff -Naur readline-6.3-orig/support/config.guess readline-6.3/support/config.guess ---- readline-6.3-orig/support/config.guess 2013-12-17 01:02:33.000000000 +0400 -+++ readline-6.3/support/config.guess 2014-02-28 06:55:23.493600000 +0400 -@@ -866,6 +866,9 @@ - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; -+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*) -+ echo x86_64-unknown-msys -+ exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; -diff -Naur readline-6.3-orig/support/config.rpath readline-6.3/support/config.rpath ---- readline-6.3-orig/support/config.rpath 2008-08-20 17:21:09.000000000 +0400 -+++ readline-6.3/support/config.rpath 2014-02-28 06:55:23.493600000 +0400 -@@ -57,7 +57,7 @@ - aix*) - wl='-Wl,' - ;; -- mingw* | cygwin* | pw32* | os2* | cegcc*) -+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) - ;; - hpux9* | hpux10* | hpux11*) - wl='-Wl,' -@@ -149,7 +149,7 @@ - hardcode_minus_L=no - - case "$host_os" in -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. -@@ -198,7 +198,7 @@ - ld_shlibs=no - fi - ;; -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' -@@ -348,7 +348,7 @@ - ;; - bsdi[45]*) - ;; -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is -@@ -533,7 +533,7 @@ - bsdi[45]*) - library_names_spec='$libname$shrext' - ;; -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - shrext=.dll - library_names_spec='$libname.dll.a $libname.lib' - ;; -diff -Naur readline-6.3-orig/support/shlib-install readline-6.3/support/shlib-install ---- readline-6.3-orig/support/shlib-install 2012-07-10 23:58:08.000000000 +0400 -+++ readline-6.3/support/shlib-install 2014-02-28 06:55:23.509200000 +0400 -@@ -75,9 +75,9 @@ - if [ -z "$uninstall" ]; then - chmod 555 ${INSTALLDIR}/${LIBNAME} fi ;; --cygwin*|mingw*) -+cygwin*|msys*|mingw*) + cygwin*|mingw*) IMPLIBNAME=`echo ${LIBNAME} \ - | sed -e 's,^cyg,lib,' -e 's,[0-9]*.dll$,.dll.a,'` + | sed -e 's,^msys-,lib,' -e 's,[0-9]*.dll$,.dll.a,'` if [ -z "$uninstall" ]; then ${echo} $RM ${BINDIR}/${LIBNAME}.${OLDSUFF} if [ -f "$BINDIR/$LIBNAME" ]; then -@@ -194,7 +194,7 @@ - fi - ;; - --cygwin*|mingw*) -+cygwin*|msys*|mingw*) - # Links to .dlls don't work. Hence shobj-conf used DLLVERSION.dll - # instead of so.SHLIB_MAJOR.SHLIB_MINOR. The postinstall above - # took care of everything else. -diff -Naur readline-6.3-orig/support/shobj-conf readline-6.3/support/shobj-conf ---- readline-6.3-orig/support/shobj-conf 2014-02-24 06:06:29.000000000 +0400 -+++ readline-6.3/support/shobj-conf 2014-02-28 06:55:23.509200000 +0400 -@@ -535,6 +535,24 @@ - fi - ;; - -+msys*) -+ SHOBJ_LD='$(CC)' -+ SHOBJ_LDFLAGS='-shared -Wl,--enable-auto-import -Wl,--enable-auto-image-base -Wl,--export-all -Wl,--out-implib=$(@).a' -+ SHLIB_LIBPREF='msys-' -+ SHLIB_LIBSUFF='dll' -+ SHLIB_LIBVERSION='$(SHLIB_DLLVERSION).$(SHLIB_LIBSUFF)' -+ SHLIB_LIBS='$(TERMCAP_LIB)' -+ -+ SHLIB_DOT= -+ # For official cygwin releases, DLLVERSION will be defined in the -+ # environment of configure, and will be incremented any time the API -+ # changes in a non-backwards compatible manner. Otherwise, it is just -+ # SHLIB_MAJOR. -+ if [ -n "$DLLVERSION" ] ; then -+ SHLIB_DLLVERSION="$DLLVERSION" -+ fi -+ ;; -+ - mingw*) - SHOBJ_LD='$(CC)' - SHOBJ_LDFLAGS='-shared -Wl,--enable-auto-import -Wl,--enable-auto-image-base -Wl,--export-all -Wl,--out-implib=$(@).a' From da405dbd4c7349907249655fb3f1b79f3198831f Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 3 Apr 2022 20:17:03 +0200 Subject: [PATCH 3/3] readline: update to 8.1.002 --- readline/PKGBUILD | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/readline/PKGBUILD b/readline/PKGBUILD index 4fad017c..dc8e21dc 100644 --- a/readline/PKGBUILD +++ b/readline/PKGBUILD @@ -3,9 +3,9 @@ pkgbase=readline pkgname=('libreadline' 'libreadline-devel') _basever=8.1 -_patchlevel=001 #prepare for some patches +_patchlevel=002 #prepare for some patches pkgver=${_basever}.${_patchlevel} -pkgrel=3 +pkgrel=1 pkgdesc="GNU readline library" arch=('i686' 'x86_64') url="https://tiswww.case.edu/php/chet/readline/rltop.html" @@ -30,6 +30,8 @@ sha256sums=('f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02' '96d002c8815b29ed5dbe89d9b251182c6e60111acc3d236acb8d1bbb2f896457' '8ce80150b6da67c551ffebb18650cfceef8d5e0eddbc848bcef20b8ec176af05' '682a465a68633650565c43d59f0b8cdf149c13a874682d3c20cb4af6709b9144' + 'SKIP' + 'e55be055a68cb0719b0ccb5edc9a74edcc1d1f689e8a501525b3bc5ebad325dc' 'SKIP') validpgpkeys=('7C0135FB088AAF6C66C650B9BB5869F064EA74AB') # Chet Ramey