* [PR PATCH] notcurses: update to 2.3.15.
@ 2021-08-18 16:47 mobinmob
2021-08-18 18:46 ` ericonr
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: mobinmob @ 2021-08-18 16:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]
There is a new pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages notcurses
https://github.com/void-linux/void-packages/pull/32563
notcurses: update to 2.3.15.
<!-- 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/32563.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-notcurses-32563.patch --]
[-- Type: text/x-diff, Size: 1139 bytes --]
From 4a46d5f0f99328ca4779c2cdc16a63b437e8eeea Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Aug 2021 19:46:39 +0300
Subject: [PATCH] notcurses: update to 2.3.15.
---
srcpkgs/notcurses/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 0023919a6ace..bf3105ee75c3 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
# Template file for 'notcurses'
pkgname=notcurses
-version=2.3.13
+version=2.3.15
revision=1
build_style=cmake
configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
+checksum=146e83723e5f5c486b9f16ec11b70ad682e76b6d01f10e4d9c27d07f3de72811
build_options="man"
desc_option_man="Use pandoc for manpages"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: notcurses: update to 2.3.15.
2021-08-18 16:47 [PR PATCH] notcurses: update to 2.3.15 mobinmob
@ 2021-08-18 18:46 ` ericonr
2021-08-18 18:58 ` mobinmob
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-08-18 18:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2306 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32563#issuecomment-901346788
Comment:
```
[263/392] Building CXX object CMakeFiles/ncls.dir/src/ls/main.cpp.o
FAILED: CMakeFiles/ncls.dir/src/ls/main.cpp.o
/builddir/.xbps-notcurses/wrappers/arm-linux-musleabihf-c++ -D_DEFAULT_SOURCE -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -I/builddir/notcurses-2.3.15/include -I/builddir/notcurses-2.3.15/src -I/builddir/notcurses-2.3.15 -I/builddir/notcurses-2.3.15/build/include -DNDEBUG -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard -I/usr/arm-linux-musleabihf/usr/include -fvisibility=hidden -Wall -Wextra -W -Wshadow -Wformat -Wformat-security -fexceptions -fstrict-aliasing -std=c++17 -MD -MT CMakeFiles/ncls.dir/src/ls/main.cpp.o -MF CMakeFiles/ncls.dir/src/ls/main.cpp.o.d -o CMakeFiles/ncls.dir/src/ls/main.cpp.o -c /builddir/notcurses-2.3.15/src/ls/main.cpp
In file included from /builddir/notcurses-2.3.15/include/notcurses/notcurses.h:11,
from /builddir/notcurses-2.3.15/include/notcurses/direct.h:4,
from /builddir/notcurses-2.3.15/include/ncpp/Direct.hh:5,
from /builddir/notcurses-2.3.15/src/ls/main.cpp:16:
/usr/arm-linux-musleabihf/usr/include/string.h:69:7: error: declaration of 'char* strndup(const char*, size_t)' has a different exception specifier
69 | char *strndup (const char *, size_t);
| ^~~~~~~
In file included from /builddir/notcurses-2.3.15/src/ls/main.cpp:15:
/builddir/notcurses-2.3.15/src/compat/compat.h:82:7: note: from previous declaration 'char* strndup(const char*, size_t) noexcept'
82 | char* strndup(const char* str, size_t size) NOEXCEPT;
| ^~~~~~~
[264/392] Building CXX object CMakeFiles/ncplayer.dir/src/player/play.cpp.o
ninja: build stopped: subcommand failed.
=> ERROR: notcurses-2.3.15_1: do_build: '${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}' exited with 1
```
it's triggering compatibility function for `strndup` on musl, which then conflicts with the libc declaration. This is probably happening because it tests for `strndup` without defining `_GNU_SOURCE` or `_POSIX_C_SOURCE=200809L`. Should be simple to fix in the build system
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: notcurses: update to 2.3.15.
2021-08-18 16:47 [PR PATCH] notcurses: update to 2.3.15 mobinmob
2021-08-18 18:46 ` ericonr
@ 2021-08-18 18:58 ` mobinmob
2021-08-18 19:10 ` [PR PATCH] [Updated] " mobinmob
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: mobinmob @ 2021-08-18 18:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2406 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/32563#issuecomment-901353928
Comment:
> ```
> [263/392] Building CXX object CMakeFiles/ncls.dir/src/ls/main.cpp.o
> FAILED: CMakeFiles/ncls.dir/src/ls/main.cpp.o
> /builddir/.xbps-notcurses/wrappers/arm-linux-musleabihf-c++ -D_DEFAULT_SOURCE -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -I/builddir/notcurses-2.3.15/include -I/builddir/notcurses-2.3.15/src -I/builddir/notcurses-2.3.15 -I/builddir/notcurses-2.3.15/build/include -DNDEBUG -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard -I/usr/arm-linux-musleabihf/usr/include -fvisibility=hidden -Wall -Wextra -W -Wshadow -Wformat -Wformat-security -fexceptions -fstrict-aliasing -std=c++17 -MD -MT CMakeFiles/ncls.dir/src/ls/main.cpp.o -MF CMakeFiles/ncls.dir/src/ls/main.cpp.o.d -o CMakeFiles/ncls.dir/src/ls/main.cpp.o -c /builddir/notcurses-2.3.15/src/ls/main.cpp
> In file included from /builddir/notcurses-2.3.15/include/notcurses/notcurses.h:11,
> from /builddir/notcurses-2.3.15/include/notcurses/direct.h:4,
> from /builddir/notcurses-2.3.15/include/ncpp/Direct.hh:5,
> from /builddir/notcurses-2.3.15/src/ls/main.cpp:16:
> /usr/arm-linux-musleabihf/usr/include/string.h:69:7: error: declaration of 'char* strndup(const char*, size_t)' has a different exception specifier
> 69 | char *strndup (const char *, size_t);
> | ^~~~~~~
> In file included from /builddir/notcurses-2.3.15/src/ls/main.cpp:15:
> /builddir/notcurses-2.3.15/src/compat/compat.h:82:7: note: from previous declaration 'char* strndup(const char*, size_t) noexcept'
> 82 | char* strndup(const char* str, size_t size) NOEXCEPT;
> | ^~~~~~~
> [264/392] Building CXX object CMakeFiles/ncplayer.dir/src/player/play.cpp.o
> ninja: build stopped: subcommand failed.
> => ERROR: notcurses-2.3.15_1: do_build: '${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}' exited with 1
> ```
>
> it's triggering compatibility function for `strndup` on musl, which then conflicts with the libc declaration. This is probably happening because it tests for `strndup` without defining `_GNU_SOURCE` or `_POSIX_C_SOURCE=200809L`. Should be simple to fix in the build system
https://github.com/dankamongmen/notcurses/issues/2073
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] notcurses: update to 2.3.15.
2021-08-18 16:47 [PR PATCH] notcurses: update to 2.3.15 mobinmob
2021-08-18 18:46 ` ericonr
2021-08-18 18:58 ` mobinmob
@ 2021-08-18 19:10 ` mobinmob
2021-08-18 19:12 ` mobinmob
2021-08-18 22:21 ` [PR PATCH] [Merged]: " ericonr
4 siblings, 0 replies; 6+ messages in thread
From: mobinmob @ 2021-08-18 19:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1599 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages notcurses
https://github.com/void-linux/void-packages/pull/32563
notcurses: update to 2.3.15.
<!-- 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/32563.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-notcurses-32563.patch --]
[-- Type: text/x-diff, Size: 2326 bytes --]
From a23114da5877fc76da8dee6a3fd43e5858d2b1f5 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Aug 2021 19:46:39 +0300
Subject: [PATCH] notcurses: update to 2.3.15.
---
...6a2480f047b3d4517a8d4db9a9a43d523fe84.diff | 31 +++++++++++++++++++
srcpkgs/notcurses/template | 4 +--
2 files changed, 33 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/notcurses/patches/6296a2480f047b3d4517a8d4db9a9a43d523fe84.diff
diff --git a/srcpkgs/notcurses/patches/6296a2480f047b3d4517a8d4db9a9a43d523fe84.diff b/srcpkgs/notcurses/patches/6296a2480f047b3d4517a8d4db9a9a43d523fe84.diff
new file mode 100644
index 000000000000..62dd0d3e7dbf
--- /dev/null
+++ b/srcpkgs/notcurses/patches/6296a2480f047b3d4517a8d4db9a9a43d523fe84.diff
@@ -0,0 +1,31 @@
+diff --git a/src/compat/compat.h b/src/compat/compat.h
+index 72da2c3b1..a28439193 100644
+--- a/src/compat/compat.h
++++ b/src/compat/compat.h
+@@ -3,13 +3,6 @@
+
+ #ifdef __cplusplus
+ extern "C" {
+-#ifdef __linux__
+-#define NOEXCEPT noexcept
+-#else
+-#define NOEXCEPT
+-#endif
+-#else
+-#define NOEXCEPT
+ #endif
+
+ #include <time.h>
+@@ -79,10 +72,10 @@ int clock_nanosleep(clockid_t clockid, int flags,
+ const struct timespec *request,
+ struct timespec *remain);
+
+-char* strndup(const char* str, size_t size) NOEXCEPT;
+-
+ #ifdef __cplusplus
+ }
++#else
++char* strndup(const char* str, size_t size);
+ #endif
+
+ #endif
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 0023919a6ace..bf3105ee75c3 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
# Template file for 'notcurses'
pkgname=notcurses
-version=2.3.13
+version=2.3.15
revision=1
build_style=cmake
configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
+checksum=146e83723e5f5c486b9f16ec11b70ad682e76b6d01f10e4d9c27d07f3de72811
build_options="man"
desc_option_man="Use pandoc for manpages"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: notcurses: update to 2.3.15.
2021-08-18 16:47 [PR PATCH] notcurses: update to 2.3.15 mobinmob
` (2 preceding siblings ...)
2021-08-18 19:10 ` [PR PATCH] [Updated] " mobinmob
@ 2021-08-18 19:12 ` mobinmob
2021-08-18 22:21 ` [PR PATCH] [Merged]: " ericonr
4 siblings, 0 replies; 6+ messages in thread
From: mobinmob @ 2021-08-18 19:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 208 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/32563#issuecomment-901353928
Comment:
@ericonr
https://github.com/dankamongmen/notcurses/issues/2073
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: notcurses: update to 2.3.15.
2021-08-18 16:47 [PR PATCH] notcurses: update to 2.3.15 mobinmob
` (3 preceding siblings ...)
2021-08-18 19:12 ` mobinmob
@ 2021-08-18 22:21 ` ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-08-18 22:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1439 bytes --]
There's a merged pull request on the void-packages repository
notcurses: update to 2.3.15.
https://github.com/void-linux/void-packages/pull/32563
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
-->
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-08-18 22:21 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-18 16:47 [PR PATCH] notcurses: update to 2.3.15 mobinmob
2021-08-18 18:46 ` ericonr
2021-08-18 18:58 ` mobinmob
2021-08-18 19:10 ` [PR PATCH] [Updated] " mobinmob
2021-08-18 19:12 ` mobinmob
2021-08-18 22:21 ` [PR PATCH] [Merged]: " ericonr
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).