Date: Thursday, September 8, 2022 @ 20:16:39 Author: segaja Revision: 1296907
upgpkg: ruby-stringio 3.0.2-3: fix gemspec file Added: ruby-stringio/trunk/ruby-stringio_fix_gemspec.patch Modified: ruby-stringio/trunk/PKGBUILD Deleted: ruby-stringio/trunk/cleanup_rakefile.patch ---------------------------------+ PKGBUILD | 10 +++- cleanup_rakefile.patch | 77 -------------------------------------- ruby-stringio_fix_gemspec.patch | 24 +++++++++++ 3 files changed, 31 insertions(+), 80 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-09-08 19:38:52 UTC (rev 1296906) +++ PKGBUILD 2022-09-08 20:16:39 UTC (rev 1296907) @@ -3,7 +3,7 @@ _gemname='stringio' pkgname="ruby-${_gemname}" pkgver=3.0.2 -pkgrel=2 +pkgrel=3 pkgdesc='Pseudo `IO` class from/to `String`.' arch=('x86_64') url="https://github.com/ruby/${_gemname}" @@ -12,12 +12,16 @@ makedepends=('ruby-bundler' 'ruby-rake' 'ruby-rake-compiler') checkdepends=('ruby-test-unit') options=(!emptydirs) -source=("${url}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz") -sha512sums=('a9ac2820ce1c2bd55aac032be42a493a910787ed04bc41f35ec33b19ffd878c925dbbca49d6c27b07cea5ffb8fa98ecdb576738c9654587dea6842e3bd1f486c') +source=("${url}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz" + "${pkgname}_fix_gemspec.patch") +sha512sums=('a9ac2820ce1c2bd55aac032be42a493a910787ed04bc41f35ec33b19ffd878c925dbbca49d6c27b07cea5ffb8fa98ecdb576738c9654587dea6842e3bd1f486c' + '90256c90dde11a0eb96a9ad55de5837142003192959b609089a0438716d9c6ad436070c3b3dbae3d9d9c8657866bfb7a1cdba2d8350802d25ccb142c0e089fd9') prepare() { cd "${_gemname}-${pkgver}" + patch --verbose --strip=1 --input="../${pkgname}_fix_gemspec.patch" + # update gemspec/Gemfile to allow newer version of the dependencies sed --in-place --regexp-extended 's|~>|>=|g' "${_gemname}.gemspec" Deleted: cleanup_rakefile.patch =================================================================== --- cleanup_rakefile.patch 2022-09-08 19:38:52 UTC (rev 1296906) +++ cleanup_rakefile.patch 2022-09-08 20:16:39 UTC (rev 1296907) @@ -1,77 +0,0 @@ -diff --git a/Rakefile b/Rakefile -index 9c28f2e..296bdaf 100644 ---- a/Rakefile -+++ b/Rakefile -@@ -3,63 +3,17 @@ require "rake/testtask" - - name = "stringio" - -+require 'rake/extensiontask' -+extask = Rake::ExtensionTask.new(name) do |x| -+ x.lib_dir << "/#{RUBY_VERSION}/#{x.platform}" -+end - Rake::TestTask.new(:test) do |t| -- ENV["RUBYOPT"] = "-Ilib" -- t.libs << "test" << "test/lib" -+ ENV["RUBYOPT"] = "-I" + [extask.lib_dir, "test/lib"].join(File::PATH_SEPARATOR) -+ t.libs << extask.lib_dir -+ t.libs << "test/lib" - t.ruby_opts << "-rhelper" - t.test_files = FileList["test/**/test_*.rb"] - end - --task :sync_tool do -- require 'fileutils' -- FileUtils.cp "../ruby/tool/lib/core_assertions.rb", "./test/lib" -- FileUtils.cp "../ruby/tool/lib/envutil.rb", "./test/lib" -- FileUtils.cp "../ruby/tool/lib/find_executable.rb", "./test/lib" --end -- --require 'rake/extensiontask' --Rake::ExtensionTask.new(name) -- --task :default => [:compile, :test] -- --task "build" => "date_epoch" --task "date_epoch" do -- ENV["SOURCE_DATE_EPOCH"] = IO.popen(%W[git -C #{__dir__} log -1 --format=%ct], &:read).chomp --end -- --helper = Bundler::GemHelper.instance --def helper.version=(v) -- gemspec.version = v -- tag_version --end -- --def helper.tag_version -- v = version.to_s -- src = "ext/stringio/stringio.c" -- File.open(File.join(__dir__, src), "r+b") do |f| -- code = f.read -- code.sub!(/^#define\s+STRINGIO_VERSION\s+\K".*"/) {v.dump} -- f.rewind -- f.write(code) -- f.truncate(f.pos) -- end -- # system("git", "--no-pager", "-C", __dir__, "diff", "-U0", src, exception: true) -- system("git", "-C", __dir__, "commit", "-mBump version to #{version}", src, exception: true) -- super --end -- --major, minor, teeny = helper.gemspec.version.segments -- --task "bump:teeny" do -- helper.version = Gem::Version.new("#{major}.#{minor}.#{teeny+1}") --end -- --task "bump:minor" do -- helper.version = Gem::Version.new("#{major}.#{minor+1}.0") --end -- --task "bump:major" do -- helper.version = Gem::Version.new("#{major+1}.0.0") --end -- --task "bump" => "bump:teeny" -+task :default => :test -+task :test => :compile Added: ruby-stringio_fix_gemspec.patch =================================================================== --- ruby-stringio_fix_gemspec.patch (rev 0) +++ ruby-stringio_fix_gemspec.patch 2022-09-08 20:16:39 UTC (rev 1296907) @@ -0,0 +1,24 @@ +diff --git a/stringio.gemspec b/stringio.gemspec +index 1015d26..80bad5d 100644 +--- a/stringio.gemspec ++++ b/stringio.gemspec +@@ -1,18 +1,9 @@ + # -*- coding: utf-8 -*- + # frozen_string_literal: true + +-source_version = ["", "ext/stringio/"].find do |dir| +- begin +- break File.open(File.join(__dir__, "#{dir}stringio.c")) {|f| +- f.gets("\n#define STRINGIO_VERSION ") +- f.gets[/\s*"(.+)"/, 1] +- } +- rescue Errno::ENOENT +- end +-end + Gem::Specification.new do |s| + s.name = "stringio" +- s.version = source_version ++ s.version = "3.0.2" + + s.required_rubygems_version = Gem::Requirement.new(">= 2.6") + s.require_paths = ["lib"]