From d14ed3088e9e16e9176823a18c53db5e2e97890f Mon Sep 17 00:00:00 2001 From: teldra Date: Tue, 13 Aug 2019 10:41:31 +0200 Subject: [PATCH 1/2] i3blocks: update to 1.5 --- srcpkgs/i3blocks/INSTALL.msg | 6 +-- srcpkgs/i3blocks/patches/fix_musl.patch | 54 ------------------------- srcpkgs/i3blocks/template | 24 ++++++----- 3 files changed, 14 insertions(+), 70 deletions(-) delete mode 100644 srcpkgs/i3blocks/patches/fix_musl.patch diff --git a/srcpkgs/i3blocks/INSTALL.msg b/srcpkgs/i3blocks/INSTALL.msg index 4aef33be370..bc9a955de12 100644 --- a/srcpkgs/i3blocks/INSTALL.msg +++ b/srcpkgs/i3blocks/INSTALL.msg @@ -1,5 +1 @@ -Some of the included scripts may use external tools which must be installed: - acpi: used by the battery script - lm_sensors: used by the temperature script - playerctl: used by the mediaplayer script - sysstat: used by the cpu_usage script +Blocklets are in optional package 'i3blocks-blocklets' now and need to be configured individually. diff --git a/srcpkgs/i3blocks/patches/fix_musl.patch b/srcpkgs/i3blocks/patches/fix_musl.patch deleted file mode 100644 index 04c09f8368a..00000000000 --- a/srcpkgs/i3blocks/patches/fix_musl.patch +++ /dev/null @@ -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; diff --git a/srcpkgs/i3blocks/template b/srcpkgs/i3blocks/template index 97393c50c78..80438ea3627 100644 --- a/srcpkgs/i3blocks/template +++ b/srcpkgs/i3blocks/template @@ -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 " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://github.com/vivien/$pkgname" 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 +pre_configure() { + ./autogen.sh +} - sed -i 's/^\(CFLAGS +=\)/override \1/' Makefile +post_install() { + vconf i3blocks.conf } From 9bf5c4563f7624791417f3902d0f8a401c9419c1 Mon Sep 17 00:00:00 2001 From: teldra Date: Tue, 13 Aug 2019 10:42:14 +0200 Subject: [PATCH 2/2] New package: i3blocks-blocklets-1.4.0 --- srcpkgs/i3blocks-blocklets/template | 20 ++++++++++++++++++++ srcpkgs/i3blocks/template | 1 + 2 files changed, 21 insertions(+) create mode 100644 srcpkgs/i3blocks-blocklets/template diff --git a/srcpkgs/i3blocks-blocklets/template b/srcpkgs/i3blocks-blocklets/template new file mode 100644 index 00000000000..76668dc64b5 --- /dev/null +++ b/srcpkgs/i3blocks-blocklets/template @@ -0,0 +1,20 @@ +# Template file for 'i3blocks-blocklets' +pkgname=i3blocks-blocklets +version=1.4.0 +revision=1 +archs=noarch +wrksrc="i3blocks-contrib-${version}" +depends="i3blocks>=1.5" +short_desc="Flexible scheduler for i3bar" +maintainer="teldra " +license="GPL-3.0-or-later, GPL-3.0-only, GPL-2.0-only" +homepage="https://github.com/vivien/i3blocks-contrib" +distfiles="https://github.com/vivien/i3blocks-contrib/archive/v${version}.tar.gz" +checksum=84148bf8f514de3b3dcaedeb5621e9640f96423d06759b7072507a15d0b6337f + +do_install() { + vconf config.example i3blocks-blocklets.conf.example + rm -rf .git CONTRIBUTING.md README.md ISSUE_TEMPLATE.md LICENSE.md .gitignore + vmkdir usr/share/examples/i3blocks/ + vcopy * usr/share/examples/i3blocks/ +} diff --git a/srcpkgs/i3blocks/template b/srcpkgs/i3blocks/template index 80438ea3627..9bf3945a584 100644 --- a/srcpkgs/i3blocks/template +++ b/srcpkgs/i3blocks/template @@ -2,6 +2,7 @@ pkgname=i3blocks version=1.5 revision=1 +noarch=yes build_style=gnu-configure make_build_args="SYSCONFDIR=/etc" hostmakedepends="autoconf automake pkg-config"