i3blocks: update to 1.5
This commit is contained in:
parent
978ae00467
commit
1908ccbb06
2 changed files with 15 additions and 67 deletions
|
@ -1,54 +0,0 @@
|
|||
--- src/sched.c.orig 2017-05-20 13:31:34.109614479 +0300
|
||||
+++ src/sched.c 2017-05-20 13:34:25.934611402 +0300
|
||||
@@ -31,7 +31,7 @@
|
||||
#include "json.h"
|
||||
#include "log.h"
|
||||
|
||||
-static sigset_t sigset;
|
||||
+static sigset_t sigset_ng;
|
||||
|
||||
static int
|
||||
gcd(int a, int b)
|
||||
@@ -88,13 +88,13 @@
|
||||
static int
|
||||
setup_signals(void)
|
||||
{
|
||||
- if (sigemptyset(&sigset) == -1) {
|
||||
+ if (sigemptyset(&sigset_ng) == -1) {
|
||||
errorx("sigemptyset");
|
||||
return 1;
|
||||
}
|
||||
|
||||
#define ADD_SIG(_sig) \
|
||||
- if (sigaddset(&sigset, _sig) == -1) { errorx("sigaddset(%d)", _sig); return 1; }
|
||||
+ if (sigaddset(&sigset_ng, _sig) == -1) { errorx("sigaddset(%d)", _sig); return 1; }
|
||||
|
||||
/* Control signals */
|
||||
ADD_SIG(SIGTERM);
|
||||
@@ -125,7 +125,7 @@
|
||||
#undef ADD_SIG
|
||||
|
||||
/* Block signals for which we are interested in waiting */
|
||||
- if (sigprocmask(SIG_SETMASK, &sigset, NULL) == -1) {
|
||||
+ if (sigprocmask(SIG_SETMASK, &sigset_ng, NULL) == -1) {
|
||||
errorx("sigprocmask");
|
||||
return 1;
|
||||
}
|
||||
@@ -164,7 +164,7 @@
|
||||
bar_poll_timed(bar);
|
||||
|
||||
while (1) {
|
||||
- sig = sigwaitinfo(&sigset, &siginfo);
|
||||
+ sig = sigwaitinfo(&sigset_ng, &siginfo);
|
||||
if (sig == -1) {
|
||||
/* Hiding the bar may interrupt this system call */
|
||||
if (errno == EINTR)
|
||||
@@ -212,7 +212,7 @@
|
||||
* Unblock signals (so subsequent syscall can be interrupted)
|
||||
* and wait for child processes termination.
|
||||
*/
|
||||
- if (sigprocmask(SIG_UNBLOCK, &sigset, NULL) == -1)
|
||||
+ if (sigprocmask(SIG_UNBLOCK, &sigset_ng, NULL) == -1)
|
||||
errorx("sigprocmask");
|
||||
while (waitpid(-1, NULL, 0) > 0)
|
||||
continue;
|
|
@ -1,20 +1,22 @@
|
|||
# Template file for 'i3blocks'
|
||||
pkgname=i3blocks
|
||||
version=1.4
|
||||
revision=4
|
||||
build_style=gnu-makefile
|
||||
version=1.5
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
make_build_args="SYSCONFDIR=/etc"
|
||||
hostmakedepends="autoconf automake pkg-config"
|
||||
makedepends="bash-completion"
|
||||
short_desc="Flexible scheduler for i3bar"
|
||||
maintainer="Eivind Uggedal <eivind@uggedal.com>"
|
||||
license="GPL-3"
|
||||
homepage="https://github.com/vivien/$pkgname"
|
||||
license="GPL-3.0-or-later"
|
||||
homepage="https://github.com/vivien/i3blocks"
|
||||
distfiles="${homepage}/archive/${version}.tar.gz"
|
||||
checksum=c9bd2854b7902aa6821fdf8c83b5123c10b90a52f9bcc67225ff57f25d28b4b0
|
||||
make_build_args="SYSCONFDIR=/etc"
|
||||
checksum=41764d771043d0c06c23d75b1e3ca6b2b94279191483d03f10c5e034d6722ebf
|
||||
|
||||
pre_build() {
|
||||
# Do not build man pages since we don't have ronn:
|
||||
sed -i '/install.*share\/man\/man1/d' Makefile
|
||||
sed -i 's/install: all man/install: all/' Makefile
|
||||
|
||||
sed -i 's/^\(CFLAGS +=\)/override \1/' Makefile
|
||||
pre_configure() {
|
||||
./autogen.sh
|
||||
}
|
||||
|
||||
post_install() {
|
||||
vconf i3blocks.conf
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue