[arch-commits] Commit in ruby-cgi/trunk (PKGBUILD ruby-cgi_fix_tests.patch)

[Andreas Schleifer]

    Date: Wednesday, August 31, 2022 @ 18:59:03
  Author: segaja
Revision: 1289216

upgpkg: ruby-cgi 0.3.2-2: re-add missing files to package

Added:
  ruby-cgi/trunk/ruby-cgi_fix_tests.patch
Modified:
  ruby-cgi/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   17 +++++++++++++----
 ruby-cgi_fix_tests.patch |   12 ++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-31 18:51:22 UTC (rev 1289215)
+++ PKGBUILD	2022-08-31 18:59:03 UTC (rev 1289216)
@@ -3,9 +3,9 @@
 _gemname='cgi'
 pkgname="ruby-${_gemname}"
 pkgver=0.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Support for the Common Gateway Interface protocol.'
-arch=('any')
+arch=('x86_64')
 url="https://github.com/ruby/${_gemname}"
 license=('BSD' 'RUBY')
 depends=('ruby')
@@ -12,15 +12,23 @@
 makedepends=('ruby-rake-compiler')
 checkdepends=('ruby-rake')
 options=(!emptydirs)
-source=("${url}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha512sums=('8a92f58bb0d831a8786826d9755aeb2cc56241837a60893f730986da7cd3efb9b8b51f9eb1c42857fcbac30f0f15fee6cb93646b473585a0871c4b044a95061b')
+source=("${url}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz"
+    "ruby-cgi_fix_tests.patch"
+    )
+sha512sums=('8a92f58bb0d831a8786826d9755aeb2cc56241837a60893f730986da7cd3efb9b8b51f9eb1c42857fcbac30f0f15fee6cb93646b473585a0871c4b044a95061b'
+            '7370809302ab6654ddd903e963cab029731233a9dca485200d17e98e4ad8e167997c05998303c3795b8edc6b70a64c87545f4c88e8ed4c918d980f27f37ed294')
 
 prepare() {
   cd "${_gemname}-${pkgver}"
 
+  patch --verbose --strip=1 --input=../${pkgname}_fix_tests.patch
+
   # update gemspec/Gemfile to allow newer version of the dependencies
   sed --in-place --regexp-extended 's|~>|>=|g' "${_gemname}.gemspec"
 
+  # we build based on a tar archive, not a git repo
+  sed --in-place --regexp-extended 's|git ls-files -z|find . -type f -not -path "*/\.git/*" -printf "%P\\\\0"|' "${_gemname}.gemspec"
+
   rm --verbose \
     rakelib/changelogs.rake \
     rakelib/epoch.rake
@@ -56,6 +64,7 @@
   # remove unrepreducible files
   rm --force --recursive --verbose \
     "${pkgdir}/${_gemdir}/cache/" \
+    "${pkgdir}/${_gemdir}/gems/${_gemname}-${pkgver}/tmp/" \
     "${pkgdir}/${_gemdir}/gems/${_gemname}-${pkgver}/vendor/" \
     "${pkgdir}/${_gemdir}/doc/${_gemname}-${pkgver}/ri/ext/"
 

Added: ruby-cgi_fix_tests.patch
===================================================================
--- ruby-cgi_fix_tests.patch	                        (rev 0)
+++ ruby-cgi_fix_tests.patch	2022-08-31 18:59:03 UTC (rev 1289216)
@@ -0,0 +1,12 @@
+diff --git a/test/lib/core_assertions.rb b/test/lib/core_assertions.rb
+index bac3856..69e1c7d 100644
+--- a/test/lib/core_assertions.rb
++++ b/test/lib/core_assertions.rb
+@@ -45,7 +45,6 @@ module Test
+       def assert_in_out_err(args, test_stdin = "", test_stdout = [], test_stderr = [], message = nil,
+                             success: nil, **opt)
+         args = Array(args).dup
+-        args.insert((Hash === args[0] ? 1 : 0), '--disable=gems')
+         stdout, stderr, status = EnvUtil.invoke_ruby(args, test_stdin, true, true, **opt)
+         desc = FailDesc[status, message, stderr]
+         if block_given?