[PR PATCH] growlight: patch to work with notcurses v2.2.6.

[PR PATCH] growlight: patch to work with notcurses v2.2.6.

[mobinmob]

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

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

https://github.com/mobinmob/void-packages growlight-update
https://github.com/void-linux/void-packages/pull/30233

growlight: patch to work with notcurses v2.2.6.
<!-- 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/30233.patch is attached

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

From 8ff206cee3c9d6d60694ad4e4e8112fd08e5e0e6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 14 Apr 2021 15:43:30 +0300
Subject: [PATCH] growlight: patch to work with notcurses v2.2.6.

---
 ...bad3daf23276167e28dedb73dcd1af4c9f826.diff | 43 +++++++++++++++++++
 srcpkgs/growlight/template                    |  2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/growlight/patches/1bfbad3daf23276167e28dedb73dcd1af4c9f826.diff

diff --git a/srcpkgs/growlight/patches/1bfbad3daf23276167e28dedb73dcd1af4c9f826.diff b/srcpkgs/growlight/patches/1bfbad3daf23276167e28dedb73dcd1af4c9f826.diff
new file mode 100644
index 000000000000..2f336ed7000f
--- /dev/null
+++ b/srcpkgs/growlight/patches/1bfbad3daf23276167e28dedb73dcd1af4c9f826.diff
@@ -0,0 +1,43 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9d85c10..4c1ad5f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,7 +34,7 @@ add_compile_options(-Wall -Wextra -W -Wshadow -Wformat -fexceptions)
+ find_package(PkgConfig REQUIRED)
+ find_package(Threads)
+ set_package_properties(Threads PROPERTIES TYPE REQUIRED)
+-find_package(Notcurses 2.1.8 CONFIG)
++find_package(Notcurses 2.2.6 CONFIG)
+ set_package_properties(Notcurses PROPERTIES TYPE REQUIRED)
+ pkg_check_modules(LIBATASMART REQUIRED libatasmart>=0.19)
+ pkg_check_modules(LIBBLKID REQUIRED blkid>=2.20.1)
+diff --git a/README.md b/README.md
+index c8ef069..ec250d2 100644
+--- a/README.md
++++ b/README.md
+@@ -22,7 +22,7 @@ Dependencies:
+  - libcryptsetup 2.1.5+
+  - libdevmapper 1.02.74+
+  - libnettle 3.5.1+
+- - libnotcurses 2.1.8+
++ - libnotcurses 2.2.6+
+  - libpci 3.1.9+
+  - libpciaccess 0.13.1+
+  - libreadline 8.0+
+diff --git a/src/notcurses/notcurses.c b/src/notcurses/notcurses.c
+index 1eaf143..a56a9d3 100644
+--- a/src/notcurses/notcurses.c
++++ b/src/notcurses/notcurses.c
+@@ -622,10 +622,10 @@ cmvwhline(struct ncplane* nc, int y, int x, const char* ch, int n){
+   }
+   c.channels = ncplane_channels(nc);
+   if(ncplane_hline(nc, &c, n) != n){
+-    cell_release(nc, &c);
++    nccell_release(nc, &c);
+     return -1;
+   }
+-  cell_release(nc, &c);
++  nccell_release(nc, &c);
+   return 0;
+ }
+ 
diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index 4456db1f8185..213429654c6c 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -1,7 +1,7 @@
 # Template file for 'growlight'
 pkgname=growlight
 version=1.2.32
-revision=1
+revision=2
 build_style=cmake
 configure_args="$(vopt_bool zfs USE_LIBZFS) $(vopt_bool man USE_PANDOC)"
 hostmakedepends="pkg-config $(vopt_if man pandoc)"

Re: growlight: patch to work with notcurses v2.2.6.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30233#issuecomment-819490701

Comment:
Would be nice to not have so much churn :/

Assuming that's a new function, I think `common/shlibs` for notcurses should be updated.

Re: [PR REVIEW] growlight: patch to work with notcurses v2.2.6.

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30233#discussion_r613215236

Comment:
Please omit this part of the patch.

Re: [PR REVIEW] growlight: patch to work with notcurses v2.2.6.

[mobinmob]

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

New review comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/30233#discussion_r613215829

Comment:
Why?

Re: growlight: patch to work with notcurses v2.2.6.

[mobinmob]

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

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/30233#issuecomment-819491652

Comment:

> Assuming that's a new function, I think `common/shlibs` for notcurses should be updated.

In a new commit/PR?

Re: [PR REVIEW] growlight: patch to work with notcurses v2.2.6.

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30233#discussion_r613216286

Comment:
They don't affect the build, so it's a smaller diff :)

Re: growlight: patch to work with notcurses v2.2.6.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30233#issuecomment-819491837

Comment:
> In a new commit/PR?

Separate commit in this PR.

Re: [PR PATCH] [Updated] growlight: patch to work with notcurses v2.2.6.

[mobinmob]

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

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

https://github.com/mobinmob/void-packages growlight-update
https://github.com/void-linux/void-packages/pull/30233

growlight: patch to work with notcurses v2.2.6.
<!-- 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/30233.patch is attached

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

From 8ff206cee3c9d6d60694ad4e4e8112fd08e5e0e6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 14 Apr 2021 15:43:30 +0300
Subject: [PATCH 1/2] growlight: patch to work with notcurses v2.2.6.

---
 ...bad3daf23276167e28dedb73dcd1af4c9f826.diff | 43 +++++++++++++++++++
 srcpkgs/growlight/template                    |  2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/growlight/patches/1bfbad3daf23276167e28dedb73dcd1af4c9f826.diff

