Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [WIP] nnn: update to 4.1
@ 2021-06-02 16:00 FollieHiyuki
  2021-06-02 16:34 ` ericonr
                   ` (16 more replies)
  0 siblings, 17 replies; 18+ messages in thread
From: FollieHiyuki @ 2021-06-02 16:00 UTC (permalink / raw)
  To: ml

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

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

https://github.com/FollieHiyuki/void-packages nnn-update
https://github.com/void-linux/void-packages/pull/31261

[WIP] nnn: update to 4.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

`nnn` now uses fts for disk usage calculation.
They also introduce patching system, and I'm hesitating to include the official git status patch (all we need to do is addding 1 build flag, and `libgit2-devel` to hostmakedepends).
I can compile with `x86_64-linux-musl-gcc` on my system (x86_64-musl), using `cc` fails build. I don't know how to do this nicely in the template for other archs.


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nnn-update-31261.patch --]
[-- Type: text/x-diff, Size: 1189 bytes --]

From 80d5a67dfca7720154685b0e9e20d2d562631447 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 2 Jun 2021 18:54:09 +0300
Subject: [PATCH] nnn: update to 4.1

---
 srcpkgs/nnn/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nnn/template b/srcpkgs/nnn/template
index 7d905198b749..ea16965d7698 100644
--- a/srcpkgs/nnn/template
+++ b/srcpkgs/nnn/template
@@ -1,7 +1,7 @@
 # Template file for 'nnn'
 pkgname=nnn
-version=4.0
-revision=2
+version=4.1
+revision=1
 build_style=gnu-makefile
 make_install_target="install install-desktop"
 hostmakedepends="pkg-config"
@@ -12,7 +12,11 @@ license="BSD-2-Clause"
 homepage="https://github.com/jarun/nnn"
 changelog="https://raw.githubusercontent.com/jarun/nnn/master/CHANGELOG"
 distfiles="https://github.com/jarun/nnn/archive/v${version}.tar.gz"
-checksum=a219ec8fad3dd0512aadae5840176f3265188c4c22da3b17b133bac602b40754
+checksum=8549ac5f3007337da4841e62da696507e753035f36ac4e0537502e261ce701e6
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-fts-devel"
+fi
 
 post_install() {
 	vinstall misc/auto-completion/bash/nnn-completion.bash 644 \

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [WIP] nnn: update to 4.1
  2021-06-02 16:00 [PR PATCH] [WIP] nnn: update to 4.1 FollieHiyuki
@ 2021-06-02 16:34 ` ericonr
  2021-06-02 16:34 ` ericonr
                   ` (15 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2021-06-02 16:34 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31261#issuecomment-853176978

Comment:
>  They also introduce patching system, and I'm hesitating to include the official git status patch (all we need to do is addding 1 build flag, and libgit2-devel to hostmakedepends).

I'd wait for someone to ask for it (and probably not even then).

> nnn now uses fts for disk usage calculation.

You're missing something to make it link against `libfts`. In `pre_build` do `export LDLIBS=-lfts`.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [WIP] nnn: update to 4.1
  2021-06-02 16:00 [PR PATCH] [WIP] nnn: update to 4.1 FollieHiyuki
  2021-06-02 16:34 ` ericonr
@ 2021-06-02 16:34 ` ericonr
  2021-06-02 16:43 ` [PR PATCH] [Updated] " FollieHiyuki
                   ` (14 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2021-06-02 16:34 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31261#issuecomment-853176978

Comment:
>  They also introduce patching system, and I'm hesitating to include the official git status patch (all we need to do is addding 1 build flag, and libgit2-devel to hostmakedepends).

I'd wait for someone to ask for it (and probably not even then).

> nnn now uses fts for disk usage calculation.

You're missing something to make it link against `libfts`. In `pre_build` do `export LDLIBS=-lfts` for musl.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] nnn: update to 4.1
  2021-06-02 16:00 [PR PATCH] [WIP] nnn: update to 4.1 FollieHiyuki
  2021-06-02 16:34 ` ericonr
  2021-06-02 16:34 ` ericonr
@ 2021-06-02 16:43 ` FollieHiyuki
  2021-06-02 16:44 ` FollieHiyuki
                   ` (13 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: FollieHiyuki @ 2021-06-02 16:43 UTC (permalink / raw)
  To: ml

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

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

https://github.com/FollieHiyuki/void-packages nnn-update
https://github.com/void-linux/void-packages/pull/31261

[WIP] nnn: update to 4.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

`nnn` now uses fts for disk usage calculation.
They also introduce patching system, and I'm hesitating to include the official git status patch (all we need to do is addding 1 build flag, and `libgit2-devel` to hostmakedepends).
I can compile with `x86_64-linux-musl-gcc` on my system (x86_64-musl), using `cc` fails build. I don't know how to do this nicely in the template for other archs.


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nnn-update-31261.patch --]
[-- Type: text/x-diff, Size: 1288 bytes --]

From ea4e9ded15e6c851ee1e056dafe0d43e1a6c6a14 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 2 Jun 2021 18:54:09 +0300
Subject: [PATCH] nnn: update to 4.1

---
 srcpkgs/nnn/template | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nnn/template b/srcpkgs/nnn/template
index 7d905198b749..c1a41dec0ab1 100644
--- a/srcpkgs/nnn/template
+++ b/srcpkgs/nnn/template
@@ -1,7 +1,7 @@
 # Template file for 'nnn'
 pkgname=nnn
-version=4.0
-revision=2
+version=4.1
+revision=1
 build_style=gnu-makefile
 make_install_target="install install-desktop"
 hostmakedepends="pkg-config"
@@ -12,7 +12,17 @@ license="BSD-2-Clause"
 homepage="https://github.com/jarun/nnn"
 changelog="https://raw.githubusercontent.com/jarun/nnn/master/CHANGELOG"
 distfiles="https://github.com/jarun/nnn/archive/v${version}.tar.gz"
-checksum=a219ec8fad3dd0512aadae5840176f3265188c4c22da3b17b133bac602b40754
+checksum=8549ac5f3007337da4841e62da696507e753035f36ac4e0537502e261ce701e6
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-fts-devel"
+fi
+
+pre_build() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		export LDLIBS=-lfts
+	fi
+}
 
 post_install() {
 	vinstall misc/auto-completion/bash/nnn-completion.bash 644 \

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [WIP] nnn: update to 4.1
  2021-06-02 16:00 [PR PATCH] [WIP] nnn: update to 4.1 FollieHiyuki
                   ` (2 preceding siblings ...)
  2021-06-02 16:43 ` [PR PATCH] [Updated] " FollieHiyuki
@ 2021-06-02 16:44 ` FollieHiyuki
  2021-06-02 16:56 ` ericonr
                   ` (12 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: FollieHiyuki @ 2021-06-02 16:44 UTC (permalink / raw)
  To: ml

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

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/31261#issuecomment-853189031

Comment:
Thanks. It builds now.


^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [WIP] nnn: update to 4.1
  2021-06-02 16:00 [PR PATCH] [WIP] nnn: update to 4.1 FollieHiyuki
                   ` (3 preceding siblings ...)
  2021-06-02 16:44 ` FollieHiyuki
@ 2021-06-02 16:56 ` ericonr
  2021-06-02 16:58 ` [PR PATCH] [Updated] " FollieHiyuki
                   ` (11 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2021-06-02 16:56 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31261#issuecomment-853214284

Comment:
And import the `.c` part of https://github.com/jarun/nnn/commit/ccce80a1e91b99c58d1a4e1453b5238036e84f22

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] nnn: update to 4.1
  2021-06-02 16:00 [PR PATCH] [WIP] nnn: update to 4.1 FollieHiyuki
                   ` (4 preceding siblings ...)
  2021-06-02 16:56 ` ericonr
@ 2021-06-02 16:58 ` FollieHiyuki
  2021-06-02 17:04 ` FollieHiyuki
                   ` (10 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: FollieHiyuki @ 2021-06-02 16:58 UTC (permalink / raw)
  To: ml

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

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

https://github.com/FollieHiyuki/void-packages nnn-update
https://github.com/void-linux/void-packages/pull/31261

[WIP] nnn: update to 4.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

`nnn` now uses fts for disk usage calculation.
They also introduce patching system, and I'm hesitating to include the official git status patch (all we need to do is addding 1 build flag, and `libgit2-devel` to hostmakedepends).
I can compile with `x86_64-linux-musl-gcc` on my system (x86_64-musl), using `cc` fails build. I don't know how to do this nicely in the template.


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nnn-update-31261.patch --]
[-- Type: text/x-diff, Size: 1393 bytes --]

From cc1b8d7be66befe88b531bb9547c91fce078f954 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 2 Jun 2021 18:54:09 +0300
Subject: [PATCH] nnn: update to 4.1

---
 srcpkgs/nnn/template | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nnn/template b/srcpkgs/nnn/template
index 7d905198b749..2d5381eb3ec7 100644
--- a/srcpkgs/nnn/template
+++ b/srcpkgs/nnn/template
@@ -1,7 +1,7 @@
 # Template file for 'nnn'
 pkgname=nnn
-version=4.0
-revision=2
+version=4.1
+revision=1
 build_style=gnu-makefile
 make_install_target="install install-desktop"
 hostmakedepends="pkg-config"
@@ -12,7 +12,22 @@ license="BSD-2-Clause"
 homepage="https://github.com/jarun/nnn"
 changelog="https://raw.githubusercontent.com/jarun/nnn/master/CHANGELOG"
 distfiles="https://github.com/jarun/nnn/archive/v${version}.tar.gz"
-checksum=a219ec8fad3dd0512aadae5840176f3265188c4c22da3b17b133bac602b40754
+checksum=8549ac5f3007337da4841e62da696507e753035f36ac4e0537502e261ce701e6
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-fts-devel"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	CFLAGS="-latomic"
+fi
+
+pre_build() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		export LDLIBS=-lfts
+	fi
+}
 
 post_install() {
 	vinstall misc/auto-completion/bash/nnn-completion.bash 644 \

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] nnn: update to 4.1
  2021-06-02 16:00 [PR PATCH] [WIP] nnn: update to 4.1 FollieHiyuki
                   ` (5 preceding siblings ...)
  2021-06-02 16:58 ` [PR PATCH] [Updated] " FollieHiyuki
@ 2021-06-02 17:04 ` FollieHiyuki
  2021-06-03 20:58 ` FollieHiyuki
                   ` (9 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: FollieHiyuki @ 2021-06-02 17:04 UTC (permalink / raw)
  To: ml

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

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

https://github.com/FollieHiyuki/void-packages nnn-update
https://github.com/void-linux/void-packages/pull/31261

[WIP] nnn: update to 4.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

`nnn` now uses fts for disk usage calculation.
They also introduce patching system, and I'm hesitating to include the official git status patch (all we need to do is addding 1 build flag, and `libgit2-devel` to hostmakedepends).
I can compile with `x86_64-linux-musl-gcc` on my system (x86_64-musl), using `cc` fails build. I don't know how to do this nicely in the template.


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nnn-update-31261.patch --]
[-- Type: text/x-diff, Size: 2142 bytes --]

From 6912a01f1c9dea973e69d1e4bb95ad704950b366 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 2 Jun 2021 18:54:09 +0300
Subject: [PATCH] nnn: update to 4.1

---
 srcpkgs/nnn/patches/no_atomic.patch | 15 +++++++++++++++
 srcpkgs/nnn/template                | 16 +++++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/nnn/patches/no_atomic.patch

diff --git a/srcpkgs/nnn/patches/no_atomic.patch b/srcpkgs/nnn/patches/no_atomic.patch
new file mode 100644
index 000000000000..2218275d2c98
--- /dev/null
+++ b/srcpkgs/nnn/patches/no_atomic.patch
@@ -0,0 +1,15 @@
+diff --git src/nnn.c src/nnn.c
+index d83d7f6..ebd2985 100644
+
+https://github.com/jarun/nnn/commit/ccce80a1e91b99c58d1a4e1453b5238036e84f22
+--- src/nnn.c
++++ src/nnn.c
+@@ -452,7 +452,7 @@ static pthread_mutex_t running_mutex = PTHREAD_MUTEX_INITIALIZER;
+ static pthread_mutex_t hardlink_mutex = PTHREAD_MUTEX_INITIALIZER;
+ static ulong_t *core_files;
+ static blkcnt_t *core_blocks;
+-static _Atomic volatile ulong_t num_files;
++static ulong_t num_files;
+ 
+ typedef struct {
+ 	char path[PATH_MAX];
diff --git a/srcpkgs/nnn/template b/srcpkgs/nnn/template
index 7d905198b749..c1a41dec0ab1 100644
--- a/srcpkgs/nnn/template
+++ b/srcpkgs/nnn/template
@@ -1,7 +1,7 @@
 # Template file for 'nnn'
 pkgname=nnn
-version=4.0
-revision=2
+version=4.1
+revision=1
 build_style=gnu-makefile
 make_install_target="install install-desktop"
 hostmakedepends="pkg-config"
@@ -12,7 +12,17 @@ license="BSD-2-Clause"
 homepage="https://github.com/jarun/nnn"
 changelog="https://raw.githubusercontent.com/jarun/nnn/master/CHANGELOG"
 distfiles="https://github.com/jarun/nnn/archive/v${version}.tar.gz"
-checksum=a219ec8fad3dd0512aadae5840176f3265188c4c22da3b17b133bac602b40754
+checksum=8549ac5f3007337da4841e62da696507e753035f36ac4e0537502e261ce701e6
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-fts-devel"
+fi
+
+pre_build() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		export LDLIBS=-lfts
+	fi
+}
 
 post_install() {
 	vinstall misc/auto-completion/bash/nnn-completion.bash 644 \

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] nnn: update to 4.1
  2021-06-02 16:00 [PR PATCH] [WIP] nnn: update to 4.1 FollieHiyuki
                   ` (6 preceding siblings ...)
  2021-06-02 17:04 ` FollieHiyuki
@ 2021-06-03 20:58 ` FollieHiyuki
  2021-06-03 21:12 ` ericonr
                   ` (8 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: FollieHiyuki @ 2021-06-03 20:58 UTC (permalink / raw)
  To: ml

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

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

https://github.com/FollieHiyuki/void-packages nnn-update
https://github.com/void-linux/void-packages/pull/31261

[WIP] nnn: update to 4.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

`nnn` now uses fts for disk usage calculation.
They also introduce patching system, and I'm hesitating to include the official git status patch (all we need to do is addding 1 build flag, and `libgit2-devel` to hostmakedepends).
I can compile with `x86_64-linux-musl-gcc` on my system (x86_64-musl), using `cc` fails build. I don't know how to do this nicely in the template.


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nnn-update-31261.patch --]
[-- Type: text/x-diff, Size: 1292 bytes --]

From 6a87344234874e80ff76222201dc5c2217280a64 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 2 Jun 2021 18:54:09 +0300
Subject: [PATCH] nnn: update to 4.1.1

---
 srcpkgs/nnn/template | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nnn/template b/srcpkgs/nnn/template
index 7d905198b749..11ad969d0fdd 100644
--- a/srcpkgs/nnn/template
+++ b/srcpkgs/nnn/template
@@ -1,7 +1,7 @@
 # Template file for 'nnn'
 pkgname=nnn
-version=4.0
-revision=2
+version=4.1.1
+revision=1
 build_style=gnu-makefile
 make_install_target="install install-desktop"
 hostmakedepends="pkg-config"
@@ -12,7 +12,17 @@ license="BSD-2-Clause"
 homepage="https://github.com/jarun/nnn"
 changelog="https://raw.githubusercontent.com/jarun/nnn/master/CHANGELOG"
 distfiles="https://github.com/jarun/nnn/archive/v${version}.tar.gz"
-checksum=a219ec8fad3dd0512aadae5840176f3265188c4c22da3b17b133bac602b40754
+checksum=f0e02668da6324c12c39db35fe5c26bd45f3e02e5684a351b8ce8a357419ceba
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-fts-devel"
+fi
+
+pre_build() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		export LDLIBS=-lfts
+	fi
+}
 
 post_install() {
 	vinstall misc/auto-completion/bash/nnn-completion.bash 644 \

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [WIP] nnn: update to 4.1
  2021-06-02 16:00 [PR PATCH] [WIP] nnn: update to 4.1 FollieHiyuki
                   ` (7 preceding siblings ...)
  2021-06-03 20:58 ` FollieHiyuki
@ 2021-06-03 21:12 ` ericonr
  2021-06-04 17:07 ` FollieHiyuki
                   ` (7 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2021-06-03 21:12 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31261#issuecomment-854183298

Comment:
No longer WIP, right?

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [WIP] nnn: update to 4.1
  2021-06-02 16:00 [PR PATCH] [WIP] nnn: update to 4.1 FollieHiyuki
                   ` (8 preceding siblings ...)
  2021-06-03 21:12 ` ericonr
@ 2021-06-04 17:07 ` FollieHiyuki
  2021-06-04 18:49 ` [PR PATCH] [Merged]: " ericonr
                   ` (6 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: FollieHiyuki @ 2021-06-04 17:07 UTC (permalink / raw)
  To: ml

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

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/31261#issuecomment-854880370

Comment:
Ah yes ready to be merged

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Merged]: nnn: update to 4.1
  2021-06-02 16:00 [PR PATCH] [WIP] nnn: update to 4.1 FollieHiyuki
                   ` (9 preceding siblings ...)
  2021-06-04 17:07 ` FollieHiyuki
@ 2021-06-04 18:49 ` ericonr
  2021-06-04 22:14 ` tuxliban
                   ` (5 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2021-06-04 18:49 UTC (permalink / raw)
  To: ml

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

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

nnn: update to 4.1
https://github.com/void-linux/void-packages/pull/31261

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

`nnn` now uses fts for disk usage calculation.
They also introduce patching system, and I'm hesitating to include the official git status patch (all we need to do is addding 1 build flag, and `libgit2-devel` to hostmakedepends).
I can compile with `x86_64-linux-musl-gcc` on my system (x86_64-musl), using `cc` fails build. I don't know how to do this nicely in the template.


^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: nnn: update to 4.1
  2021-06-02 16:00 [PR PATCH] [WIP] nnn: update to 4.1 FollieHiyuki
                   ` (10 preceding siblings ...)
  2021-06-04 18:49 ` [PR PATCH] [Merged]: " ericonr
@ 2021-06-04 22:14 ` tuxliban
  2021-06-04 22:18 ` tuxliban
                   ` (4 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: tuxliban @ 2021-06-04 22:14 UTC (permalink / raw)
  To: ml

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

New comment by tuxliban on void-packages repository

https://github.com/void-linux/void-packages/pull/31261#issuecomment-855038961

Comment:
A couple of hours ago I updated from version 4.0 to 4.1.1 and at the end of the program it presented errors both in its precompiled binary version, and with the one built manually using xbps-src.
In the following video I show the result of applying the update. I had to downgrade to keep using nnn
[https://youtu.be/iy3ZBdKekpg](url)

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: nnn: update to 4.1
  2021-06-02 16:00 [PR PATCH] [WIP] nnn: update to 4.1 FollieHiyuki
                   ` (11 preceding siblings ...)
  2021-06-04 22:14 ` tuxliban
@ 2021-06-04 22:18 ` tuxliban
  2021-06-04 22:20 ` tuxliban
                   ` (3 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: tuxliban @ 2021-06-04 22:18 UTC (permalink / raw)
  To: ml

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

New comment by tuxliban on void-packages repository

https://github.com/void-linux/void-packages/pull/31261#issuecomment-855038961

Comment:
A couple of hours ago I updated from version 4.0 to 4.1.1 and at the end of the program it presented errors both in its precompiled binary version, and with the one built manually using xbps-src. It should be said that I use the Void version with musl
In the following video I show the result of applying the update. I had to downgrade to keep using nnn
[https://youtu.be/iy3ZBdKekpg](url)

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: nnn: update to 4.1
  2021-06-02 16:00 [PR PATCH] [WIP] nnn: update to 4.1 FollieHiyuki
                   ` (12 preceding siblings ...)
  2021-06-04 22:18 ` tuxliban
@ 2021-06-04 22:20 ` tuxliban
  2021-06-04 23:20 ` sgn
                   ` (2 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: tuxliban @ 2021-06-04 22:20 UTC (permalink / raw)
  To: ml

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

New comment by tuxliban on void-packages repository

https://github.com/void-linux/void-packages/pull/31261#issuecomment-855038961

Comment:
> Ah, sí, listo para fusionarse

A couple of hours ago I updated from version 4.0 to 4.1.1 and at the end of the program it presented errors both in its precompiled binary version, and with the one built manually using xbps-src. It should be said that I use the Void version with musl
In the following video I show the result of applying the update. I had to downgrade to keep using nnn
[https://youtu.be/iy3ZBdKekpg](url)

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: nnn: update to 4.1
  2021-06-02 16:00 [PR PATCH] [WIP] nnn: update to 4.1 FollieHiyuki
                   ` (13 preceding siblings ...)
  2021-06-04 22:20 ` tuxliban
@ 2021-06-04 23:20 ` sgn
  2021-06-05  0:09 ` tuxliban
  2021-06-05 21:46 ` tuxliban
  16 siblings, 0 replies; 18+ messages in thread
From: sgn @ 2021-06-04 23:20 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/31261#issuecomment-855104550

Comment:
On 2021-06-04 15:15:08-0700, Tuxliban Torvalds ***@***.***> wrote:
> A couple of hours ago I updated from version 4.0 to 4.1.1 and at the
> end of the program it presented errors both in its precompiled
> binary version, and with the one built manually using xbps-src.
> In the following video I show the result of applying the update. I had to downgrade to keep using nnn
> [https://youtu.be/iy3ZBdKekpg](url)

What is your error? I guess it's blinking text?

What is your terminal emulator?

-- 
Danh


^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: nnn: update to 4.1
  2021-06-02 16:00 [PR PATCH] [WIP] nnn: update to 4.1 FollieHiyuki
                   ` (14 preceding siblings ...)
  2021-06-04 23:20 ` sgn
@ 2021-06-05  0:09 ` tuxliban
  2021-06-05 21:46 ` tuxliban
  16 siblings, 0 replies; 18+ messages in thread
From: tuxliban @ 2021-06-05  0:09 UTC (permalink / raw)
  To: ml

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

New comment by tuxliban on void-packages repository

https://github.com/void-linux/void-packages/pull/31261#issuecomment-855149773

Comment:
> What is your error? I guess it's blinking text? What is your terminal emulator?

Yes, the problem is the blinking text. The terminal I use is st

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: nnn: update to 4.1
  2021-06-02 16:00 [PR PATCH] [WIP] nnn: update to 4.1 FollieHiyuki
                   ` (15 preceding siblings ...)
  2021-06-05  0:09 ` tuxliban
@ 2021-06-05 21:46 ` tuxliban
  16 siblings, 0 replies; 18+ messages in thread
From: tuxliban @ 2021-06-05 21:46 UTC (permalink / raw)
  To: ml

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

New comment by tuxliban on void-packages repository

https://github.com/void-linux/void-packages/pull/31261#issuecomment-855038961

Comment:
> Ah, sí, listo para fusionarse

A couple of hours ago I updated from version 4.0 to 4.1.1 and at the end of the program it presented errors both in its precompiled binary version, and with the one built manually using xbps-src. It should be said that I use the Void version with musl
In the following video I show the result of applying the update. I had to downgrade to keep using nnn
https://youtu.be/iy3ZBdKekpg

^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2021-06-05 21:46 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-02 16:00 [PR PATCH] [WIP] nnn: update to 4.1 FollieHiyuki
2021-06-02 16:34 ` ericonr
2021-06-02 16:34 ` ericonr
2021-06-02 16:43 ` [PR PATCH] [Updated] " FollieHiyuki
2021-06-02 16:44 ` FollieHiyuki
2021-06-02 16:56 ` ericonr
2021-06-02 16:58 ` [PR PATCH] [Updated] " FollieHiyuki
2021-06-02 17:04 ` FollieHiyuki
2021-06-03 20:58 ` FollieHiyuki
2021-06-03 21:12 ` ericonr
2021-06-04 17:07 ` FollieHiyuki
2021-06-04 18:49 ` [PR PATCH] [Merged]: " ericonr
2021-06-04 22:14 ` tuxliban
2021-06-04 22:18 ` tuxliban
2021-06-04 22:20 ` tuxliban
2021-06-04 23:20 ` sgn
2021-06-05  0:09 ` tuxliban
2021-06-05 21:46 ` tuxliban

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).