Make patches apply

Author: maths22

debian/changelog

@@ -7,7 +7,7 @@ ruby3.3 (3.3.0~preview1-1ppa1) bionic; urgency=medium
   * New upstream version 3.3.0~preview1
   * Restore auto-upload
 
- -- Ubuntu <ubuntu@focal>  Fri, 19 May 2023 08:20:46 -0500
+ -- Ubuntu <ubuntu@focal>  Fri, 19 May 2023 08:20:47 -0500
 
 ruby3.2 (3.2.2-1ppa1) bionic; urgency=medium
 

debian/patches/0001-rdoc-build-reproducible-documentation.patch

@@ -10,11 +10,9 @@ Signed-off-by: Christian Hofstaedtler <zeha@debian.org>
  lib/rdoc/generator/json_index.rb | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/lib/rdoc/generator/json_index.rb b/lib/rdoc/generator/json_index.rb
-index 3a10000..f40bb37 100644
 --- a/lib/rdoc/generator/json_index.rb
 +++ b/lib/rdoc/generator/json_index.rb
-@@ -178,7 +178,7 @@ class RDoc::Generator::JsonIndex
+@@ -178,7 +178,7 @@
      debug_msg "Writing gzipped search index to %s" % outfile
 
      Zlib::GzipWriter.open(outfile) do |gz|
@@ -23,7 +21,7 @@ index 3a10000..f40bb37 100644
        gz.orig_name = search_index_file.basename.to_s
        gz.write search_index
        gz.close
-@@ -196,7 +196,7 @@ class RDoc::Generator::JsonIndex
+@@ -196,7 +196,7 @@
          debug_msg "Writing gzipped file to %s" % outfile
 
          Zlib::GzipWriter.open(outfile) do |gz|

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

@@ -13,11 +13,9 @@ Signed-off-by: Reiner Herrmann <reiner@reiner-h.de>
  lib/mkmf.rb | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/lib/mkmf.rb b/lib/mkmf.rb
-index 118b813..8241494 100644
 --- a/lib/mkmf.rb
 +++ b/lib/mkmf.rb
-@@ -2360,7 +2360,7 @@ LOCAL_LIBS = #{$LOCAL_LIBS}
+@@ -2363,7 +2363,7 @@
  LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS}
  ORIG_SRCS = #{orig_srcs.collect(&File.method(:basename)).join(' ')}
  SRCS = $(ORIG_SRCS) #{(srcs - orig_srcs).collect(&File.method(:basename)).join(' ')}

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

@@ -11,18 +11,16 @@ Signed-off-by: Christian Hofstaedtler <zeha@debian.org>
  lib/rubygems/specification.rb | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
-index 0d72cee..eb7bc25 100644
 --- a/lib/rubygems/specification.rb
 +++ b/lib/rubygems/specification.rb
-@@ -1691,7 +1691,9 @@ class Gem::Specification < Gem::BasicSpecification
-         raise(Gem::InvalidSpecificationException,
-               "invalid date format in specification: #{date.inspect}")
-       end
--    when Time, DateLike then
-+    when Time then
-+      Time.utc(date.utc.year, date.utc.month, date.utc.day)
-+    when DateLike then
-       Time.utc(date.year, date.month, date.day)
-     else
-       TODAY
+@@ -1750,7 +1750,9 @@
+                 raise(Gem::InvalidSpecificationException,
+                       "invalid date format in specification: #{date.inspect}")
+               end
+-            when Time, DateLike then
++            when Time then
++              Time.utc(date.utc.year, date.utc.month, date.utc.day)
++            when DateLike then
+               Time.utc(date.year, date.month, date.day)
+             else
+               TODAY

debian/patches/0004-Disable-tests-failing-on-Ubuntu-builders.patch

@@ -9,16 +9,10 @@ Subject: Disable tests failing on Ubuntu builders
  create mode 100644 test/excludes/TestFileUtils.rb
  create mode 100644 test/excludes/TestProcess.rb
 
-diff --git a/test/excludes/TestFileUtils.rb b/test/excludes/TestFileUtils.rb
-new file mode 100644
-index 0000000..ee8b15c
 --- /dev/null
 +++ b/test/excludes/TestFileUtils.rb
 @@ -0,0 +1 @@
 +exclude :test_chown, "fails on Launchpad builders"
-diff --git a/test/excludes/TestProcess.rb b/test/excludes/TestProcess.rb
-new file mode 100644
-index 0000000..37b406e
 --- /dev/null
 +++ b/test/excludes/TestProcess.rb
 @@ -0,0 +1 @@

debian/patches/0005-Make-gemspecs-reproducible.patch

@@ -14,9 +14,9 @@ build unreproducible
 
 --- a/ext/bigdecimal/bigdecimal.gemspec
 +++ b/ext/bigdecimal/bigdecimal.gemspec
-@@ -4,6 +4,7 @@
-   s.name          = "bigdecimal"
-   s.version       = "3.1.3"
+@@ -14,6 +14,7 @@
+   s.name          = name
+   s.version       = source_version
    s.authors       = ["Kenta Murata", "Zachary Scott", "Shigeo Kobayashi"]
 +  s.date          = RUBY_RELEASE_DATE
    s.email         = ["mrkn@mrkn.jp"]

debian/patches/0006-Fix-FTBS-on-hurd.patch

@@ -12,7 +12,7 @@ Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
 
 --- a/io.c
 +++ b/io.c
-@@ -2207,7 +2207,11 @@
+@@ -2214,7 +2214,11 @@
 
      for (i = 0; i < argc; i += cnt) {
  #ifdef HAVE_WRITEV

debian/patches/0007-Port-to-kfreebsd-amd64.patch

@@ -90,7 +90,7 @@ Signed-off-by: Svante Signell <svante.signell@gmail.com>
        # https://github.com/ruby/fiddle/actions/runs/3202406059/jobs/5231356410
 --- a/test/socket/test_socket.rb
 +++ b/test/socket/test_socket.rb
-@@ -541,7 +541,7 @@
+@@ -545,7 +545,7 @@
    end
 
    def test_bintime

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

@@ -13,7 +13,7 @@ Updated by John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> on
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2596,6 +2596,9 @@
+@@ -2598,6 +2598,9 @@
          [powerpc64-darwin*|ppc64-darwin*], [
              coroutine_type=ppc64
          ],

debian/patches/0011-don-t-try-to-download-stuff-in-configure.patch

@@ -8,13 +8,13 @@ Subject: don't try to download stuff in configure
 
 --- a/defs/gmake.mk
 +++ b/defs/gmake.mk
-@@ -295,9 +295,7 @@
- bundled-gem-srcdir = $(srcdir)/gems/src/$(1)
+@@ -305,9 +305,7 @@
+ bundled-gem-gemspec = $(srcdir)/gems/src/$(1)/$(1).gemspec
  bundled-gem-extracted = $(srcdir)/.bundle/gems/$(1)-$(2)
 
 -update-gems: | $(patsubst %,$(srcdir)/gems/%.gem,$(bundled-gems))
 -update-gems: | $(call foreach-bundled-gems-rev,bundled-gem-gemfile)
--update-gems: | $(call foreach-bundled-gems-rev,bundled-gem-srcdir)
+-update-gems: | $(call foreach-bundled-gems-rev,bundled-gem-gemspec)
 +update-gems:
 
  test-bundler-precheck: | $(srcdir)/.bundle/cache