mirror of
https://github.com/void-linux/void-packages.git
synced 2025-09-04 02:52:58 +02:00
notion: update to 4.0.4.
This commit is contained in:
parent
58a194f646
commit
7407e9ddd4
2 changed files with 2 additions and 91 deletions
|
@ -1,89 +0,0 @@
|
||||||
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;
|
|
||||||
}
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'notion'
|
# Template file for 'notion'
|
||||||
pkgname=notion
|
pkgname=notion
|
||||||
version=4.0.2
|
version=4.0.4
|
||||||
revision=1
|
revision=1
|
||||||
hostmakedepends="pkg-config gettext groff lua54"
|
hostmakedepends="pkg-config gettext groff lua54"
|
||||||
makedepends="libSM-devel libXext-devel libXft-devel libXinerama-devel
|
makedepends="libSM-devel libXext-devel libXft-devel libXinerama-devel
|
||||||
|
@ -10,7 +10,7 @@ maintainer="Julian Wiesener <jw@vtoc.de>"
|
||||||
license="LGPL-2.1-or-later"
|
license="LGPL-2.1-or-later"
|
||||||
homepage="https://notionwm.net/"
|
homepage="https://notionwm.net/"
|
||||||
distfiles="https://github.com/raboof/notion/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
|
distfiles="https://github.com/raboof/notion/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
|
||||||
checksum=dcefd620d028f6541c15879c3db218de081df7ce8d2e9cb4fc7ddd9b9253b698
|
checksum=d5c2a1c32311dd427c10990fbf11d6f27413a3096be9ece4ed6595bef979efad
|
||||||
|
|
||||||
do_build() {
|
do_build() {
|
||||||
make CC=$CC PREFIX=/usr ETCDIR=/etc/notion
|
make CC=$CC PREFIX=/usr ETCDIR=/etc/notion
|
||||||
|
|
Loading…
Add table
Reference in a new issue