Skip to content

Commit abc2a5a

Browse files
committed
refresh patches
1 parent 70b88ba commit abc2a5a

11 files changed

+32
-73
lines changed

debian/patches/Ensure-Integer-GMP_VERSION-exists.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ packaging
99
1 file changed, 4 insertions(+)
1010

1111
diff --git a/test/ruby/test_bignum.rb b/test/ruby/test_bignum.rb
12-
index 1b705b0..988de63 100644
12+
index beef33e..bb1c6ad 100644
1313
--- a/test/ruby/test_bignum.rb
1414
+++ b/test/ruby/test_bignum.rb
1515
@@ -634,6 +634,10 @@ class TestBignum < Test::Unit::TestCase

debian/patches/Fix-FTBFS-on-x32-misdetected-as-i386-or-amd64.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ Updated by John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> on
1212
1 file changed, 3 insertions(+)
1313

1414
diff --git a/configure.ac b/configure.ac
15-
index b77cbea..a13cb4c 100644
15+
index 30e197b..7bedb37 100644
1616
--- a/configure.ac
1717
+++ b/configure.ac
18-
@@ -2659,6 +2659,9 @@ AS_CASE([$coroutine_type], [yes|''], [
18+
@@ -2690,6 +2690,9 @@ AS_CASE([$coroutine_type], [yes|''], [
1919
[powerpc64-darwin*|ppc64-darwin*], [
2020
coroutine_type=ppc64
2121
],

debian/patches/Make-gemspecs-reproducible.patch

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ Subject: Make gemspecs reproducible
55
Without an explicit date, they will get the current date and make the
66
build unreproducible
77
---
8-
ext/bigdecimal/bigdecimal.gemspec | 1 +
9-
ext/fiddle/fiddle.gemspec | 1 +
10-
ext/io/console/io-console.gemspec | 1 +
11-
lib/ipaddr.gemspec | 1 +
12-
lib/rdoc/rdoc.gemspec | 1 +
8+
.bundle/gems/bigdecimal-3.1.8/bigdecimal.gemspec | 1 +
9+
ext/fiddle/fiddle.gemspec | 1 +
10+
ext/io/console/io-console.gemspec | 1 +
11+
lib/ipaddr.gemspec | 1 +
12+
lib/rdoc/rdoc.gemspec | 1 +
1313
5 files changed, 5 insertions(+)
1414

15-
diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec
16-
index f9f3b45..b9a469d 100644
17-
--- a/ext/bigdecimal/bigdecimal.gemspec
18-
+++ b/ext/bigdecimal/bigdecimal.gemspec
15+
diff --git a/.bundle/gems/bigdecimal-3.1.8/bigdecimal.gemspec b/.bundle/gems/bigdecimal-3.1.8/bigdecimal.gemspec
16+
index b6ef8fd..596b8bb 100644
17+
--- a/.bundle/gems/bigdecimal-3.1.8/bigdecimal.gemspec
18+
+++ b/.bundle/gems/bigdecimal-3.1.8/bigdecimal.gemspec
1919
@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
2020
s.name = name
2121
s.version = source_version
@@ -25,7 +25,7 @@ index f9f3b45..b9a469d 100644
2525

2626
s.summary = "Arbitrary-precision decimal floating-point number library."
2727
diff --git a/ext/fiddle/fiddle.gemspec b/ext/fiddle/fiddle.gemspec
28-
index 8781093..efdca32 100644
28+
index 0092f52..f77c224 100644
2929
--- a/ext/fiddle/fiddle.gemspec
3030
+++ b/ext/fiddle/fiddle.gemspec
3131
@@ -8,6 +8,7 @@ end
@@ -37,10 +37,10 @@ index 8781093..efdca32 100644
3737
spec.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org"]
3838

3939
diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec
40-
index d4f5276..8f89611 100644
40+
index 0a19992..4a80529 100644
4141
--- a/ext/io/console/io-console.gemspec
4242
+++ b/ext/io/console/io-console.gemspec
43-
@@ -4,6 +4,7 @@ _VERSION = "0.7.1"
43+
@@ -12,6 +12,7 @@ end
4444
Gem::Specification.new do |s|
4545
s.name = "io-console"
4646
s.version = _VERSION
@@ -49,7 +49,7 @@ index d4f5276..8f89611 100644
4949
s.email = "nobu@ruby-lang.org"
5050
s.description = "add console capabilities to IO instances."
5151
diff --git a/lib/ipaddr.gemspec b/lib/ipaddr.gemspec
52-
index 1f4798e..48743cf 100644
52+
index 5719f83..fe76260 100644
5353
--- a/lib/ipaddr.gemspec
5454
+++ b/lib/ipaddr.gemspec
5555
@@ -18,6 +18,7 @@ end
@@ -61,7 +61,7 @@ index 1f4798e..48743cf 100644
6161
spec.email = ["knu@idaemons.org", "ume@mahoroba.org"]
6262

6363
diff --git a/lib/rdoc/rdoc.gemspec b/lib/rdoc/rdoc.gemspec
64-
index 93a281c..cc5c155 100644
64+
index 3144df5..65c313f 100644
6565
--- a/lib/rdoc/rdoc.gemspec
6666
+++ b/lib/rdoc/rdoc.gemspec
6767
@@ -7,6 +7,7 @@ end

debian/patches/Mark-Gemspec-reproducible-change-fixing-784225-too.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ Signed-off-by: Christian Hofstaedtler <zeha@debian.org>
1212
1 file changed, 3 insertions(+), 1 deletion(-)
1313

1414
diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
15-
index 05ce483..5f2dbd1 100644
15+
index 8f353ae..095125f 100644
1616
--- a/lib/rubygems/specification.rb
1717
+++ b/lib/rubygems/specification.rb
18-
@@ -1698,7 +1698,9 @@ class Gem::Specification < Gem::BasicSpecification
18+
@@ -1711,7 +1711,9 @@ class Gem::Specification < Gem::BasicSpecification
1919
raise(Gem::InvalidSpecificationException,
2020
"invalid date format in specification: #{date.inspect}")
2121
end

debian/patches/TestProcess-disable-gems-to-disable-rubygems_integration.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ lets such test fail.
1111
1 file changed, 3 insertions(+), 3 deletions(-)
1212

1313
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
14-
index d9804aa..49a6965 100644
14+
index 6e8ba48..dfe47cd 100644
1515
--- a/test/ruby/test_process.rb
1616
+++ b/test/ruby/test_process.rb
17-
@@ -289,7 +289,7 @@ class TestProcess < Test::Unit::TestCase
17+
@@ -292,7 +292,7 @@ class TestProcess < Test::Unit::TestCase
1818
end
1919
PREENVARG = ['-e', "%w[#{MANDATORY_ENVS.join(' ')}].each{|e|ENV.delete(e)}"]
2020
ENVARG = ['-e', 'ENV.each {|k,v| puts "#{k}=#{v}" }']
@@ -23,7 +23,7 @@ index d9804aa..49a6965 100644
2323

2424
def test_execopts_env
2525
assert_raise(ArgumentError) {
26-
@@ -308,7 +308,7 @@ class TestProcess < Test::Unit::TestCase
26+
@@ -311,7 +311,7 @@ class TestProcess < Test::Unit::TestCase
2727
assert_equal(prog, e.message.sub(/.* - /, ''))
2828
}
2929
h = {}
@@ -32,9 +32,9 @@ index d9804aa..49a6965 100644
3232
(ENV.keys + MANDATORY_ENVS).each do |k|
3333
case k
3434
when /\APATH\z/i
35-
@@ -401,7 +401,7 @@ class TestProcess < Test::Unit::TestCase
35+
@@ -404,7 +404,7 @@ class TestProcess < Test::Unit::TestCase
3636
with_tmpchdir do |d|
37-
open('test-script', 'w') do |f|
37+
File.open('test-script', 'w') do |f|
3838
ENVCOMMAND.each_with_index do |cmd, i|
3939
- next if i.zero? or cmd == "-e"
4040
+ next if i.zero? or cmd == "-e" or cmd == "--disable-gems"

debian/patches/Test_SyncDefaultGems-Fail-when-editor-run.patch

Lines changed: 0 additions & 40 deletions
This file was deleted.

debian/patches/YJIT-Let-RubyVM-YJIT.enable-respect-yjit-stats.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Subject: YJIT: Let RubyVM::YJIT.enable respect --yjit-stats
77
1 file changed, 1 insertion(+)
88

99
diff --git a/yjit.rbinc b/yjit.rbinc
10-
index 7acfeb1..6f417f6 100644
10+
index a6d2a8e..85c3737 100644
1111
--- a/yjit.rbinc
1212
+++ b/yjit.rbinc
1313
@@ -3,6 +3,7 @@

debian/patches/extract-gems-sequential-Keep-using-RUNRUBY.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ Subject: extract-gems-sequential: Keep using RUNRUBY
1515
1 file changed, 1 insertion(+), 3 deletions(-)
1616

1717
diff --git a/common.mk b/common.mk
18-
index 83f10f7..b5a54dc 100644
18+
index 0ea360c..9b34859 100644
1919
--- a/common.mk
2020
+++ b/common.mk
21-
@@ -1503,7 +1503,7 @@ update-gems$(gnumake:yes=-sequential): PHONY
21+
@@ -1537,7 +1537,7 @@ update-gems$(gnumake:yes=-sequential): PHONY
2222

2323
extract-gems$(gnumake:yes=-sequential): PHONY
2424
$(ECHO) Extracting bundled gem files...
@@ -27,7 +27,7 @@ index 83f10f7..b5a54dc 100644
2727
-Itool/lib -rfileutils -rbundled_gem -answ \
2828
-e 'BEGIN {d = ".bundle/gems"}' \
2929
-e 'gem, ver, _, rev = *$$F' \
30-
@@ -1517,8 +1517,6 @@ extract-gems$(gnumake:yes=-sequential): PHONY
30+
@@ -1551,8 +1551,6 @@ extract-gems$(gnumake:yes=-sequential): PHONY
3131
-e 'end' \
3232
gems/bundled_gems
3333

debian/patches/lib-mkmf.rb-sort-list-of-object-files-in-generated-Makefi.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ Signed-off-by: Reiner Herrmann <reiner@reiner-h.de>
1414
1 file changed, 1 insertion(+), 1 deletion(-)
1515

1616
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
17-
index 6da7dde..3af30a9 100644
17+
index 768a152..f16cdd8 100644
1818
--- a/lib/mkmf.rb
1919
+++ b/lib/mkmf.rb
20-
@@ -2368,7 +2368,7 @@ LOCAL_LIBS = #{$LOCAL_LIBS}
20+
@@ -2480,7 +2480,7 @@ LOCAL_LIBS = #{$LOCAL_LIBS}
2121
LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS}
2222
ORIG_SRCS = #{orig_srcs.collect(&File.method(:basename)).join(' ')}
2323
SRCS = $(ORIG_SRCS) #{(srcs - orig_srcs).collect(&File.method(:basename)).join(' ')}

debian/patches/series

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ exclude-several-tests-unstable-in-Docker.patch
66
Fix-FTBFS-on-x32-misdetected-as-i386-or-amd64.patch
77
TestProcess-disable-gems-to-disable-rubygems_integration.patch
88
extract-gems-sequential-Keep-using-RUNRUBY.patch
9-
Test_SyncDefaultGems-Fail-when-editor-run.patch
109
sync_default_gems-git-2.32-ignores-no-edit-in-cherry-pick.patch
1110
YJIT-Let-RubyVM-YJIT.enable-respect-yjit-stats.patch
1211
Ensure-Integer-GMP_VERSION-exists.patch

0 commit comments

Comments
 (0)