diff --git a/mingw-w64-ruby/0002-use-gnu-printf.patch b/mingw-w64-ruby/0002-use-gnu-printf.patch deleted file mode 100644 index f09b12f3f0..0000000000 --- a/mingw-w64-ruby/0002-use-gnu-printf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ruby-2.5.0/configure.ac.orig 2015-12-23 14:29:36.000000000 +0900 -+++ ruby-2.5.0/configure.ac 2016-02-13 19:58:24.567691100 +0900 -@@ -1550,7 +1550,7 @@ - @%:@include - @%:@ifdef __GNUC__ - @%:@define PRINTF_ARGS(decl, string_index, first_to_check) \ -- decl __attribute__((format(printf, string_index, first_to_check))) -+ decl __attribute__((format(gnu_printf, string_index, first_to_check))) - @%:@else - @%:@define PRINTF_ARGS(decl, string_index, first_to_check) decl - @%:@endif diff --git a/mingw-w64-ruby/PKGBUILD b/mingw-w64-ruby/PKGBUILD index 532ba384af..469416bcc0 100644 --- a/mingw-w64-ruby/PKGBUILD +++ b/mingw-w64-ruby/PKGBUILD @@ -6,8 +6,8 @@ _realname=ruby pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=2.5.3 -pkgrel=2 +pkgver=2.6.0 +pkgrel=1 pkgdesc="An object-oriented language for quick and easy programming (mingw-w64)" arch=('any') url="https://www.ruby-lang.org/en" @@ -26,14 +26,11 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" options=('staticlibs' 'strip') source=("https://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/${_realname}-${pkgver}.tar.bz2" 0001-mingw-w64-time-functions.patch - 0002-use-gnu-printf.patch 0003-fix-check-types.patch 0004-rbinstall-destdir.patch - 0005-rbinstall-rake-bash.patch - ) -sha256sums=('228a787ba68a7b20ac6e1d5af3d176d36e8ed600eb754d6325da341c3088ed76' + 0005-rbinstall-rake-bash.patch) +sha256sums=('c89ca663ad9a6238f4b1ec4d04c7dff630560c6e6eca6d30857c4d394f01a599' '329994d3bf7e692e18c1faffbedfbd076e5d00257b2100387a773b59b81ccd4e' - '6e65ea1b039041720dd5d3742fd7f713569f9d4ac213ec2ecde3c31cfcdee2a1' 'cbb083aece8e284fb1ae625e689f044a608aa9750bba9f7d399e895547eee39b' '02382ec3b9e42d7dbb58edad3e41c361d98871711bb2f0320082c2acc6a82e2e' '9fb5acb995255eedde0f0b0bf5cf2c02f00dc088d2538ff9ebb69627aafd1e42') @@ -65,7 +62,6 @@ prepare() { cd ${srcdir}/${_realname}-${pkgver} apply_patch_with_msg \ 0001-mingw-w64-time-functions.patch \ - 0002-use-gnu-printf.patch \ 0003-fix-check-types.patch \ 0005-rbinstall-rake-bash.patch # patch -p1 -i ${srcdir}/0004-rbinstall-destdir.patch