Re: [PR PATCH] [Updated] i3blocks: update to 1.5

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

There is an updated pull request by pratSureka against master on the void-packages repository

https://github.com/pratSureka/void-packages master
https://github.com/void-linux/void-packages/pull/15107

i3blocks: update to 1.5


A patch file from https://github.com/void-linux/void-packages/pull/15107.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-15107.patch --]
[-- Type: text/x-diff, Size: 5086 bytes --]

From fc34012ef28232321bebe553a082b0fcc9c6ed0b Mon Sep 17 00:00:00 2001
From: Pratyush Sureka <pratsure@gmail.com>
Date: Sat, 5 Oct 2019 11:41:14 +0530
Subject: [PATCH 1/3] i3blocks: update to 1.5

---
 srcpkgs/i3blocks/patches/fix_musl.patch | 54 -------------------------
 srcpkgs/i3blocks/template               | 13 +++---
 2 files changed, 6 insertions(+), 61 deletions(-)
 delete mode 100644 srcpkgs/i3blocks/patches/fix_musl.patch

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..14040000500 100644
--- a/srcpkgs/i3blocks/template
+++ b/srcpkgs/i3blocks/template
@@ -1,20 +1,19 @@
 # Template file for 'i3blocks'
 pkgname=i3blocks
-version=1.4
+version=1.5
 revision=4
 build_style=gnu-makefile
 short_desc="Flexible scheduler for i3bar"
 maintainer="Eivind Uggedal <eivind@uggedal.com>"
+makedepends="automake pkg-config"
 license="GPL-3"
+targetdir="/usr/bin"
 homepage="https://github.com/vivien/$pkgname"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c9bd2854b7902aa6821fdf8c83b5123c10b90a52f9bcc67225ff57f25d28b4b0
+checksum="41764d771043d0c06c23d75b1e3ca6b2b94279191483d03f10c5e034d6722ebf"
 make_build_args="SYSCONFDIR=/etc"
 
 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
+   bash $wrksrc/autogen.sh
+   bash $wrksrc/configure --prefix=/usr/bin
 }

From c532131b62a66513606c5d96b1e9bb0459b4f540 Mon Sep 17 00:00:00 2001
From: Pratyush Sureka <pratsure@gmail.com>
Date: Sat, 5 Oct 2019 12:08:42 +0530
Subject: [PATCH 2/3] i3blocks: update to 1.5

---
 srcpkgs/i3blocks/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/i3blocks/template b/srcpkgs/i3blocks/template
index 14040000500..5fea9cf2538 100644
--- a/srcpkgs/i3blocks/template
+++ b/srcpkgs/i3blocks/template
@@ -15,5 +15,5 @@ make_build_args="SYSCONFDIR=/etc"
 
 pre_build() {
    bash $wrksrc/autogen.sh
-   bash $wrksrc/configure --prefix=/usr/bin
+   bash $wrksrc/configure --prefix=/usr/
 }

From 15b49e1b322f7f5a6faa7d32b7576631eb8607e9 Mon Sep 17 00:00:00 2001
From: Pratyush Sureka <pratsure@gmail.com>
Date: Sat, 5 Oct 2019 12:13:00 +0530
Subject: [PATCH 3/3] sudo: updated to 1.8.28rc

---
 srcpkgs/sudo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index 9047ac6167a..dc08482c6f1 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,6 +1,6 @@
 # Template file for 'sudo'
 pkgname=sudo
-version=1.8.27
+version=1.8.28rc2
 revision=1
 build_style=gnu-configure
 configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
@@ -14,8 +14,8 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="ISC"
 homepage="https://www.sudo.ws/"
 changelog="https://www.sudo.ws/repos/sudo/raw-file/tip/NEWS"
-distfiles="https://www.sudo.ws/dist/sudo-${version}.tar.gz"
-checksum=7beb68b94471ef56d8a1036dbcdc09a7b58a949a68ffce48b83f837dd33e2ec0
+distfiles="https://www.sudo.ws/dist/beta/sudo-${version}.tar.gz"
+checksum=7f7943562235a6377fff419b39ea8553a579964327a33060978ac244c5f68db9
 conf_files="/etc/pam.d/sudo /etc/sudoers"
 lib32disabled=yes