diff --git a/srcpkgs/growlight/patches/1bfbad3daf23276167e28dedb73dcd1af4c9f826.diff b/srcpkgs/growlight/patches/1bfbad3daf23276167e28dedb73dcd1af4c9f826.diff
new file mode 100644
index 000000000000..2f336ed7000f
--- /dev/null
+++ b/srcpkgs/growlight/patches/1bfbad3daf23276167e28dedb73dcd1af4c9f826.diff
@@ -0,0 +1,43 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9d85c10..4c1ad5f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,7 +34,7 @@ add_compile_options(-Wall -Wextra -W -Wshadow -Wformat -fexceptions)
+ find_package(PkgConfig REQUIRED)
+ find_package(Threads)
+ set_package_properties(Threads PROPERTIES TYPE REQUIRED)
+-find_package(Notcurses 2.1.8 CONFIG)
++find_package(Notcurses 2.2.6 CONFIG)
+ set_package_properties(Notcurses PROPERTIES TYPE REQUIRED)
+ pkg_check_modules(LIBATASMART REQUIRED libatasmart>=0.19)
+ pkg_check_modules(LIBBLKID REQUIRED blkid>=2.20.1)
+diff --git a/README.md b/README.md
+index c8ef069..ec250d2 100644
+--- a/README.md
++++ b/README.md
+@@ -22,7 +22,7 @@ Dependencies:
+  - libcryptsetup 2.1.5+
+  - libdevmapper 1.02.74+
+  - libnettle 3.5.1+
+- - libnotcurses 2.1.8+
++ - libnotcurses 2.2.6+
+  - libpci 3.1.9+
+  - libpciaccess 0.13.1+
+  - libreadline 8.0+
+diff --git a/src/notcurses/notcurses.c b/src/notcurses/notcurses.c
+index 1eaf143..a56a9d3 100644
+--- a/src/notcurses/notcurses.c
++++ b/src/notcurses/notcurses.c
+@@ -622,10 +622,10 @@ cmvwhline(struct ncplane* nc, int y, int x, const char* ch, int n){
+   }
+   c.channels = ncplane_channels(nc);
+   if(ncplane_hline(nc, &c, n) != n){
+-    cell_release(nc, &c);
++    nccell_release(nc, &c);
+     return -1;
+   }
+-  cell_release(nc, &c);
++  nccell_release(nc, &c);
+   return 0;
+ }
+ 
diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index 4456db1f8185..213429654c6c 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -1,7 +1,7 @@
 # Template file for 'growlight'
 pkgname=growlight
 version=1.2.32
-revision=1
+revision=2
 build_style=cmake
 configure_args="$(vopt_bool zfs USE_LIBZFS) $(vopt_bool man USE_PANDOC)"
 hostmakedepends="pkg-config $(vopt_if man pandoc)"

From aabfdc572d0692241d2d7d688876c1eec674d999 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 14 Apr 2021 15:58:30 +0300
Subject: [PATCH 2/2] common/shlibs: update notcurses shlib-version.

---
 common/shlibs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 865ebcbe799d..63db3fbc9d02 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3887,9 +3887,9 @@ liburing.so.2 liburing-2.0_1
 libbson-1.0.so.0 libbson-1.17.4_2
 libsonic.so.0 libsonic-0.2.0_1
 libtickit.so.3 libtickit-0.4.1_1
-libnotcurses.so.2 notcurses-2.0.4_1
-libnotcurses-core.so.2 notcurses-2.1.7_1
-libnotcurses++.so.2 notcurses-2.0.4_1
+libnotcurses.so.2 notcurses-2.2.6_1
+libnotcurses-core.so.2 notcurses-2.2.6_1
+libnotcurses++.so.2 notcurses-2.2.6_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 libinih.so.0 inih-52_1

Re: growlight: patch to work with notcurses v2.2.6.

[mobinmob]

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

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/30233#issuecomment-819498238

Comment:
> > In a new commit/PR?
> 
> Separate commit in this PR.

Done, thank you!

Re: [PR REVIEW] growlight: patch to work with notcurses v2.2.6.

[mobinmob]

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

New review comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/30233#discussion_r613226482

Comment:
My diff is directly from the upstream repo, the code will be in the next release :)

Re: [PR REVIEW] growlight: patch to work with notcurses v2.2.6.

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30233#discussion_r613227862

Comment:
I am aware, just think we can avoid such a large diff easily. Since we are pulling in the patch ourselves, we don't have to use it in its entirety.

Re: growlight: patch to work with notcurses v2.2.6.

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/30233#issuecomment-819560603

Comment:
I'm thinking about reverting notcurses `2.2.6`, upstream promised a new release with the restoration of those symbols.

Re: growlight: patch to work with notcurses v2.2.6.

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/30233#issuecomment-819560603

Comment:
I'm thinking about reverting notcurses `2.2.6`, upstream promised a new release with the restoration of those symbols.
https://github.com/dankamongmen/notcurses/commit/d504e972cc529baad3676423fdc90a4637239cfe

Re: growlight: patch to work with notcurses v2.2.6.

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/30233#issuecomment-819581143

Comment:
ABI restoration has been pushed, this change is not necessary anymore?

Re: [PR PATCH] [Closed]: growlight: patch to work with notcurses v2.2.6.

[mobinmob]

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

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

growlight: patch to work with notcurses v2.2.6.
https://github.com/void-linux/void-packages/pull/30233

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
-->