Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

ruby: update to 3.4.1

Browse Source
This commit is contained in:
Jeremy Drake
2025-01-16 11:31:48 -08:00
committed by Christoph Reiter
parent b2018294db
commit 96a2376d0d
4 changed files with 76 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mingw-w64-ruby/0003-fix-check-types.patch
View File

@@ -1,12 +0,0 @@
--- ruby-2.5.0/configure.ac.orig 2016-02-13 19:58:24.531685400 +0900
+++ ruby-2.5.0/configure.ac 2016-02-13 19:58:24.567691100 +0900
@@ -1115,7 +1115,8 @@
rb_cv_negative_time_t=yes
AC_CHECK_TYPE([NET_LUID], [], [],
[@%:@include <winsock2.h>
- @%:@include <iphlpapi.h>])
+ @%:@include <windows.h>
+ @%:@include <iphlpapi.h>])
AS_IF([test x"$ac_cv_type_NET_LUID" = xyes], [
AC_DEFINE(HAVE_TYPE_NET_LUID, 1)
])

27
mingw-w64-ruby/0008-ucrt-32-win11-insns.patch
View File

@@ -1,27 +0,0 @@
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -2699,15 +2699,21 @@
# else /* x86 */
/* pop ebp */
# define FUNCTION_BEFORE_RET_MARK "\x5d"
+ /* leave */
+# define FUNCTION_BEFORE_RET_MARK_2 "\xc9"
# define FUNCTION_SKIP_BYTES 0
/* mov eax,dword ptr [eax*4+100EB430h] */
# define PIOINFO_MARK "\x8B\x04\x85"
# endif
if (p) {
- for (pend += 10; pend < p + 300; pend++) {
+ for (pend += 10; pend < p + 500; pend++) {
// find end of function
- if (memcmp(pend, FUNCTION_BEFORE_RET_MARK, sizeof(FUNCTION_BEFORE_RET_MARK) - 1) == 0 &&
- (*(pend + (sizeof(FUNCTION_BEFORE_RET_MARK) - 1) + FUNCTION_SKIP_BYTES) & FUNCTION_RET) == FUNCTION_RET) {
+ if ((memcmp(pend, FUNCTION_BEFORE_RET_MARK, sizeof(FUNCTION_BEFORE_RET_MARK) - 1) == 0
+# ifdef FUNCTION_BEFORE_RET_MARK_2
+ || memcmp(pend, FUNCTION_BEFORE_RET_MARK_2, sizeof(FUNCTION_BEFORE_RET_MARK_2) - 1) == 0
+# endif
+ ) &&
+ *(pend + (sizeof(FUNCTION_BEFORE_RET_MARK) - 1) + FUNCTION_SKIP_BYTES) == (char)FUNCTION_RET) {
// search backwards from end of function
for (pend -= (sizeof(PIOINFO_MARK) - 1); pend > p; pend--) {
if (memcmp(pend, PIOINFO_MARK, sizeof(PIOINFO_MARK) - 1) == 0) {

28
mingw-w64-ruby/0010-configure-fixes.patch
View File

@@ -1,28 +0,0 @@
--- a/configure.ac
+++ b/configure.ac
@@ -1361,7 +1361,7 @@
AC_CHECK_HEADERS(sys/event.h)
AC_CHECK_HEADERS(stdatomic.h)
-AS_CASE("$target_cpu", [x64|x86_64|i[3-6]86*], [
+AS_CASE("$target_cpu", [x64|x86_64|[i[3-6]86*]], [
AC_CHECK_HEADERS(x86intrin.h)
])
RUBY_UNIVERSAL_CHECK_HEADER([x86_64, i386], x86intrin.h)
@@ -3499,7 +3499,7 @@
],
[mingw*], [
RUBY_SO_NAME="${rb_cv_msvcrt}"'-$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0'
- AS_IF([test x"${target_cpu}" != xi386], [
+ AS_IF([test x"${target_cpu}" != xi386 || test x"${rb_cv_msvcrt}" != xmsvcrt], [
RUBY_SO_NAME="${target_cpu}-${RUBY_SO_NAME}"
])
],
@@ -4070,6 +4070,7 @@
[mingw*], [
AS_IF([test x"$enable_shared" = xyes], [
LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
+ LIBRUBY_SONAME=''
LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'
])
EXPORT_PREFIX=' '

161
mingw-w64-ruby/PKGBUILD
View File

@@ -6,7 +6,7 @@
_realname=ruby
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=3.3.6
pkgver=3.4.1
pkgrel=1
pkgdesc="An object-oriented language for quick and easy programming (mingw-w64)"
arch=('any')
@@ -30,105 +30,101 @@ depends=("${MINGW_PACKAGE_PREFIX}-gdbm"
"${MINGW_PACKAGE_PREFIX}-readline"
"${MINGW_PACKAGE_PREFIX}-tk"
"${MINGW_PACKAGE_PREFIX}-zlib")
source=("https://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/${_realname}-${pkgver}.tar.gz"
0003-fix-check-types.patch
0008-ucrt-32-win11-insns.patch
0010-configure-fixes.patch)
source=("https://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/${_realname}-${pkgver}.tar.gz")
## Populated by the updpkgprovs script
provides=(
"${MINGW_PACKAGE_PREFIX}-ruby-debug=1.9.2"
"${MINGW_PACKAGE_PREFIX}-ruby-matrix=0.4.2"
"${MINGW_PACKAGE_PREFIX}-ruby-minitest=5.20.0"
"${MINGW_PACKAGE_PREFIX}-ruby-net-ftp=0.3.4"
"${MINGW_PACKAGE_PREFIX}-ruby-net-imap=0.4.9.1"
"${MINGW_PACKAGE_PREFIX}-ruby-net-pop=0.1.2"
"${MINGW_PACKAGE_PREFIX}-ruby-net-smtp=0.4.0.1"
"${MINGW_PACKAGE_PREFIX}-ruby-power_assert=2.0.3"
"${MINGW_PACKAGE_PREFIX}-ruby-prime=0.1.2"
"${MINGW_PACKAGE_PREFIX}-ruby-racc=1.7.3"
"${MINGW_PACKAGE_PREFIX}-ruby-rake=13.1.0"
"${MINGW_PACKAGE_PREFIX}-ruby-rbs=3.4.0"
"${MINGW_PACKAGE_PREFIX}-ruby-rexml=3.3.9"
"${MINGW_PACKAGE_PREFIX}-ruby-rss=0.3.1"
"${MINGW_PACKAGE_PREFIX}-ruby-test-unit=3.6.1"
"${MINGW_PACKAGE_PREFIX}-ruby-typeprof=0.21.9"
"${MINGW_PACKAGE_PREFIX}-ruby-abbrev=0.1.2"
"${MINGW_PACKAGE_PREFIX}-ruby-base64=0.2.0"
"${MINGW_PACKAGE_PREFIX}-ruby-benchmark=0.3.0"
"${MINGW_PACKAGE_PREFIX}-ruby-bigdecimal=3.1.5"
"${MINGW_PACKAGE_PREFIX}-ruby-bundler=2.5.22"
"${MINGW_PACKAGE_PREFIX}-ruby-bigdecimal=3.1.8"
"${MINGW_PACKAGE_PREFIX}-ruby-csv=3.3.2"
"${MINGW_PACKAGE_PREFIX}-ruby-debug=1.10.0"
"${MINGW_PACKAGE_PREFIX}-ruby-drb=2.2.1"
"${MINGW_PACKAGE_PREFIX}-ruby-getoptlong=0.2.1"
"${MINGW_PACKAGE_PREFIX}-ruby-matrix=0.4.2"
"${MINGW_PACKAGE_PREFIX}-ruby-minitest=5.25.4"
"${MINGW_PACKAGE_PREFIX}-ruby-mutex_m=0.3.0"
"${MINGW_PACKAGE_PREFIX}-ruby-net-ftp=0.3.8"
"${MINGW_PACKAGE_PREFIX}-ruby-net-imap=0.5.4"
"${MINGW_PACKAGE_PREFIX}-ruby-net-pop=0.1.2"
"${MINGW_PACKAGE_PREFIX}-ruby-net-smtp=0.5.0"
"${MINGW_PACKAGE_PREFIX}-ruby-nkf=0.2.0"
"${MINGW_PACKAGE_PREFIX}-ruby-observer=0.1.2"
"${MINGW_PACKAGE_PREFIX}-ruby-power_assert=2.0.5"
"${MINGW_PACKAGE_PREFIX}-ruby-prime=0.1.3"
"${MINGW_PACKAGE_PREFIX}-ruby-racc=1.8.1"
"${MINGW_PACKAGE_PREFIX}-ruby-rake=13.2.1"
"${MINGW_PACKAGE_PREFIX}-ruby-rbs=3.8.0"
"${MINGW_PACKAGE_PREFIX}-ruby-repl_type_completor=0.1.9"
"${MINGW_PACKAGE_PREFIX}-ruby-resolv-replace=0.1.1"
"${MINGW_PACKAGE_PREFIX}-ruby-rexml=3.4.0"
"${MINGW_PACKAGE_PREFIX}-ruby-rinda=0.2.0"
"${MINGW_PACKAGE_PREFIX}-ruby-rss=0.3.1"
"${MINGW_PACKAGE_PREFIX}-ruby-test-unit=3.6.7"
"${MINGW_PACKAGE_PREFIX}-ruby-typeprof=0.30.1"
"${MINGW_PACKAGE_PREFIX}-ruby-benchmark=0.4.0"
"${MINGW_PACKAGE_PREFIX}-ruby-bundler=2.6.2"
"${MINGW_PACKAGE_PREFIX}-ruby-cgi=0.4.1"
"${MINGW_PACKAGE_PREFIX}-ruby-csv=3.2.8"
"${MINGW_PACKAGE_PREFIX}-ruby-date=3.3.4"
"${MINGW_PACKAGE_PREFIX}-ruby-delegate=0.3.1"
"${MINGW_PACKAGE_PREFIX}-ruby-did_you_mean=1.6.3"
"${MINGW_PACKAGE_PREFIX}-ruby-digest=3.1.1"
"${MINGW_PACKAGE_PREFIX}-ruby-drb=2.2.0"
"${MINGW_PACKAGE_PREFIX}-ruby-date=3.4.1"
"${MINGW_PACKAGE_PREFIX}-ruby-delegate=0.4.0"
"${MINGW_PACKAGE_PREFIX}-ruby-did_you_mean=2.0.0"
"${MINGW_PACKAGE_PREFIX}-ruby-digest=3.2.0"
"${MINGW_PACKAGE_PREFIX}-ruby-english=0.8.0"
"${MINGW_PACKAGE_PREFIX}-ruby-erb=4.0.3"
"${MINGW_PACKAGE_PREFIX}-ruby-error_highlight=0.6.0"
"${MINGW_PACKAGE_PREFIX}-ruby-etc=1.4.3"
"${MINGW_PACKAGE_PREFIX}-ruby-fcntl=1.1.0"
"${MINGW_PACKAGE_PREFIX}-ruby-fiddle=1.1.2"
"${MINGW_PACKAGE_PREFIX}-ruby-fileutils=1.7.2"
"${MINGW_PACKAGE_PREFIX}-ruby-erb=4.0.4"
"${MINGW_PACKAGE_PREFIX}-ruby-error_highlight=0.7.0"
"${MINGW_PACKAGE_PREFIX}-ruby-etc=1.4.5"
"${MINGW_PACKAGE_PREFIX}-ruby-fcntl=1.2.0"
"${MINGW_PACKAGE_PREFIX}-ruby-fiddle=1.1.6"
"${MINGW_PACKAGE_PREFIX}-ruby-fileutils=1.7.3"
"${MINGW_PACKAGE_PREFIX}-ruby-find=0.2.0"
"${MINGW_PACKAGE_PREFIX}-ruby-forwardable=1.3.3"
"${MINGW_PACKAGE_PREFIX}-ruby-getoptlong=0.2.1"
"${MINGW_PACKAGE_PREFIX}-ruby-io-console=0.7.1"
"${MINGW_PACKAGE_PREFIX}-ruby-io-nonblock=0.3.0"
"${MINGW_PACKAGE_PREFIX}-ruby-io-console=0.8.0"
"${MINGW_PACKAGE_PREFIX}-ruby-io-nonblock=0.3.1"
"${MINGW_PACKAGE_PREFIX}-ruby-io-wait=0.3.1"
"${MINGW_PACKAGE_PREFIX}-ruby-ipaddr=1.2.6"
"${MINGW_PACKAGE_PREFIX}-ruby-irb=1.13.1"
"${MINGW_PACKAGE_PREFIX}-ruby-json=2.7.2"
"${MINGW_PACKAGE_PREFIX}-ruby-logger=1.6.0"
"${MINGW_PACKAGE_PREFIX}-ruby-mutex_m=0.2.0"
"${MINGW_PACKAGE_PREFIX}-ruby-net-http=0.4.1"
"${MINGW_PACKAGE_PREFIX}-ruby-ipaddr=1.2.7"
"${MINGW_PACKAGE_PREFIX}-ruby-irb=1.14.3"
"${MINGW_PACKAGE_PREFIX}-ruby-json=2.9.1"
"${MINGW_PACKAGE_PREFIX}-ruby-logger=1.6.4"
"${MINGW_PACKAGE_PREFIX}-ruby-net-http=0.6.0"
"${MINGW_PACKAGE_PREFIX}-ruby-net-protocol=0.2.2"
"${MINGW_PACKAGE_PREFIX}-ruby-nkf=0.1.3"
"${MINGW_PACKAGE_PREFIX}-ruby-observer=0.1.2"
"${MINGW_PACKAGE_PREFIX}-ruby-open-uri=0.4.1"
"${MINGW_PACKAGE_PREFIX}-ruby-open3=0.2.1"
"${MINGW_PACKAGE_PREFIX}-ruby-openssl=3.2.0"
"${MINGW_PACKAGE_PREFIX}-ruby-optparse=0.4.0"
"${MINGW_PACKAGE_PREFIX}-ruby-ostruct=0.6.0"
"${MINGW_PACKAGE_PREFIX}-ruby-pathname=0.3.0"
"${MINGW_PACKAGE_PREFIX}-ruby-pp=0.5.0"
"${MINGW_PACKAGE_PREFIX}-ruby-openssl=3.3.0"
"${MINGW_PACKAGE_PREFIX}-ruby-open-uri=0.5.0"
"${MINGW_PACKAGE_PREFIX}-ruby-optparse=0.6.0"
"${MINGW_PACKAGE_PREFIX}-ruby-ostruct=0.6.1"
"${MINGW_PACKAGE_PREFIX}-ruby-pathname=0.4.0"
"${MINGW_PACKAGE_PREFIX}-ruby-pp=0.6.2"
"${MINGW_PACKAGE_PREFIX}-ruby-prettyprint=0.2.0"
"${MINGW_PACKAGE_PREFIX}-ruby-prism=0.19.0"
"${MINGW_PACKAGE_PREFIX}-ruby-pstore=0.1.3"
"${MINGW_PACKAGE_PREFIX}-ruby-psych=5.1.2"
"${MINGW_PACKAGE_PREFIX}-ruby-rdoc=6.6.3.1"
"${MINGW_PACKAGE_PREFIX}-ruby-prism=1.2.0"
"${MINGW_PACKAGE_PREFIX}-ruby-pstore=0.1.4"
"${MINGW_PACKAGE_PREFIX}-ruby-psych=5.2.2"
"${MINGW_PACKAGE_PREFIX}-ruby-rdoc=6.10.0"
"${MINGW_PACKAGE_PREFIX}-ruby-readline=0.0.4"
"${MINGW_PACKAGE_PREFIX}-ruby-reline=0.5.10"
"${MINGW_PACKAGE_PREFIX}-ruby-resolv=0.3.0"
"${MINGW_PACKAGE_PREFIX}-ruby-resolv-replace=0.1.1"
"${MINGW_PACKAGE_PREFIX}-ruby-rinda=0.2.0"
"${MINGW_PACKAGE_PREFIX}-ruby-reline=0.6.0"
"${MINGW_PACKAGE_PREFIX}-ruby-resolv=0.6.0"
"${MINGW_PACKAGE_PREFIX}-ruby-ruby2_keywords=0.0.5"
"${MINGW_PACKAGE_PREFIX}-ruby-securerandom=0.3.1"
"${MINGW_PACKAGE_PREFIX}-ruby-set=1.1.0"
"${MINGW_PACKAGE_PREFIX}-ruby-shellwords=0.2.0"
"${MINGW_PACKAGE_PREFIX}-ruby-singleton=0.2.0"
"${MINGW_PACKAGE_PREFIX}-ruby-stringio=3.1.1"
"${MINGW_PACKAGE_PREFIX}-ruby-strscan=3.0.9"
"${MINGW_PACKAGE_PREFIX}-ruby-syntax_suggest=2.0.1"
"${MINGW_PACKAGE_PREFIX}-ruby-tempfile=0.2.1"
"${MINGW_PACKAGE_PREFIX}-ruby-time=0.3.0"
"${MINGW_PACKAGE_PREFIX}-ruby-timeout=0.4.1"
"${MINGW_PACKAGE_PREFIX}-ruby-tmpdir=0.2.0"
"${MINGW_PACKAGE_PREFIX}-ruby-securerandom=0.4.1"
"${MINGW_PACKAGE_PREFIX}-ruby-set=1.1.1"
"${MINGW_PACKAGE_PREFIX}-ruby-shellwords=0.2.2"
"${MINGW_PACKAGE_PREFIX}-ruby-singleton=0.3.0"
"${MINGW_PACKAGE_PREFIX}-ruby-stringio=3.1.2"
"${MINGW_PACKAGE_PREFIX}-ruby-strscan=3.1.2"
"${MINGW_PACKAGE_PREFIX}-ruby-syntax_suggest=2.0.2"
"${MINGW_PACKAGE_PREFIX}-ruby-tempfile=0.3.1"
"${MINGW_PACKAGE_PREFIX}-ruby-time=0.4.1"
"${MINGW_PACKAGE_PREFIX}-ruby-timeout=0.4.3"
"${MINGW_PACKAGE_PREFIX}-ruby-tmpdir=0.3.1"
"${MINGW_PACKAGE_PREFIX}-ruby-tsort=0.2.0"
"${MINGW_PACKAGE_PREFIX}-ruby-un=0.3.0"
"${MINGW_PACKAGE_PREFIX}-ruby-uri=0.13.1"
"${MINGW_PACKAGE_PREFIX}-ruby-uri=1.0.2"
"${MINGW_PACKAGE_PREFIX}-ruby-weakref=0.1.3"
"${MINGW_PACKAGE_PREFIX}-ruby-win32ole=1.8.10"
"${MINGW_PACKAGE_PREFIX}-ruby-yaml=0.3.0"
"${MINGW_PACKAGE_PREFIX}-ruby-zlib=3.1.1"
"${MINGW_PACKAGE_PREFIX}-ruby-win32ole=1.9.1"
"${MINGW_PACKAGE_PREFIX}-ruby-win32-registry=0.1.0"
"${MINGW_PACKAGE_PREFIX}-ruby-yaml=0.4.0"
"${MINGW_PACKAGE_PREFIX}-ruby-zlib=3.2.1"
)
## End of pkgupdprovs modifications
sha256sums=('8dc48fffaf270f86f1019053f28e51e4da4cce32a36760a0603a9aee67d7fd8d'
'e5d665cabac8b7fbb0dda9a556c2350190801aa07b3cb90a0d50097ab99272a0'
'fa75de298371bb01e308ced6d1c5a01c829ea8de60ed707b0c76b2c72f0905dc'
'91a3e12bc63d588093941896eda7808ccf0d3f20d8bea18a54313b38c86e5240')
sha256sums=('3d385e5d22d368b064c817a13ed8e3cc3f71a7705d7ed1bae78013c33aa7c87f')
apply_patch_with_msg() {
for _patch in "$@"
@@ -140,11 +136,6 @@ apply_patch_with_msg() {
prepare() {
cd ${_realname}-${pkgver}
apply_patch_with_msg \
0003-fix-check-types.patch \
0008-ucrt-32-win11-insns.patch \
0010-configure-fixes.patch
autoreconf -fi
}