update to 3.2.4 [release 3.2.4-1mamba;Sat May 25 2024]

This commit is contained in:
Silvan Calarco 2024-06-04 17:07:50 +02:00
parent 4906d5273d
commit 3dfdad84ec
3 changed files with 33 additions and 34 deletions

View File

@ -1,15 +0,0 @@
--- ruby-2.3.4/thread.c 2017-03-27 18:54:09.000000000 +0200
+++ ruby-2.3.4/thread.c.api_break 2017-06-18 19:25:49.671240689 +0200
@@ -2187,6 +2187,12 @@
return busy;
}
+void
+rb_thread_fd_close(int fd)
+{
+ while (rb_notify_fd_close(fd));
+}
+
/*
* call-seq:
* thr.raise

View File

@ -0,0 +1,24 @@
From 055613fd868a8c94e43893f8c58a00cdd2a81f6d Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Fri, 22 Mar 2024 18:18:35 +0900
Subject: [PATCH] Fix pointer incompatiblity
Since the subsecond part is discarded, WIDEVAL to VALUE conversion is
needed.
---
time.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/time.c b/time.c
index 6179b081c02fc9..3304b2f4f4856a 100644
--- a/time.c
+++ b/time.c
@@ -2342,7 +2342,7 @@ zone_timelocal(VALUE zone, VALUE time)
struct time_object *tobj = RTYPEDDATA_GET_DATA(time);
wideval_t t, s;
- split_second(tobj->timew, &t, &s);
+ wdivmod(tobj->timew, WINT2FIXWV(TIME_SCALE), &t, &s);
tm = tm_from_time(rb_cTimeTM, time);
utc = rb_check_funcall(zone, id_local_to_utc, 1, &tm);
if (UNDEF_P(utc)) return 0;

View File

@ -3,7 +3,7 @@
Name: ruby
Epoch: 1
Version: 3.2.0
Version: 3.2.4
Release: 1mamba
Summary: An interpreted scripting language for quick and easy object-oriented programming
Group: Applications/Development
@ -12,7 +12,7 @@ Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://www.ruby-lang.org
Source0: https://cache.ruby-lang.org/pub/ruby/%{majorminor}/ruby-%{version}.tar.xz
Patch: ruby-2.3.4-api_break_rb_thread_fd_close.patch
Patch0: ruby-3.2.4-fix-pointer-incompatibility.patch
License: GPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
@ -22,6 +22,7 @@ BuildRequires: libgmp-devel
BuildRequires: libncurses-devel
BuildRequires: libopenssl-devel
BuildRequires: libreadline-devel
BuildRequires: libxcrypt-devel
BuildRequires: libyaml-devel
BuildRequires: libz-devel
## AUTOBUILDREQ-END
@ -63,14 +64,13 @@ This package contains Ruby's devel files.
%prep
%setup -q
#%patch0 -p1
%patch 0 -p1 -b .fix-pointer-incompatibility
%build
CFLAGS=`echo %{optflags} | sed 's/-fomit-frame-pointer //'`
%configure \
--disable-rpath \
--enable-shared
# --with-ruby-version=''
%make
make test
@ -115,8 +115,8 @@ rm -fr %{buildroot}%{_docdir}
%{_bindir}/rdoc
%{_bindir}/ri
%{_bindir}/ruby
%{_bindir}/syntax_suggest
%{_bindir}/typeprof
#%{_mandir}/man5/gemfile.5*
%dir %{_datadir}/ri/%{apiver}
%dir %{_datadir}/ri/%{apiver}/system
%{_datadir}/ri/%{apiver}/system/*
@ -128,7 +128,7 @@ rm -fr %{buildroot}%{_docdir}
%dir %{_libdir}/ruby/gems/%{apiver}/cache
%{_libdir}/ruby/gems/%{apiver}/cache/*
%dir %{_libdir}/ruby/gems/%{apiver}/extensions
#%{_libdir}/ruby/gems/%{apiver}/extensions/*
%{_libdir}/ruby/gems/%{apiver}/extensions/*
%dir %{_libdir}/ruby/gems/%{apiver}/gems
%{_libdir}/ruby/gems/%{apiver}/gems/*
%dir %{_libdir}/ruby/gems/%{apiver}/specifications
@ -141,12 +141,10 @@ rm -fr %{buildroot}%{_docdir}
%{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux*/erb
%{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux*/io
%{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux*/json
#%{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux*/mathn
%{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux*/racc
%{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux*/rbconfig
%{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux*/*.rb
%{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux*/*.so
#%{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux*/bigdecimal/util.so
%{_libdir}/ruby/%{apiver}/*.rb
%{_libdir}/ruby/%{apiver}/bigdecimal
%dir %{_libdir}/ruby/*/bundler
@ -160,16 +158,12 @@ rm -fr %{buildroot}%{_docdir}
%{_libdir}/ruby/%{apiver}/drb
%{_libdir}/ruby/%{apiver}/erb
%{_libdir}/ruby/%{apiver}/error_highlight
#%{_libdir}/ruby/%{apiver}/e2mmap/version.rb
#%{_libdir}/ruby/%{apiver}/fileutils/version.rb
%{_libdir}/ruby/%{apiver}/fiddle
%{_libdir}/ruby/%{apiver}/forwardable
%{_libdir}/ruby/%{apiver}/io
%{_libdir}/ruby/%{apiver}/irb
%{_libdir}/ruby/%{apiver}/json
%{_libdir}/ruby/%{apiver}/logger
#%{_libdir}/ruby/%{apiver}/matrix
%{_libdir}/ruby/%{apiver}/mjit
%{_libdir}/ruby/%{apiver}/net
%{_libdir}/ruby/%{apiver}/objspace
%{_libdir}/ruby/%{apiver}/open3
@ -178,23 +172,17 @@ rm -fr %{buildroot}%{_docdir}
%{_libdir}/ruby/%{apiver}/psych
%{_libdir}/ruby/%{apiver}/racc
%{_libdir}/ruby/%{apiver}/random
#%{_libdir}/ruby/%{apiver}/rbconfig
%{_libdir}/ruby/%{apiver}/rdoc
%{_libdir}/ruby/%{apiver}/reline
#%{_libdir}/ruby/%{apiver}/rexml
%{_libdir}/ruby/%{apiver}/rinda
%{_libdir}/ruby/%{apiver}/ripper
#%{_libdir}/ruby/%{apiver}/rss
%{_libdir}/ruby/%{apiver}/rubygems
%{_libdir}/ruby/%{apiver}/ruby_vm
%{_libdir}/ruby/%{apiver}/set
%{_libdir}/ruby/%{apiver}/syntax_suggest
%{_libdir}/ruby/%{apiver}/syslog
#%{_libdir}/ruby/%{apiver}/tracer/version.rb
%{_libdir}/ruby/%{apiver}/unicode_normalize
%{_libdir}/ruby/%{apiver}/uri
#%{_libdir}/ruby/%{apiver}/webrick
#%{_libdir}/ruby/%{apiver}/xmlrpc
%{_libdir}/ruby/%{apiver}/yaml
%doc COPYING
@ -217,13 +205,15 @@ rm -fr %{buildroot}%{_docdir}
%dir %{_includedir}/ruby-%{apiver}/ruby/internal
%{_includedir}/ruby-%{apiver}/ruby/internal/*
%{_includedir}/ruby-%{apiver}/%{_target_cpu}-linux*/rb_mjit_min_header-*.h
#%{_libdir}/libruby-static.a
%{_libdir}/libruby.so
%{_libdir}/pkgconfig/ruby-*.pc
%{_libdir}/pkgconfig/ruby.pc
#%doc ChangeLog README.*
%changelog
* Sat May 25 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 3.2.4-1mamba
- update to 3.2.4
* Tue Dec 27 2022 Automatic Build System <autodist@mambasoft.it> 3.2.0-1mamba
- automatic version update by autodist