From 8ff206cee3c9d6d60694ad4e4e8112fd08e5e0e6 Mon Sep 17 00:00:00 2001 From: mobinmob 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 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