* [PR PATCH] notion: update to 4.0.2.
@ 2022-03-17 14:26 leahneukirchen
2022-03-17 14:57 ` [PR PATCH] [Updated] " leahneukirchen
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: leahneukirchen @ 2022-03-17 14:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 516 bytes --]
There is a new pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages notion
https://github.com/void-linux/void-packages/pull/36187
notion: update to 4.0.2.
- Fix homepage
- Fix musl
- Fix nonfree, upstream should be proper LGPL-2.1-or-later now
- Use Lua 5.4
#### Testing the changes
- I tested the changes in this PR: **briefly**
cc @vtoc
A patch file from https://github.com/void-linux/void-packages/pull/36187.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-notion-36187.patch --]
[-- Type: text/x-diff, Size: 4393 bytes --]
From c328594d52f098f253f22012df32bcdefe85141e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 17 Mar 2022 15:17:16 +0100
Subject: [PATCH] notion: update to 4.0.2.
- Fix homepage
- Fix musl
- Fix nonfree, upstream should be proper LGPL-2.1-or-later now
- Use Lua 5.4
---
srcpkgs/notion/patches/musl.patch | 77 +++++++++++++++++++++++++++++++
srcpkgs/notion/template | 18 ++++----
2 files changed, 85 insertions(+), 10 deletions(-)
create mode 100644 srcpkgs/notion/patches/musl.patch
diff --git a/srcpkgs/notion/patches/musl.patch b/srcpkgs/notion/patches/musl.patch
new file mode 100644
index 000000000000..042547d69adf
--- /dev/null
+++ b/srcpkgs/notion/patches/musl.patch
@@ -0,0 +1,77 @@
+--- a/mod_notionflux/mod_notionflux.c
++++ b/mod_notionflux/mod_notionflux.c
+@@ -36,7 +36,7 @@
+
+ typedef struct{
+ int fd;
+- FILE *stdout;
++ FILE *std_out;
+ int ndata;
+ char *data;
+ } Buf;
+@@ -64,9 +64,9 @@
+ close(buf->fd);
+ buf->fd=-1;
+ buf->ndata=0;
+- if(buf->stdout!=NULL){
+- fclose(buf->stdout);
+- buf->stdout=NULL;
++ if(buf->std_out!=NULL){
++ fclose(buf->std_out);
++ buf->std_out=NULL;
+ }
+ if(buf->data!=NULL){
+ free(buf->data);
+@@ -147,11 +147,11 @@
+ bool success=FALSE;
+ int idx=buf-bufs;
+
+- if(buf->stdout==NULL){ /* no fd received yet, must be the very beginning */
+- int stdout_fd=unix_recv_fd(fd);
+- if(stdout_fd==-2)
++ if(buf->std_out==NULL){ /* no fd received yet, must be the very beginning */
++ int std_out_fd=unix_recv_fd(fd);
++ if(std_out_fd==-2)
+ goto closefd;
+- if(stdout_fd==-3){
++ if(std_out_fd==-3){
+ char const *err="Magic number mismatch on notionflux socket - "
+ "is notionflux the same version as notion?";
+ writes(fd, "E");
+@@ -160,13 +160,13 @@
+ goto closefd;
+ }
+
+- if(stdout_fd==-1) {
++ if(std_out_fd==-1) {
+ if(errno==EWOULDBLOCK || errno==EAGAIN)
+ return; /* try again later */
+ warn("No file descriptor received from notionflux, closing.");
+ goto closefd;
+ }
+- if((buf->stdout=fdopen(stdout_fd, "w"))==NULL) {
++ if((buf->std_out=fdopen(std_out_fd, "w"))==NULL) {
+ warn("fdopen() failed on fd from notionflux");
+ goto closefd;
+ }
+@@ -239,9 +239,9 @@
+ EXTL_EXPORT
+ bool mod_notionflux_xwrite(int idx, const char *str)
+ {
+- if (idx<0 || idx>=MAX_SERVED || bufs[idx].stdout==NULL)
++ if (idx<0 || idx>=MAX_SERVED || bufs[idx].std_out==NULL)
+ return FALSE;
+- return fputs(str, bufs[idx].stdout)!=EOF;
++ return fputs(str, bufs[idx].std_out)!=EOF;
+ }
+
+ static void connection_attempt(int lfd, void *UNUSED(data))
+@@ -410,7 +410,7 @@
+
+ for(i=0; i<MAX_SERVED; i++){
+ bufs[i].fd=-1;
+- bufs[i].stdout=NULL;
++ bufs[i].std_out=NULL;
+ bufs[i].data=NULL;
+ bufs[i].ndata=0;
+ }
diff --git a/srcpkgs/notion/template b/srcpkgs/notion/template
index b0746f9b1c02..6727b21ae8bb 100644
--- a/srcpkgs/notion/template
+++ b/srcpkgs/notion/template
@@ -1,17 +1,16 @@
# Template file for 'notion'
-pkgname="notion"
-version=4.0.0
-revision=2
-archs="~*-musl"
-short_desc="Tabbed, tiling window manager"
+pkgname=notion
+version=4.0.2
+revision=1
hostmakedepends="pkg-config gettext groff lua53"
-makedepends="lua53-devel libXext-devel libXft-devel libSM-devel libXinerama-devel libXrandr-devel"
+makedepends="libSM-devel libXext-devel libXft-devel libXinerama-devel
+ libXrandr-devel lua54-devel"
+short_desc="Tabbed, tiling window manager"
maintainer="Julian Wiesener <jw@vtoc.de>"
license="LGPL-2.1-or-later"
-repository="nonfree"
-homepage="https://notionnm.net/"
+homepage="https://notionwm.net/"
distfiles="https://github.com/raboof/notion/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=13ce5867667ad7a864c79f4cb1e322fa33ebcd872dfce6472026e4d69d1f4138
+checksum=dcefd620d028f6541c15879c3db218de081df7ce8d2e9cb4fc7ddd9b9253b698
do_build() {
make CC=$CC PREFIX=/usr ETCDIR=/etc/notion
@@ -21,5 +20,4 @@ do_install() {
make DESTDIR=${DESTDIR} PREFIX=/usr ETCDIR=/etc/notion install
vman man/notion.1
vman man/notionflux.1
- vlicense LICENSE
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] notion: update to 4.0.2.
2022-03-17 14:26 [PR PATCH] notion: update to 4.0.2 leahneukirchen
@ 2022-03-17 14:57 ` leahneukirchen
2022-03-17 15:39 ` leahneukirchen
2022-04-07 16:52 ` [PR PATCH] [Merged]: " leahneukirchen
2 siblings, 0 replies; 4+ messages in thread
From: leahneukirchen @ 2022-03-17 14:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 521 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages notion
https://github.com/void-linux/void-packages/pull/36187
notion: update to 4.0.2.
- Fix homepage
- Fix musl
- Fix nonfree, upstream should be proper LGPL-2.1-or-later now
- Use Lua 5.4
#### Testing the changes
- I tested the changes in this PR: **briefly**
cc @vtoc
A patch file from https://github.com/void-linux/void-packages/pull/36187.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-notion-36187.patch --]
[-- Type: text/x-diff, Size: 5127 bytes --]
From 524f4d6b1110722a0918dfc515af42b9381636f6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 17 Mar 2022 15:17:16 +0100
Subject: [PATCH] notion: update to 4.0.2.
- Fix homepage
- Fix musl (backport upstream patch)
- Fix nonfree, upstream should be proper LGPL-2.1-or-later now
- Use Lua 5.4
---
srcpkgs/notion/patches/stdout.patch | 89 +++++++++++++++++++++++++++++
srcpkgs/notion/template | 18 +++---
2 files changed, 97 insertions(+), 10 deletions(-)
create mode 100644 srcpkgs/notion/patches/stdout.patch
diff --git a/srcpkgs/notion/patches/stdout.patch b/srcpkgs/notion/patches/stdout.patch
new file mode 100644
index 000000000000..b4200f680d2e
--- /dev/null
+++ b/srcpkgs/notion/patches/stdout.patch
@@ -0,0 +1,89 @@
+From de9e19940c2c88c848b7f849fb014fafd77d7d93 Mon Sep 17 00:00:00 2001
+From: c0dev0id <sh+github@codevoid.de>
+Date: Sat, 10 Apr 2021 02:03:44 +0200
+Subject: [PATCH] Fix compilation on OpenBSD
+
+The variable name "stdout" is defined in stdio.h on OpenBSD already.
+---
+ mod_notionflux/mod_notionflux.c | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/mod_notionflux/mod_notionflux.c b/mod_notionflux/mod_notionflux.c
+index f2bd4427..51949e07 100644
+--- a/mod_notionflux/mod_notionflux.c
++++ b/mod_notionflux/mod_notionflux.c
+@@ -36,7 +36,7 @@
+
+ typedef struct{
+ int fd;
+- FILE *stdout;
++ FILE *stdoutput;
+ int ndata;
+ char *data;
+ } Buf;
+@@ -64,9 +64,9 @@ static void close_conn(Buf *buf)
+ close(buf->fd);
+ buf->fd=-1;
+ buf->ndata=0;
+- if(buf->stdout!=NULL){
+- fclose(buf->stdout);
+- buf->stdout=NULL;
++ if(buf->stdoutput!=NULL){
++ fclose(buf->stdoutput);
++ buf->stdoutput=NULL;
+ }
+ if(buf->data!=NULL){
+ free(buf->data);
+@@ -147,11 +147,11 @@ static void receive_data(int fd, void *buf_)
+ bool success=FALSE;
+ int idx=buf-bufs;
+
+- if(buf->stdout==NULL){ /* no fd received yet, must be the very beginning */
+- int stdout_fd=unix_recv_fd(fd);
+- if(stdout_fd==-2)
++ if(buf->stdoutput==NULL){ /* no fd received yet, must be the very beginning */
++ int stdoutput_fd=unix_recv_fd(fd);
++ if(stdoutput_fd==-2)
+ goto closefd;
+- if(stdout_fd==-3){
++ if(stdoutput_fd==-3){
+ char const *err="Magic number mismatch on notionflux socket - "
+ "is notionflux the same version as notion?";
+ writes(fd, "E");
+@@ -160,13 +160,13 @@ static void receive_data(int fd, void *buf_)
+ goto closefd;
+ }
+
+- if(stdout_fd==-1) {
++ if(stdoutput_fd==-1) {
+ if(errno==EWOULDBLOCK || errno==EAGAIN)
+ return; /* try again later */
+ warn("No file descriptor received from notionflux, closing.");
+ goto closefd;
+ }
+- if((buf->stdout=fdopen(stdout_fd, "w"))==NULL) {
++ if((buf->stdoutput=fdopen(stdoutput_fd, "w"))==NULL) {
+ warn("fdopen() failed on fd from notionflux");
+ goto closefd;
+ }
+@@ -239,9 +239,9 @@ EXTL_SAFE
+ EXTL_EXPORT
+ bool mod_notionflux_xwrite(int idx, const char *str)
+ {
+- if (idx<0 || idx>=MAX_SERVED || bufs[idx].stdout==NULL)
++ if (idx<0 || idx>=MAX_SERVED || bufs[idx].stdoutput==NULL)
+ return FALSE;
+- return fputs(str, bufs[idx].stdout)!=EOF;
++ return fputs(str, bufs[idx].stdoutput)!=EOF;
+ }
+
+ static void connection_attempt(int lfd, void *UNUSED(data))
+@@ -410,7 +410,7 @@ bool mod_notionflux_init()
+
+ for(i=0; i<MAX_SERVED; i++){
+ bufs[i].fd=-1;
+- bufs[i].stdout=NULL;
++ bufs[i].stdoutput=NULL;
+ bufs[i].data=NULL;
+ bufs[i].ndata=0;
+ }
diff --git a/srcpkgs/notion/template b/srcpkgs/notion/template
index b0746f9b1c02..7f188e4c744c 100644
--- a/srcpkgs/notion/template
+++ b/srcpkgs/notion/template
@@ -1,17 +1,16 @@
# Template file for 'notion'
-pkgname="notion"
-version=4.0.0
-revision=2
-archs="~*-musl"
+pkgname=notion
+version=4.0.2
+revision=1
+hostmakedepends="pkg-config gettext groff lua54"
+makedepends="libSM-devel libXext-devel libXft-devel libXinerama-devel
+ libXrandr-devel lua54-devel"
short_desc="Tabbed, tiling window manager"
-hostmakedepends="pkg-config gettext groff lua53"
-makedepends="lua53-devel libXext-devel libXft-devel libSM-devel libXinerama-devel libXrandr-devel"
maintainer="Julian Wiesener <jw@vtoc.de>"
license="LGPL-2.1-or-later"
-repository="nonfree"
-homepage="https://notionnm.net/"
+homepage="https://notionwm.net/"
distfiles="https://github.com/raboof/notion/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=13ce5867667ad7a864c79f4cb1e322fa33ebcd872dfce6472026e4d69d1f4138
+checksum=dcefd620d028f6541c15879c3db218de081df7ce8d2e9cb4fc7ddd9b9253b698
do_build() {
make CC=$CC PREFIX=/usr ETCDIR=/etc/notion
@@ -21,5 +20,4 @@ do_install() {
make DESTDIR=${DESTDIR} PREFIX=/usr ETCDIR=/etc/notion install
vman man/notion.1
vman man/notionflux.1
- vlicense LICENSE
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] notion: update to 4.0.2.
2022-03-17 14:26 [PR PATCH] notion: update to 4.0.2 leahneukirchen
2022-03-17 14:57 ` [PR PATCH] [Updated] " leahneukirchen
@ 2022-03-17 15:39 ` leahneukirchen
2022-04-07 16:52 ` [PR PATCH] [Merged]: " leahneukirchen
2 siblings, 0 replies; 4+ messages in thread
From: leahneukirchen @ 2022-03-17 15:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 521 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages notion
https://github.com/void-linux/void-packages/pull/36187
notion: update to 4.0.2.
- Fix homepage
- Fix musl
- Fix nonfree, upstream should be proper LGPL-2.1-or-later now
- Use Lua 5.4
#### Testing the changes
- I tested the changes in this PR: **briefly**
cc @vtoc
A patch file from https://github.com/void-linux/void-packages/pull/36187.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-notion-36187.patch --]
[-- Type: text/x-diff, Size: 5142 bytes --]
From 80e5ac03a0faef137013b5a5b181fd5e7de4fef8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 17 Mar 2022 15:17:16 +0100
Subject: [PATCH] notion: update to 4.0.2.
- Fix homepage
- Fix musl (backport upstream patch)
- Fix nonfree, upstream should be proper LGPL-2.1-or-later now
- Use Lua 5.4
---
srcpkgs/notion/patches/stdout.patch | 89 +++++++++++++++++++++++++++++
srcpkgs/notion/template | 18 +++---
2 files changed, 97 insertions(+), 10 deletions(-)
create mode 100644 srcpkgs/notion/patches/stdout.patch
diff --git a/srcpkgs/notion/patches/stdout.patch b/srcpkgs/notion/patches/stdout.patch
new file mode 100644
index 000000000000..b4200f680d2e
--- /dev/null
+++ b/srcpkgs/notion/patches/stdout.patch
@@ -0,0 +1,89 @@
+From de9e19940c2c88c848b7f849fb014fafd77d7d93 Mon Sep 17 00:00:00 2001
+From: c0dev0id <sh+github@codevoid.de>
+Date: Sat, 10 Apr 2021 02:03:44 +0200
+Subject: [PATCH] Fix compilation on OpenBSD
+
+The variable name "stdout" is defined in stdio.h on OpenBSD already.
+---
+ mod_notionflux/mod_notionflux.c | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/mod_notionflux/mod_notionflux.c b/mod_notionflux/mod_notionflux.c
+index f2bd4427..51949e07 100644
+--- a/mod_notionflux/mod_notionflux.c
++++ b/mod_notionflux/mod_notionflux.c
+@@ -36,7 +36,7 @@
+
+ typedef struct{
+ int fd;
+- FILE *stdout;
++ FILE *stdoutput;
+ int ndata;
+ char *data;
+ } Buf;
+@@ -64,9 +64,9 @@ static void close_conn(Buf *buf)
+ close(buf->fd);
+ buf->fd=-1;
+ buf->ndata=0;
+- if(buf->stdout!=NULL){
+- fclose(buf->stdout);
+- buf->stdout=NULL;
++ if(buf->stdoutput!=NULL){
++ fclose(buf->stdoutput);
++ buf->stdoutput=NULL;
+ }
+ if(buf->data!=NULL){
+ free(buf->data);
+@@ -147,11 +147,11 @@ static void receive_data(int fd, void *buf_)
+ bool success=FALSE;
+ int idx=buf-bufs;
+
+- if(buf->stdout==NULL){ /* no fd received yet, must be the very beginning */
+- int stdout_fd=unix_recv_fd(fd);
+- if(stdout_fd==-2)
++ if(buf->stdoutput==NULL){ /* no fd received yet, must be the very beginning */
++ int stdoutput_fd=unix_recv_fd(fd);
++ if(stdoutput_fd==-2)
+ goto closefd;
+- if(stdout_fd==-3){
++ if(stdoutput_fd==-3){
+ char const *err="Magic number mismatch on notionflux socket - "
+ "is notionflux the same version as notion?";
+ writes(fd, "E");
+@@ -160,13 +160,13 @@ static void receive_data(int fd, void *buf_)
+ goto closefd;
+ }
+
+- if(stdout_fd==-1) {
++ if(stdoutput_fd==-1) {
+ if(errno==EWOULDBLOCK || errno==EAGAIN)
+ return; /* try again later */
+ warn("No file descriptor received from notionflux, closing.");
+ goto closefd;
+ }
+- if((buf->stdout=fdopen(stdout_fd, "w"))==NULL) {
++ if((buf->stdoutput=fdopen(stdoutput_fd, "w"))==NULL) {
+ warn("fdopen() failed on fd from notionflux");
+ goto closefd;
+ }
+@@ -239,9 +239,9 @@ EXTL_SAFE
+ EXTL_EXPORT
+ bool mod_notionflux_xwrite(int idx, const char *str)
+ {
+- if (idx<0 || idx>=MAX_SERVED || bufs[idx].stdout==NULL)
++ if (idx<0 || idx>=MAX_SERVED || bufs[idx].stdoutput==NULL)
+ return FALSE;
+- return fputs(str, bufs[idx].stdout)!=EOF;
++ return fputs(str, bufs[idx].stdoutput)!=EOF;
+ }
+
+ static void connection_attempt(int lfd, void *UNUSED(data))
+@@ -410,7 +410,7 @@ bool mod_notionflux_init()
+
+ for(i=0; i<MAX_SERVED; i++){
+ bufs[i].fd=-1;
+- bufs[i].stdout=NULL;
++ bufs[i].stdoutput=NULL;
+ bufs[i].data=NULL;
+ bufs[i].ndata=0;
+ }
diff --git a/srcpkgs/notion/template b/srcpkgs/notion/template
index b0746f9b1c02..1246e0e9c6cd 100644
--- a/srcpkgs/notion/template
+++ b/srcpkgs/notion/template
@@ -1,17 +1,16 @@
# Template file for 'notion'
-pkgname="notion"
-version=4.0.0
-revision=2
-archs="~*-musl"
+pkgname=notion
+version=4.0.2
+revision=1
+hostmakedepends="pkg-config gettext groff lua54"
+makedepends="libSM-devel libXext-devel libXft-devel libXinerama-devel
+ libXrandr-devel lua54-devel readline-devel"
short_desc="Tabbed, tiling window manager"
-hostmakedepends="pkg-config gettext groff lua53"
-makedepends="lua53-devel libXext-devel libXft-devel libSM-devel libXinerama-devel libXrandr-devel"
maintainer="Julian Wiesener <jw@vtoc.de>"
license="LGPL-2.1-or-later"
-repository="nonfree"
-homepage="https://notionnm.net/"
+homepage="https://notionwm.net/"
distfiles="https://github.com/raboof/notion/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=13ce5867667ad7a864c79f4cb1e322fa33ebcd872dfce6472026e4d69d1f4138
+checksum=dcefd620d028f6541c15879c3db218de081df7ce8d2e9cb4fc7ddd9b9253b698
do_build() {
make CC=$CC PREFIX=/usr ETCDIR=/etc/notion
@@ -21,5 +20,4 @@ do_install() {
make DESTDIR=${DESTDIR} PREFIX=/usr ETCDIR=/etc/notion install
vman man/notion.1
vman man/notionflux.1
- vlicense LICENSE
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: notion: update to 4.0.2.
2022-03-17 14:26 [PR PATCH] notion: update to 4.0.2 leahneukirchen
2022-03-17 14:57 ` [PR PATCH] [Updated] " leahneukirchen
2022-03-17 15:39 ` leahneukirchen
@ 2022-04-07 16:52 ` leahneukirchen
2 siblings, 0 replies; 4+ messages in thread
From: leahneukirchen @ 2022-04-07 16:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 352 bytes --]
There's a merged pull request on the void-packages repository
notion: update to 4.0.2.
https://github.com/void-linux/void-packages/pull/36187
Description:
- Fix homepage
- Fix musl
- Fix nonfree, upstream should be proper LGPL-2.1-or-later now
- Use Lua 5.4
#### Testing the changes
- I tested the changes in this PR: **briefly**
cc @vtoc
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-04-07 16:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-17 14:26 [PR PATCH] notion: update to 4.0.2 leahneukirchen
2022-03-17 14:57 ` [PR PATCH] [Updated] " leahneukirchen
2022-03-17 15:39 ` leahneukirchen
2022-04-07 16:52 ` [PR PATCH] [Merged]: " leahneukirchen
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).