[PR PATCH] delta: update to 0.1.1

[PR PATCH] delta: update to 0.1.1

[imbsky]

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is a new pull request by imbsky against master on the void-packages repository

https://github.com/imbsky/void-packages delta-0.1.1
https://github.com/void-linux/void-packages/pull/22317

delta: update to 0.1.1


A patch file from https://github.com/void-linux/void-packages/pull/22317.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-delta-0.1.1-22317.patch --]
[-- Type: text/x-diff, Size: 970 bytes --]

From a5a4c4fd36aebc80b2065162aa94a02b7895da77 Mon Sep 17 00:00:00 2001
From: Sora Morimoto <git@bsky.moe>
Date: Tue, 26 May 2020 23:26:10 +0900
Subject: [PATCH] delta: update to 0.1.1

---
 srcpkgs/delta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index 3c3a12b37e7..ca6c80802db 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,6 +1,6 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.0.17
+version=0.1.1
 revision=1
 build_style=cargo
 short_desc="Syntax-highlighting pager for git"
@@ -8,7 +8,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ac1f26ac5ea10d43b300675189c49437dcae7a9fca7e51f615058ab0550d27e5
+checksum=50519e97310b54ddb485635ac8e0984670d4ae64fc7fd4a5ed2b67cc6b77347f
 
 post_install() {
 	vlicense LICENSE

Re: [PR PATCH] [Updated] delta: update to 0.1.1

[imbsky]

[-- Attachment #1: Type: text/plain, Size: 314 bytes --]

There is an updated pull request by imbsky against master on the void-packages repository

https://github.com/imbsky/void-packages delta-0.1.1
https://github.com/void-linux/void-packages/pull/22317

delta: update to 0.1.1


A patch file from https://github.com/void-linux/void-packages/pull/22317.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-delta-0.1.1-22317.patch --]
[-- Type: text/x-diff, Size: 974 bytes --]

From ce81c814ac6a1073a0cf2e1063e0b9801e40ec46 Mon Sep 17 00:00:00 2001
From: Sora Morimoto <git@bsky.moe>
Date: Tue, 26 May 2020 23:50:53 +0900
Subject: [PATCH] delta: update to 0.1.1

---
 srcpkgs/delta/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index 3c3a12b37e7..1bef56a525c 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,14 +1,15 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.0.17
+version=0.1.1
 revision=1
 build_style=cargo
+depends="llvm"
 short_desc="Syntax-highlighting pager for git"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ac1f26ac5ea10d43b300675189c49437dcae7a9fca7e51f615058ab0550d27e5
+checksum=50519e97310b54ddb485635ac8e0984670d4ae64fc7fd4a5ed2b67cc6b77347f
 
 post_install() {
 	vlicense LICENSE

Re: delta: update to 0.1.1

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 192 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22317#issuecomment-634107218

Comment:
I think you might need to add clang to makedepends.

Re: delta: update to 0.1.1

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 231 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22317#issuecomment-634110381

Comment:
Or possibly add oniguruma as a dependency (I wonder if this would work for `bat` as well).

Re: delta: update to 0.1.1

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 327 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22317#issuecomment-634110381

Comment:
Or possibly add oniguruma as a dependency (I wonder if this would work for `bat` as well).

EDIT: bat already has oniguruma-devel as a dependency, but it's not being used in the build.

Re: [PR PATCH] [Updated] delta: update to 0.1.1

[imbsky]

[-- Attachment #1: Type: text/plain, Size: 314 bytes --]

There is an updated pull request by imbsky against master on the void-packages repository

https://github.com/imbsky/void-packages delta-0.1.1
https://github.com/void-linux/void-packages/pull/22317

delta: update to 0.1.1


A patch file from https://github.com/void-linux/void-packages/pull/22317.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-delta-0.1.1-22317.patch --]
[-- Type: text/x-diff, Size: 1031 bytes --]

From 196221a3db31d6ddbdb283bb381ba15ac01cf68f Mon Sep 17 00:00:00 2001
From: Sora Morimoto <git@bsky.moe>
Date: Wed, 27 May 2020 00:55:00 +0900
Subject: [PATCH] delta: update to 0.1.1

---
 srcpkgs/delta/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index 3c3a12b37e7..ca5c215d4af 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,14 +1,17 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.0.17
+version=0.1.1
 revision=1
 build_style=cargo
+build_helper="rust"
+hostmakedepends="pkg-config"
+makedepends="llvm"
 short_desc="Syntax-highlighting pager for git"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ac1f26ac5ea10d43b300675189c49437dcae7a9fca7e51f615058ab0550d27e5
+checksum=50519e97310b54ddb485635ac8e0984670d4ae64fc7fd4a5ed2b67cc6b77347f
 
 post_install() {
 	vlicense LICENSE

Re: delta: update to 0.1.1

[imbsky]

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]

New comment by imbsky on void-packages repository

https://github.com/void-linux/void-packages/pull/22317#issuecomment-634129681

Comment:
Oh thanks for your advice.

Re: delta: update to 0.1.1

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 273 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22317#issuecomment-634129937

Comment:
Could you take a look at the template for `bat`? It has some useful info. It does link with oniguruma, but uses `libonig.a` instead.

Re: delta: update to 0.1.1

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 298 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22317#issuecomment-634129937

Comment:
Could you take a look at the template for `bat`? It has some useful info. It does link with oniguruma, 
but uses `libonig.a` instead.

EDIT: no problem c:

Re: [PR PATCH] [Updated] delta: update to 0.1.1

[imbsky]

[-- Attachment #1: Type: text/plain, Size: 314 bytes --]

There is an updated pull request by imbsky against master on the void-packages repository

https://github.com/imbsky/void-packages delta-0.1.1
https://github.com/void-linux/void-packages/pull/22317

delta: update to 0.1.1


A patch file from https://github.com/void-linux/void-packages/pull/22317.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-delta-0.1.1-22317.patch --]
[-- Type: text/x-diff, Size: 1014 bytes --]

From e5c7744bb969c0fe2db6bd4097812db376e05ccf Mon Sep 17 00:00:00 2001
From: Sora Morimoto <git@bsky.moe>
Date: Wed, 27 May 2020 03:48:57 +0900
Subject: [PATCH] delta: update to 0.1.1

---
 srcpkgs/delta/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index 3c3a12b37e7..7a93ce99d16 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,14 +1,16 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.0.17
+version=0.1.1
 revision=1
 build_style=cargo
+hostmakedepends="llvm"
+makedepends="oniguruma-devel"
 short_desc="Syntax-highlighting pager for git"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ac1f26ac5ea10d43b300675189c49437dcae7a9fca7e51f615058ab0550d27e5
+checksum=50519e97310b54ddb485635ac8e0984670d4ae64fc7fd4a5ed2b67cc6b77347f
 
 post_install() {
 	vlicense LICENSE

Re: delta: update to 0.1.1

[imbsky]

[-- Attachment #1: Type: text/plain, Size: 167 bytes --]

New comment by imbsky on void-packages repository

https://github.com/void-linux/void-packages/pull/22317#issuecomment-634129681

Comment:
Oh thanks for your pointer.

Re: [PR PATCH] [Updated] delta: update to 0.1.1

[imbsky]

[-- Attachment #1: Type: text/plain, Size: 314 bytes --]

There is an updated pull request by imbsky against master on the void-packages repository

https://github.com/imbsky/void-packages delta-0.1.1
https://github.com/void-linux/void-packages/pull/22317

delta: update to 0.1.1


A patch file from https://github.com/void-linux/void-packages/pull/22317.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-delta-0.1.1-22317.patch --]
[-- Type: text/x-diff, Size: 1020 bytes --]

From 7361cbab68d7fadf29682bbe1c190996fc2ca8d2 Mon Sep 17 00:00:00 2001
From: Sora Morimoto <git@bsky.moe>
Date: Wed, 27 May 2020 04:11:05 +0900
Subject: [PATCH] delta: update to 0.1.1

---
 srcpkgs/delta/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index 3c3a12b37e7..97769c2deed 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,14 +1,16 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.0.17
+version=0.1.1
 revision=1
 build_style=cargo
+hostmakedepends="llvm clang"
+makedepends="oniguruma-devel"
 short_desc="Syntax-highlighting pager for git"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ac1f26ac5ea10d43b300675189c49437dcae7a9fca7e51f615058ab0550d27e5
+checksum=50519e97310b54ddb485635ac8e0984670d4ae64fc7fd4a5ed2b67cc6b77347f
 
 post_install() {
 	vlicense LICENSE

Re: [PR PATCH] [Updated] delta: update to 0.1.1

[imbsky]

[-- Attachment #1: Type: text/plain, Size: 314 bytes --]

There is an updated pull request by imbsky against master on the void-packages repository

https://github.com/imbsky/void-packages delta-0.1.1
https://github.com/void-linux/void-packages/pull/22317

delta: update to 0.1.1


A patch file from https://github.com/void-linux/void-packages/pull/22317.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-delta-0.1.1-22317.patch --]
[-- Type: text/x-diff, Size: 1040 bytes --]

From 2ff7c79361640fad25929aefca951b43accf2953 Mon Sep 17 00:00:00 2001
From: Sora Morimoto <git@bsky.moe>
Date: Wed, 27 May 2020 04:38:15 +0900
Subject: [PATCH] delta: update to 0.1.1

---
 srcpkgs/delta/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index 3c3a12b37e7..8fec9374c26 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,14 +1,17 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.0.17
+version=0.1.1
 revision=1
 build_style=cargo
+build_helper=rust
+hostmakedepends="llvm clang"
+makedepends="oniguruma-devel"
 short_desc="Syntax-highlighting pager for git"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ac1f26ac5ea10d43b300675189c49437dcae7a9fca7e51f615058ab0550d27e5
+checksum=50519e97310b54ddb485635ac8e0984670d4ae64fc7fd4a5ed2b67cc6b77347f
 
 post_install() {
 	vlicense LICENSE

Re: [PR PATCH] [Updated] delta: update to 0.1.1

[imbsky]

[-- Attachment #1: Type: text/plain, Size: 314 bytes --]

There is an updated pull request by imbsky against master on the void-packages repository

https://github.com/imbsky/void-packages delta-0.1.1
https://github.com/void-linux/void-packages/pull/22317

delta: update to 0.1.1


A patch file from https://github.com/void-linux/void-packages/pull/22317.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-delta-0.1.1-22317.patch --]
[-- Type: text/x-diff, Size: 1143 bytes --]

From 89aa9bf0ebd429834a4481546c8078f73ee6b119 Mon Sep 17 00:00:00 2001
From: Sora Morimoto <git@bsky.moe>
Date: Wed, 27 May 2020 04:47:18 +0900
Subject: [PATCH] delta: update to 0.1.1

---
 srcpkgs/delta/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index 3c3a12b37e7..bf0a29494a1 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,14 +1,21 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.0.17
+version=0.1.1
 revision=1
 build_style=cargo
+hostmakedepends="llvm clang"
+makedepends="oniguruma-devel"
 short_desc="Syntax-highlighting pager for git"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ac1f26ac5ea10d43b300675189c49437dcae7a9fca7e51f615058ab0550d27e5
+checksum=50519e97310b54ddb485635ac8e0984670d4ae64fc7fd4a5ed2b67cc6b77347f
+
+pre_build() {
+	export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}"
+	export CC_${RUST_BUILD//-/_}="${BUILD_CC}"
+}
 
 post_install() {
 	vlicense LICENSE

Re: delta: update to 0.1.1

[imbsky]

[-- Attachment #1: Type: text/plain, Size: 189 bytes --]

New comment by imbsky on void-packages repository

https://github.com/void-linux/void-packages/pull/22317#issuecomment-634256652

Comment:
@ericonr Finally, the build passed. Thanks again.

Re: delta: update to 0.1.1

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 200 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22317#issuecomment-636394368

Comment:
@imbsky cool! It still required `clang` and `llvm` to work?

Re: delta: update to 0.1.1

[imbsky]

[-- Attachment #1: Type: text/plain, Size: 1057 bytes --]

New comment by imbsky on void-packages repository

https://github.com/void-linux/void-packages/pull/22317#issuecomment-636396311

Comment:
Probably yes.

```console
error: failed to run custom build command for `onig_sys v69.2.0`
Caused by:
  process didn't exit successfully: `/builddir/delta-0.1.1/target/release/build/onig_sys-10237aa0f829094d/build-script-build` (exit code: 101)
--- stdout
cargo:warning=couldn't execute `llvm-config --prefix` (error: No such file or directory (os error 2))
cargo:warning=set the LLVM_CONFIG_PATH environment variable to a valid `llvm-config` executable
--- stderr
thread 'main' panicked at 'Unable to find libclang: "couldn\'t find any valid shared libraries matching: [\'libclang.so\', \'libclang-*.so\', \'libclang.so.*\'], set the `LIBCLANG_PATH` environment variable to a path where one of these files can be found (invalid: [])"', /host/cargo/registry/src/github.com-1ecc6299db9ec823/bindgen-0.50.1/src/lib.rs:1711:13
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
```

Re: delta: update to 0.1.1

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22317#issuecomment-636413072

Comment:
That's weird, but ok. Just wondering why @abenson's version didn't need llvm, only clang. I do think it's best to depend on our own version of oniguruma, which yours does. Thanks for testing c:

Re: [PR PATCH] [Merged]: delta: update to 0.1.1

[abenson]

[-- Attachment #1: Type: text/plain, Size: 156 bytes --]

There's a merged pull request on the void-packages repository

delta: update to 0.1.1
https://github.com/void-linux/void-packages/pull/22317

Description:

Re: delta: update to 0.1.1.

[imbsky]

[-- Attachment #1: Type: text/plain, Size: 206 bytes --]

New comment by imbsky on void-packages repository

https://github.com/void-linux/void-packages/pull/22444#issuecomment-636388665

Comment:
Duplicated: https://github.com/void-linux/void-packages/pull/22317