From 18b746389f4c84785fdde13f37cfac5e7e4bb4cd Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Tue, 28 May 2019 11:02:02 +0300 Subject: [PATCH] ruby: Rebuild with pdcurses --- mingw-w64-ruby/PKGBUILD | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/mingw-w64-ruby/PKGBUILD b/mingw-w64-ruby/PKGBUILD index 1dcc2d5e32..0969b8654e 100644 --- a/mingw-w64-ruby/PKGBUILD +++ b/mingw-w64-ruby/PKGBUILD @@ -7,7 +7,7 @@ _realname=ruby pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.6.3 -pkgrel=2 +pkgrel=3 pkgdesc="An object-oriented language for quick and easy programming (mingw-w64)" arch=('any') url="https://www.ruby-lang.org/en" @@ -20,7 +20,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-gdbm" "${MINGW_PACKAGE_PREFIX}-libyaml" "${MINGW_PACKAGE_PREFIX}-libffi" - "${MINGW_PACKAGE_PREFIX}-ncurses" + "${MINGW_PACKAGE_PREFIX}-pdcurses" "${MINGW_PACKAGE_PREFIX}-openssl" "${MINGW_PACKAGE_PREFIX}-tk") options=('staticlibs' 'strip') @@ -109,8 +109,9 @@ prepare() { tar -xjf ${srcdir}/${_realname}-${pkgver}.tar.bz2 -C ${srcdir} || true cd ${srcdir}/${_realname}-${pkgver} - apply_patch_with_msg \ - 0001-mingw-w64-time-functions.patch \ + # Pthread disabled in ruby configure for mingw + # 0001-mingw-w64-time-functions.patch + apply_patch_with_msg \ 0003-fix-check-types.patch \ 0005-rbinstall-rake-bash.patch # patch -p1 -i ${srcdir}/0004-rbinstall-destdir.patch @@ -120,9 +121,9 @@ prepare() { build() { local FFI_INC=$(pkg-config --cflags libffi) - CPPFLAGS+=" -DFD_SETSIZE=2048 ${FFI_INC} -I${MINGW_PREFIX}/include/ncurses" - CFLAGS+=" -I${MINGW_PREFIX}/include/ncurses ${FFI_INC}" - CXXFLAGS+=" -I${MINGW_PREFIX}/include/ncurses ${FFI_INC}" + CPPFLAGS+=" -DFD_SETSIZE=2048 ${FFI_INC} -I${MINGW_PREFIX}/include/pdcurses" + CFLAGS+=" -I${MINGW_PREFIX}/include/pdcurses ${FFI_INC}" + CXXFLAGS+=" -I${MINGW_PREFIX}/include/pdcurses ${FFI_INC}" [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"