From: mobinmob <mobinmob@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] notcurses: update to 2.2.8.
Date: Tue, 20 Apr 2021 22:17:56 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-30394@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1593 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/30394
notcurses: update to 2.2.8.
<!-- 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/30394.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-notcurses-30394.patch --]
[-- Type: text/x-diff, Size: 4133 bytes --]
From 64bf90e58a3b27957981f8e111e141aeff8657e9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 20 Apr 2021 23:16:51 +0300
Subject: [PATCH] notcurses: update to 2.2.8.
---
.../patches/restore-lost-symbol.patch | 66 -------------------
srcpkgs/notcurses/template | 6 +-
2 files changed, 3 insertions(+), 69 deletions(-)
delete mode 100644 srcpkgs/notcurses/patches/restore-lost-symbol.patch
diff --git a/srcpkgs/notcurses/patches/restore-lost-symbol.patch b/srcpkgs/notcurses/patches/restore-lost-symbol.patch
deleted file mode 100644
index b938a35ed30e..000000000000
--- a/srcpkgs/notcurses/patches/restore-lost-symbol.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From da2a897544b9d239515b85ed31c8db4d90d23883 Mon Sep 17 00:00:00 2001
-From: nick black <dankamongmen@gmail.com>
-Date: Wed, 14 Apr 2021 10:04:28 -0400
-Subject: [PATCH] fix unintended cell abi breakage #1532
-
-cell_release() and cell_duplicate() were deprecated in 2.2.6,
-but replaced with static inlines. this breaks the abi, forcing
-recompiles from client programs. restore them as exported
-functions.
----
- include/notcurses/notcurses.h | 10 ++--------
- src/lib/render.c | 9 +++++++++
- 2 files changed, 11 insertions(+), 8 deletions(-)
-
-diff --git a/include/notcurses/notcurses.h b/include/notcurses/notcurses.h
-index aece8cb6d..9d98ea19f 100644
---- a/include/notcurses/notcurses.h
-+++ b/include/notcurses/notcurses.h
-@@ -677,18 +677,12 @@ cell_prime(struct ncplane* n, nccell* c, const char* gcluster,
- // failure, and 0 on success.
- API int nccell_duplicate(struct ncplane* n, nccell* targ, const nccell* c);
-
--__attribute__ ((deprecated)) static inline int
--cell_duplicate(struct ncplane* n, nccell* targ, const nccell* c){
-- return nccell_duplicate(n, targ, c);
--}
-+__attribute__ ((deprecated)) API int cell_duplicate(struct ncplane* n, nccell* targ, const nccell* c);
-
- // Release resources held by the nccell 'c'.
- API void nccell_release(struct ncplane* n, nccell* c);
-
--__attribute__ ((deprecated)) static inline void
--cell_release(struct ncplane* n, nccell* c){
-- nccell_release(n, c);
--}
-+__attribute__ ((deprecated)) API void cell_release(struct ncplane* n, nccell* c);
-
- #define NCSTYLE_MASK 0x03ffu
- #define NCSTYLE_STANDOUT 0x0080u
-diff --git a/src/lib/render.c b/src/lib/render.c
-index ad95cd878..e1334416f 100644
---- a/src/lib/render.c
-+++ b/src/lib/render.c
-@@ -175,6 +175,11 @@ void nccell_release(ncplane* n, nccell* c){
- pool_release(&n->pool, c);
- }
-
-+// FIXME deprecated, goes away in abi3
-+void cell_release(ncplane* n, nccell* c){
-+ nccell_release(n, c);
-+}
-+
- // Duplicate one cell onto another when they share a plane. Convenience wrapper.
- int nccell_duplicate(ncplane* n, nccell* targ, const nccell* c){
- if(cell_duplicate_far(&n->pool, targ, n, c) < 0){
-@@ -184,6 +189,10 @@ int nccell_duplicate(ncplane* n, nccell* targ, const nccell* c){
- return 0;
- }
-
-+int cell_duplicate(struct ncplane* n, nccell* targ, const nccell* c){
-+ return nccell_duplicate(n, targ, c);
-+}
-+
- // Emit fchannel with RGB changed to contrast effectively against bchannel.
- static uint32_t
- highcontrast(uint32_t bchannel){
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index f2bc3e9ae1bd..eaa93ff2c60f 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,7 +1,7 @@
# Template file for 'notcurses'
pkgname=notcurses
-version=2.2.6
-revision=2
+version=2.2.8
+revision=1
build_style=cmake
configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
hostmakedepends="pkg-config $(vopt_if man 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=0507e507f9843a494aa66f31e419add5fbdbceb8fbc9345f3e6d4b55ed8a89d9
+checksum=dc744f6a11bf8ca81dc8a73f56c4d9021cf4d56ef89a9a658974dff7984df376
patch_args=-Np1
build_options="man"
next reply other threads:[~2021-04-20 20:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-20 20:17 mobinmob [this message]
2021-04-20 20:35 ` ericonr
2021-04-21 16:51 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-30394@inbox.vuxu.org \
--to=mobinmob@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).