diff options
| -rw-r--r-- | community/crystal/APKBUILD | 14 | ||||
| -rw-r--r-- | community/crystal/specs-tempdir-separate-helper.patch | 46 |
2 files changed, 54 insertions, 6 deletions
diff --git a/community/crystal/APKBUILD b/community/crystal/APKBUILD index c0b5fd7024..17599c2a57 100644 --- a/community/crystal/APKBUILD +++ b/community/crystal/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=crystal -pkgver=0.25.0 +pkgver=0.25.1 pkgrel=0 -_bootver=0.24.2 +_bootver=0.25.0 _llvmver=5 pkgdesc="The Crystal Programming Language" url="https://crystal-lang.org/" @@ -23,6 +23,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/crystal-lang/$pkgname/archiv disable-specs-using-GB2312-encoding.patch fix-spec-time-location.patch libressl.patch + specs-tempdir-separate-helper.patch " builddir="$srcdir/$pkgname-$pkgver" @@ -119,10 +120,11 @@ zshcomp() { "$subpkgdir"/usr/share/zsh/site-functions/_$pkgname } -sha512sums="20f2864919c7710e5aee8112e1c6ab54a2e50b244ac63d374edfed41ab659b11c062f76dbfc38e763a08bdbea9e0a39f3b5cac5e00bf453be3a31d3b0a023917 crystal-0.25.0.tar.gz -6d7ee01ff5bfaaf79fa80c15575ae4496e17629ed18cb0577db6734266c2dbf5b0bf0a554c7c153e1b81f4c71e62bb803fd4b6513e3d039571ee4f953d85ecf4 crystal-0.24.2-x86_64-alpine-linux-musl.tar.gz -d6ed122a5ddb4e1ea772357cd3115dcf8cd92a75f973b6f7e4b8b6135fb4123fb98334495f6f312da7ab7ba3bda57bd3cb4f06c0f421df2c09d19c0ab1b8b67b crystal-0.24.2-aarch64-alpine-linux-musl.tar.gz +sha512sums="b4b79985f0d47d56e2c22b74ac593ea8d21cc21c8e247e7043b6604c0a16906f1b8a9531c8902018f6fab35810177920eae26d3ada6874581e45713f69c9e8fb crystal-0.25.1.tar.gz +b443520d994355f849e18d5432dc136f6e403eb77a432a53e3d38e5a050a7547632bbe7a99a3a4c193f91fdf2240a1629acd516291d16c3bbfa14a9ec47435b2 crystal-0.25.0-x86_64-alpine-linux-musl.tar.gz +43b058e94f990e853f2ade5bf234aaea4547176172beff8ed372c5158ec8bb59c3925e0bb3bf7c2e4024193bcd48652faebba3ce08c5f0e25425ca073a66adb0 crystal-0.25.0-aarch64-alpine-linux-musl.tar.gz dec4ed7abfd215eec825bed97b1e40bf3aa8bd959a4ec7153ea1bc51d409d892ebec19ddb0372e3a543e74c7018aca0c1f3cf956fa1d95efb946c8c3417c8749 paxmark.patch 269976fbc990dde075769e651c9fac6e7e0b39681e55cbd067c6d2a790c58a096bdc9981f62ae69b5217623025ba768daa63bc5316bd8ddd18192d88839aedcb disable-specs-using-GB2312-encoding.patch 518f06dd191e43e4052c0f8c4963d31dfc7ed3b414d1bb2e7a82265af13853f85380b5507ef3c5a5a25f6091d7173d5322f379e354666eec4165264dd502e70b fix-spec-time-location.patch -31fd94f07edb83eb6ff43dd20f99a52e3c28dc0bf67f7e0b5c473c40d455febfbd0cdf9fe1fe599dbf080fd4c05a2a2d9ad8745f9effc8dfb565e19fa0e49509 libressl.patch" +31fd94f07edb83eb6ff43dd20f99a52e3c28dc0bf67f7e0b5c473c40d455febfbd0cdf9fe1fe599dbf080fd4c05a2a2d9ad8745f9effc8dfb565e19fa0e49509 libressl.patch +78df92a5f9df00f5cbad1d6643148fee4724e1e07a08c366ebce6c837c7b3bba19ff69a1c78d072fe24b04f68f92bc464d557601116342120143651aa4e854a9 specs-tempdir-separate-helper.patch" diff --git a/community/crystal/specs-tempdir-separate-helper.patch b/community/crystal/specs-tempdir-separate-helper.patch new file mode 100644 index 0000000000..9d07c0f8e6 --- /dev/null +++ b/community/crystal/specs-tempdir-separate-helper.patch @@ -0,0 +1,46 @@ +From 5f4c3697641654959a313a0332fbba59334f8ca3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com> +Date: Mon, 2 Jul 2018 12:39:25 +0200 +Subject: [PATCH] Fix: Rename datapath helper to compiler_datapath for compiler specs + +Patch-Source: https://github.com/crystal-lang/crystal/pull/6312 +See-Also: https://github.com/crystal-lang/crystal/pull/5951#issuecomment-400986673 +--- + spec/compiler/compiler_spec.cr | 4 ++-- + spec/compiler/spec_helper.cr | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/spec/compiler/compiler_spec.cr b/spec/compiler/compiler_spec.cr +index 7fdbca20db..426a5324e0 100644 +--- a/spec/compiler/compiler_spec.cr ++++ b/spec/compiler/compiler_spec.cr +@@ -4,7 +4,7 @@ require "./spec_helper" + describe "Compiler" do + it "compiles a file" do + with_tempfile "compiler_spec_output" do |path| +- Crystal::Command.run ["build", datapath("compiler_sample"), "-o", path] ++ Crystal::Command.run ["build", compiler_datapath("compiler_sample"), "-o", path] + + File.exists?(path).should be_true + +@@ -13,7 +13,7 @@ describe "Compiler" do + end + + it "runs subcommand in preference to a filename " do +- Dir.cd datapath do ++ Dir.cd compiler_datapath do + with_tempfile "compiler_spec_output" do |path| + Crystal::Command.run ["build", "compiler_sample", "-o", path] + +diff --git a/spec/compiler/spec_helper.cr b/spec/compiler/spec_helper.cr +index 536691a5ad..8a7e40b314 100644 +--- a/spec/compiler/spec_helper.cr ++++ b/spec/compiler/spec_helper.cr +@@ -1,6 +1,6 @@ + require "../spec_helper" + require "../support/tempfile" + +-def datapath(*components) ++def compiler_datapath(*components) + File.join("spec", "compiler", "data", *components) + end |