[前][次][番号順一覧][スレッド一覧]

ruby-changes:71602

From: nagachika <ko1@a...>
Date: Sat, 2 Apr 2022 14:08:25 +0900 (JST)
Subject: [ruby-changes:71602] 6a022fb22d (ruby_3_0): rename filepath in patch for zlib.

https://git.ruby-lang.org/ruby.git/commit/?id=6a022fb22d

From 6a022fb22dac7dcc9d68e339230f8b3cc2749842 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Sat, 2 Apr 2022 14:08:11 +0900
Subject: rename filepath in patch for zlib.

---
 ext/zlib/win32/zlib-1.2.12-mswin.patch | 18 +++++++++---------
 version.h                              |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ext/zlib/win32/zlib-1.2.12-mswin.patch b/ext/zlib/win32/zlib-1.2.12-mswin.patch
index 8810b4403c..e5b4c2f6a6 100644
--- a/ext/zlib/win32/zlib-1.2.12-mswin.patch
+++ b/ext/zlib/win32/zlib-1.2.12-mswin.patch
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ext/zlib/win32/zlib-1.2.12-mswin.patch#L1
-diff -ru zlib-1.2.11/gzread.c zlib-1.2.11/gzread.c
---- zlib-1.2.11/gzread.c	2016-12-31 23:37:10.000000000 +0900
-+++ zlib-1.2.11/gzread.c	2020-11-23 19:35:00.550987184 +0900
+diff -ru zlib-1.2.12/gzread.c zlib-1.2.12/gzread.c
+--- zlib-1.2.12/gzread.c	2016-12-31 23:37:10.000000000 +0900
++++ zlib-1.2.12/gzread.c	2020-11-23 19:35:00.550987184 +0900
 @@ -316,7 +316,7 @@
          /* set n to the maximum amount of len that fits in an unsigned int */
          n = -1;
@@ -28,9 +28,9 @@ diff -ru zlib-1.2.11/gzread.c zlib-1.2.11/gzread.c https://github.com/ruby/ruby/blob/trunk/ext/zlib/win32/zlib-1.2.12-mswin.patch#L28
      return ret < 1 ? -1 : buf[0];
  }
  
-diff -ru zlib-1.2.11/gzwrite.c zlib-1.2.11/gzwrite.c
---- zlib-1.2.11/gzwrite.c	2017-01-15 09:29:40.000000000 +0900
-+++ zlib-1.2.11/gzwrite.c	2020-11-23 19:35:41.530494030 +0900
+diff -ru zlib-1.2.12/gzwrite.c zlib-1.2.12/gzwrite.c
+--- zlib-1.2.12/gzwrite.c	2017-01-15 09:29:40.000000000 +0900
++++ zlib-1.2.12/gzwrite.c	2020-11-23 19:35:41.530494030 +0900
 @@ -209,7 +209,7 @@
                                state->in);
              copy = state->size - have;
@@ -58,9 +58,9 @@ diff -ru zlib-1.2.11/gzwrite.c zlib-1.2.11/gzwrite.c https://github.com/ruby/ruby/blob/trunk/ext/zlib/win32/zlib-1.2.12-mswin.patch#L58
      return ret == 0 && len != 0 ? -1 : ret;
  }
  
-diff -ru zlib-1.2.11/win32/Makefile.msc zlib-1.2.11/win32/Makefile.msc
---- zlib-1.2.11/win32/Makefile.msc	2017-01-15 09:07:08.000000000 +0900
-+++ zlib-1.2.11/win32/Makefile.msc	2020-11-23 22:37:19.746500208 +0900
+diff -ru zlib-1.2.12/win32/Makefile.msc zlib-1.2.12/win32/Makefile.msc
+--- zlib-1.2.12/win32/Makefile.msc	2017-01-15 09:07:08.000000000 +0900
++++ zlib-1.2.12/win32/Makefile.msc	2020-11-23 22:37:19.746500208 +0900
 @@ -37,6 +37,22 @@
         gzwrite.obj infback.obj inflate.obj inftrees.obj inffast.obj trees.obj uncompr.obj zutil.obj
  OBJA =
diff --git a/version.h b/version.h
index 6f621fd9ac..b5067e02aa 100644
--- a/version.h
+++ b/version.h
@@ -12,7 +12,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L12
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 4
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 202
+#define RUBY_PATCHLEVEL 203
 
 #define RUBY_RELEASE_YEAR 2022
 #define RUBY_RELEASE_MONTH 4
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]