diff --git a/ruby/2.4.0-cygwin-rubygems.patch b/ruby/2.4.0-cygwin-rubygems.patch index d43e11a4..27ff137d 100644 --- a/ruby/2.4.0-cygwin-rubygems.patch +++ b/ruby/2.4.0-cygwin-rubygems.patch @@ -8,3 +8,14 @@ /djgpp/i, /mingw/i, /mswin/i, +--- src/ruby-3.4.1.orig/.bundle/gems/syslog-0.2.0/ext/syslog/extconf.rb 2024-12-24 23:43:22.000000000 -0800 ++++ src/ruby-3.4.1/.bundle/gems/syslog-0.2.0/ext/syslog/extconf.rb 2025-01-16 13:37:44.696083900 -0800 +@@ -11,7 +11,7 @@ + end + + def windows? +- RbConfig::CONFIG["host_os"] =~ /mswin|mingw|cygwin/ ++ RbConfig::CONFIG["host_os"] =~ /mswin|mingw/ + end + + if windows? diff --git a/ruby/3.4.1-win32-resolv-iphlpapi-header.patch b/ruby/3.4.1-win32-resolv-iphlpapi-header.patch new file mode 100644 index 00000000..cdfc0d4d --- /dev/null +++ b/ruby/3.4.1-win32-resolv-iphlpapi-header.patch @@ -0,0 +1,9 @@ +--- ruby-3.4.1.orig/ext/win32/resolv/extconf.rb 2024-12-24 23:43:20.000000000 -0800 ++++ ruby-3.4.1/ext/win32/resolv/extconf.rb 2025-01-16 21:55:13.492757500 -0800 +@@ -1,5 +1,5 @@ + require 'mkmf' +-if RUBY_ENGINE == "ruby" and have_library('iphlpapi', 'GetNetworkParams') ++if RUBY_ENGINE == "ruby" and have_library('iphlpapi', 'GetNetworkParams', ['windows.h', 'iphlpapi.h']) + create_makefile('win32/resolv') + else + File.write('Makefile', "all clean install:\n\t@echo Done: $(@)\n") diff --git a/ruby/PKGBUILD b/ruby/PKGBUILD index 09bcaaf0..7da6b431 100644 --- a/ruby/PKGBUILD +++ b/ruby/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alexey Pavlov pkgname=('ruby' 'ruby-docs') -pkgver=3.3.7 +pkgver=3.4.1 pkgrel=1 arch=('i686' 'x86_64') url='https://www.ruby-lang.org/en/' @@ -19,15 +19,17 @@ source=(https://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.ta 2.5.0-pkgconfig-version.patch gemrc 2.7.7-msys2.patch - 3.1.3-rmdir-for-force-ln.patch) -sha256sums=('5dbcbc605e0ed4b09c52703241577eb7edc3a2dc747e184c72b5285719b6ad72' + 3.1.3-rmdir-for-force-ln.patch + 3.4.1-win32-resolv-iphlpapi-header.patch) +sha256sums=('018d59ffb52be3c0a6d847e22d3fd7a2c52d0ddfee249d3517a0c8c6dbfa70af' '14bc6cb41d610d820a327bb9eeffb8c320f90dda1fdee1449a1b999de09dd1c9' - '01a59cbfffa98eeca6b66f2f179474793dbb6ec32063d717a24e5ca03f28d767' + 'f1a084325c16fa045769d4b2c792052e9d377cb4d98bacf08c45eacd835d7b13' '5fffe4fa469721bfe271650dae142c5a0274c22705e4be01541371d74a5de23d' 'ee88cfec3610b21908a8c0725b43b4d1157ec394179489dd9c86309b1f663e4b' '4bb7eb2fe66e396ed16b589cdb656831407b39ad4e138d88536754c0448ac614' 'a4ec80d3da58969068112a26cc2a40eee0c6052ac61d789a84b6e5d74ef9246a' - 'd37409413b40e560a9d0e8977e711a6f47e7e92ef8dea8b85dee7e7784a47524') + 'd37409413b40e560a9d0e8977e711a6f47e7e92ef8dea8b85dee7e7784a47524' + 'd9494f491b031992d65eee7cfd78635882d56da602516654b3a77cf3dc19fe96') noextract=(ruby-${pkgver}.tar.xz) # Helper macros to help make tasks easier # @@ -66,6 +68,7 @@ prepare() { # the script assumes that symlinks are files, but we deepcopy apply_patch_with_msg 3.1.3-rmdir-for-force-ln.patch + apply_patch_with_msg 3.4.1-win32-resolv-iphlpapi-header.patch autoreconf -fi }