diff mbox series

ruby: refresh patches

Message ID 20260303051341.2759660-1-changqing.li@windriver.com
State Accepted, archived
Commit 44e650f961888b75797da8ecc23654f672c5fae6
Headers show
Series ruby: refresh patches | expand

Commit Message

Changqing Li March 3, 2026, 5:13 a.m. UTC
* 0003-rdoc-build-reproducible-documentation.patch remove the not needed
  lines
* 0001-Don-t-save-the-original-name-and-timestamp.patch use better array

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 ...-save-the-original-name-and-timestamp.patch |  6 +++---
 ...rdoc-build-reproducible-documentation.patch | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)
diff mbox series

Patch

diff --git a/meta/recipes-devtools/ruby/ruby/0001-Don-t-save-the-original-name-and-timestamp.patch b/meta/recipes-devtools/ruby/ruby/0001-Don-t-save-the-original-name-and-timestamp.patch
index 3db5328565..0f24d2ea0b 100644
--- a/meta/recipes-devtools/ruby/ruby/0001-Don-t-save-the-original-name-and-timestamp.patch
+++ b/meta/recipes-devtools/ruby/ruby/0001-Don-t-save-the-original-name-and-timestamp.patch
@@ -1,4 +1,4 @@ 
-From 6250ed93d1d7407eb84241296d604e6f98ff0a82 Mon Sep 17 00:00:00 2001
+From 2cedad6b2beb908a8fb80da0e45e5055dca65e99 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Fri, 27 Feb 2026 16:59:24 +0800
 Subject: [PATCH] Don't save the original name and timestamp
@@ -16,7 +16,7 @@  Signed-off-by: Changqing Li <changqing.li@windriver.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
-index 874c3ef..0bba588 100755
+index 874c3ef..eb99a70 100755
 --- a/tool/rbinstall.rb
 +++ b/tool/rbinstall.rb
 @@ -173,7 +173,7 @@ def parse_args(argv = ARGV)
@@ -24,7 +24,7 @@  index 874c3ef..0bba588 100755
  end
  
 -Compressors = {".gz"=>"gzip", ".bz2"=>"bzip2"}
-+Compressors = {".gz"=>"gzip -n", ".bz2"=>"bzip2"}
++Compressors = {".gz"=>%w"gzip -n", ".bz2"=>%w"bzip2"}
  def Compressors.for(type)
    ext = File.extname(type)
    if compress = fetch(ext, nil)
diff --git a/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch b/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch
index f0be3e4af6..bf57f97d7e 100644
--- a/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch
+++ b/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch
@@ -1,4 +1,4 @@ 
-From 278d02b08f513b288f31648bc5ec5c47ecb61686 Mon Sep 17 00:00:00 2001
+From 02cd20470448676d97d77c2e6789ecce43f0e21c Mon Sep 17 00:00:00 2001
 From: Christian Hofstaedtler <zeha@debian.org>
 Date: Tue, 10 Oct 2017 15:04:34 -0300
 Subject: [PATCH] rdoc: build reproducible documentation
@@ -13,25 +13,27 @@  Signed-off-by: Christian Hofstaedtler <zeha@debian.org>
 rebase to version 4.0.1
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
 ---
- .bundle/gems/rdoc-7.0.3/lib/rdoc/generator/json_index.rb | 2 ++
- 1 file changed, 2 insertions(+)
+ .bundle/gems/rdoc-7.0.3/lib/rdoc/generator/json_index.rb | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/.bundle/gems/rdoc-7.0.3/lib/rdoc/generator/json_index.rb b/.bundle/gems/rdoc-7.0.3/lib/rdoc/generator/json_index.rb
-index 065caa4..a76c202 100644
+index 065caa4..cfa1f33 100644
 --- a/.bundle/gems/rdoc-7.0.3/lib/rdoc/generator/json_index.rb
 +++ b/.bundle/gems/rdoc-7.0.3/lib/rdoc/generator/json_index.rb
-@@ -177,6 +177,7 @@ class RDoc::Generator::JsonIndex
+@@ -176,7 +176,7 @@ class RDoc::Generator::JsonIndex
+     debug_msg "Writing gzipped search index to %s" % outfile
  
      Zlib::GzipWriter.open(outfile) do |gz|
-       gz.mtime = File.mtime(search_index_file)
+-      gz.mtime = File.mtime(search_index_file)
 +      gz.mtime = -1
        gz.orig_name = search_index_file.basename.to_s
        gz.write search_index
        gz.close
-@@ -195,6 +196,7 @@ class RDoc::Generator::JsonIndex
+@@ -194,7 +194,7 @@ class RDoc::Generator::JsonIndex
+         debug_msg "Writing gzipped file to %s" % outfile
  
          Zlib::GzipWriter.open(outfile) do |gz|
-           gz.mtime = File.mtime(dest)
+-          gz.mtime = File.mtime(dest)
 +          gz.mtime = -1
            gz.orig_name = dest.basename.to_s
            gz.write data