diff --git a/mingw-w64-ncurses/001-use-libsystre.patch b/mingw-w64-ncurses/001-use-libsystre.patch index 9acec64740..7ffaf415ca 100644 --- a/mingw-w64-ncurses/001-use-libsystre.patch +++ b/mingw-w64-ncurses/001-use-libsystre.patch @@ -1,14 +1,14 @@ ---- ncurses-5.9-20150321/configure.orig 2015-03-24 11:53:12.221966500 +0200 -+++ ncurses-5.9-20150321/configure 2015-03-24 11:53:18.504338200 +0200 -@@ -14915,6 +14915,11 @@ +--- ncurses-6.2/configure.orig 2020-02-17 11:53:12.221966500 +0200 ++++ ncurses-6.2/configure 2020-02-17 11:53:18.504338200 +0200 +@@ -17808,6 +17808,11 @@ if test `eval echo '${'$as_ac_Lib'}'` = yes; then - cf_add_libs="-l$cf_regex_lib" + cf_add_libs="$LIBS" +case $host_os in #(vi +mingw*) + cf_add_libs="$cf_add_libs -ltre -lintl -liconv" + ;; +esac - # Filter out duplicates - this happens with badly-designed ".pc" files... - for cf_add_1lib in $LIBS - do + # reverse order + cf_add_0lib= + for cf_add_1lib in -l$cf_regex_lib; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done diff --git a/mingw-w64-ncurses/PKGBUILD b/mingw-w64-ncurses/PKGBUILD index 983c082f7a..e493c7ccf7 100644 --- a/mingw-w64-ncurses/PKGBUILD +++ b/mingw-w64-ncurses/PKGBUILD @@ -3,9 +3,10 @@ _realname=ncurses pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -_base_ver=6.1 -_date_rev=20190630 -pkgver=${_base_ver}.${_date_rev} +#_base_ver=6.1 +#_date_rev=20190630 +#pkgver=${_base_ver}.${_date_rev} +pkgver=6.2 pkgrel=1 pkgdesc="System V Release 4.0 curses emulation library (mingw-w64)" arch=('any') @@ -14,13 +15,15 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") url="https://www.gnu.org/software/ncurses/" license=('MIT') options=('staticlibs' 'strip') -source=("${_realname}-${pkgver}.tar.gz"::"https://invisible-mirror.net/archives/ncurses/current/${_realname}-${_base_ver}-${_date_rev}.tgz" +source=(#"${_realname}-${pkgver}.tar.gz"::"https://invisible-mirror.net/archives/ncurses/current/${_realname}-${_base_ver}-${_date_rev}.tgz" + https://ftp.gnu.org/pub/gnu/ncurses/ncurses-${pkgver}.tar.gz{,.sig} 001-use-libsystre.patch) -sha256sums=('79b54f774ab8f8611d412437a8beb1dd79179861570e96145a97904a1df98d42' - 'eb28949297a4c1eda67da49cfbed1d60f181b83101a0b3715552a4564bd90ff3') +sha256sums=('30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227f7da5b71cbea86c9d' + 'SKIP' + 'd8fb37262372f3e5c9a553bdeff07c8b874bac6f3c416e2a372877cef0af1925') prepare() { - cd ${_realname}-${_base_ver}-${_date_rev} + cd ${_realname}-${pkgver} patch -p1 -i ${srcdir}/001-use-libsystre.patch } @@ -28,7 +31,7 @@ build() { [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST} mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST} - ../${_realname}-${_base_ver}-${_date_rev}/configure \ + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --mandir=${MINGW_PREFIX}/share/man \ --build=${MINGW_CHOST} \