[arch-commits] Commit in shards/trunk (PKGBUILD fix_build.patch)

[Anatol Pomozov]

    Date: Sunday, June 21, 2020 @ 18:06:07
  Author: anatolik
Revision: 649854

upgpkg: shards 0.11.0-1

Modified:
  shards/trunk/PKGBUILD
Deleted:
  shards/trunk/fix_build.patch

-----------------+
 PKGBUILD        |   18 +++++----------
 fix_build.patch |   64 ------------------------------------------------------
 2 files changed, 6 insertions(+), 76 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-21 17:57:58 UTC (rev 649853)
+++ PKGBUILD	2020-06-21 18:06:07 UTC (rev 649854)
@@ -2,27 +2,21 @@
 # Contributor: Jonne Haß <me at jhass.eu>
 
 pkgname=shards
-pkgver=0.10.0
+pkgver=0.11.0
 pkgrel=1
 pkgdesc='The package manager for the Crystal language'
 arch=(x86_64)
 url='https://github.com/crystal-lang/shards'
 license=(Apache)
-depends=(libyaml git pcre libevent gc)
+depends=(libyaml git libevent gc)
 makedepends=(crystal)
-source=(shards-$pkgver.tar.gz::https://github.com/crystal-lang/shards/archive/v$pkgver.tar.gz
-        fix_build.patch) # a few upstream changes to fix the build
-sha256sums=('3aea420df959552d1866d473c878ab1ed0b58489c4c9881ef40a170cfb775459'
-            '61f1a81bd3d6e386de8746fffd7f9bc1ac6db6b5a82f18fd901fd5c5edf7a09c')
+checkdepends=(git)
+source=(shards-$pkgver.tar.gz::https://github.com/crystal-lang/shards/archive/v$pkgver.tar.gz)
+sha256sums=('d1b58ec81c6acc2bf7ecad4e2868e05f74a57647318a167c7324f706b568bfff')
 
-prepare() {
-  cd shards-$pkgver
-  patch -p1 < ../fix_build.patch
-}
-
 build() {
   cd shards-$pkgver
-  CRYSTAL_OPTS=--release make -j1
+  CRYSTAL_OPTS="--release" make
 }
 
 check() {

Deleted: fix_build.patch
===================================================================
--- fix_build.patch	2020-06-21 17:57:58 UTC (rev 649853)
+++ fix_build.patch	2020-06-21 18:06:07 UTC (rev 649854)
@@ -1,64 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 0d0b989..35d5543 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,26 +1,29 @@
- .POSIX:
- 
- CRYSTAL = crystal
--CRFLAGS =
-+SHARDS = shards
- SHARDS_SOURCES = $(shell find src -name '*.cr')
--MOLINILLO_SOURCES = $(shell find lib/molinillo -name '*.cr')
-+MOLINILLO_SOURCES = $(shell find lib/molinillo -name '*.cr' 2> /dev/null)
- SOURCES = $(SHARDS_SOURCES) $(MOLINILLO_SOURCES)
- TEMPLATES = src/templates/*.ecr
- 
--DESTDIR =
--PREFIX = /usr/local
--BINDIR = $(DESTDIR)$(PREFIX)/bin
--MANDIR = $(DESTDIR)$(PREFIX)/share/man
--INSTALL = /usr/bin/install
-+DESTDIR ?=
-+PREFIX ?= /usr/local
-+BINDIR ?= $(DESTDIR)$(PREFIX)/bin
-+MANDIR ?= $(DESTDIR)$(PREFIX)/share/man
-+INSTALL ?= /usr/bin/install
-+
-+MOLINILLO_VERSION = $(shell $(CRYSTAL) eval 'require "yaml"; puts YAML.parse(File.read("shard.lock"))["shards"]["molinillo"]["version"]')
-+MOLINILLO_URL = "https://github.com/crystal-lang/crystal-molinillo/archive/v$(MOLINILLO_VERSION).tar.gz"
- 
- all: bin/shards
- 
- clean: phony
- 	rm -f bin/shards
- 
--bin/shards: $(SOURCES) $(TEMPLATES)
-+bin/shards: $(SOURCES) $(TEMPLATES) lib
- 	@mkdir -p bin
--	$(CRYSTAL) build src/shards.cr -o bin/shards $(CRFLAGS)
-+	$(CRYSTAL) build src/shards.cr -o bin/shards
- 
- install: bin/shards phony
- 	$(INSTALL) -m 0755 -d "$(BINDIR)" "$(MANDIR)/man1" "$(MANDIR)/man5"
-@@ -35,10 +38,17 @@ uninstall: phony
- 
- test: test_unit test_integration
- 
--test_unit: phony
--	$(CRYSTAL) spec ./spec/unit/*_spec.cr
-+test_unit: phony lib
-+	$(CRYSTAL) spec ./spec/unit/
- 
- test_integration: bin/shards phony
--	$(CRYSTAL) spec ./spec/integration/*_spec.cr
-+	$(CRYSTAL) spec ./spec/integration/
-+
-+lib: shard.lock
-+	mkdir -p lib/molinillo
-+	$(SHARDS) install || (curl -L $(MOLINILLO_URL) | tar -xzf - -C lib/molinillo --strip-components=1)
-+
-+shard.lock: shard.yml
-+	$(SHARDS) update
- 
- phony: