Re: [PR PATCH] [Updated] batsignal: update to 1.5.0.

[motorto <motorto@users.noreply.github.com>]

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

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

https://github.com/motorto/void-packages batsignal-1.5.0
https://github.com/void-linux/void-packages/pull/38252

batsignal: update to 1.5.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86_64{glibc,musl}


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

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

From 1d9f51e0999bffc63112da12002a928c44bbfb7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 24 Jul 2022 21:03:08 +0100
Subject: [PATCH] batsignal: update to 1.5.0.

---
 srcpkgs/batsignal/makefile.patch       | 40 ++++++++++++++++++++++
 srcpkgs/batsignal/patches/0001-b.patch | 47 ++++++++++++++++++++++++++
 srcpkgs/batsignal/template             |  6 ++--
 3 files changed, 90 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/batsignal/makefile.patch
 create mode 100644 srcpkgs/batsignal/patches/0001-b.patch

diff --git a/srcpkgs/batsignal/makefile.patch b/srcpkgs/batsignal/makefile.patch
new file mode 100644
index 000000000000..06ee4e6d5970
--- /dev/null
+++ b/srcpkgs/batsignal/makefile.patch
@@ -0,0 +1,40 @@
+From 08459907cb33822e85779dc311ed0d5ec770f2fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
+Date: Sun, 24 Jul 2022 21:35:52 +0100
+Subject: [PATCH 1/1] b
+
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index a50c609..8bfca4e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ .POSIX:
+ 
+ NAME = batsignal
+-VERSION != grep VERSION version.h | cut -d \" -f2
++VERSION = $(shell grep VERSION version.h | cut -d \" -f2)
+ 
+ CC = cc
+ RM = rm -f
+@@ -17,12 +17,12 @@ MANPREFIX=$(MANPREFIX.$(PREFIX))
+ 
+ INCLUDES != pkg-config --cflags libnotify
+ CFLAGS_EXTRA = -pedantic -Wall -Wextra -Werror -Wno-unused-parameter -Os
+-CFLAGS := $(CFLAGS_EXTRA) -std=c11 $(INCLUDES)
++CFLAGS := $(CFLAGS_EXTRA) $(CFLAGS) -std=c99 $(shell pkg-config --cflags libnotify)
+ 
+ LIBS != pkg-config --libs libnotify
+ LIBS := $(LIBS) -lm
+ LDFLAGS_EXTRA = -s
+-LDFLAGS := $(LIBS) $(LDFLAGS_EXTRA)
++LDFLAGS := $(LDFLAGS) $(shell pkg-config --libs libnotify)
+ 
+ all: $(NAME) $(NAME).1
+ 
+-- 
+2.37.1
+
diff --git a/srcpkgs/batsignal/patches/0001-b.patch b/srcpkgs/batsignal/patches/0001-b.patch
new file mode 100644
index 000000000000..c79840f38cd5
--- /dev/null
+++ b/srcpkgs/batsignal/patches/0001-b.patch
@@ -0,0 +1,47 @@
+From ff192a7540e9e2101c483e80c362dbee2e81addd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
+Date: Sun, 24 Jul 2022 21:49:44 +0100
+Subject: [PATCH 1/1] Fix Makefile
+
+---
+ Makefile | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index a50c609..8b3f8c5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,21 +15,23 @@ MANPREFIX./usr/local=/usr/local/man
+ MANPREFIX.=/usr/share/man
+ MANPREFIX=$(MANPREFIX.$(PREFIX))
+ 
+-INCLUDES != pkg-config --cflags libnotify
++# INCLUDES !=  $(shell pkg-config --libs libnotify)
+ CFLAGS_EXTRA = -pedantic -Wall -Wextra -Werror -Wno-unused-parameter -Os
+-CFLAGS := $(CFLAGS_EXTRA) -std=c11 $(INCLUDES)
++# CFLAGS := $(CFLAGS_EXTRA) -std=c11 $(INCLUDES)
++CFLAGS := $(CFLAGS_EXTRA)  -std=c99 $(shell pkg-config --cflags libnotify) $(CFLAGS)
+ 
+-LIBS != pkg-config --libs libnotify
+-LIBS := $(LIBS) -lm
+-LDFLAGS_EXTRA = -s
+-LDFLAGS := $(LIBS) $(LDFLAGS_EXTRA)
++# LIBS !=  $(shell pkg-config --libs libnotify)
++# LIBS := $(LIBS) -lm
++# LDFLAGS_EXTRA = -s
++# LDFLAGS := $(LIBS) $(LDFLAGS_EXTRA)
++LDFLAGS := -lm $(shell pkg-config --libs libnotify) $(LDFLAGS)
+ 
+ all: $(NAME) $(NAME).1
+ 
+ $(NAME).o: version.h
+ 
+ $(NAME): $(NAME).o
+-	$(CC) -o $(NAME) $(NAME).o $(LDFLAGS)
++	$(CC) $(CFLAGS) -o $(NAME) $(NAME).o $(LDFLAGS)
+ 
+ $(NAME).1: $(NAME).1.in version.h
+ 	$(SED) "s/VERSION/$(VERSION)/g" < $(NAME).1.in > $@
+-- 
+2.37.1
+
diff --git a/srcpkgs/batsignal/template b/srcpkgs/batsignal/template
index a8d55e6ad30f..ee9f52deafca 100644
--- a/srcpkgs/batsignal/template
+++ b/srcpkgs/batsignal/template
@@ -1,17 +1,17 @@
 # Template file for 'batsignal'
 pkgname=batsignal
-version=1.3.2
+version=1.5.0
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pkg-config"
-makedepends="libnotify-devel"
+makedepends="libnotify-devel libglib-devel"
 short_desc="Simple battery monitor"
 maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="ISC"
 homepage="https://github.com/electrickite/batsignal"
 distfiles="https://github.com/electrickite/batsignal/archive/${version}.tar.gz"
-checksum=d8ecb26435b4a49f804ebc2bc1f18215a4c7cfd2a5de7e2a1ccef5263e1c04e7
+checksum=be3196bac5f369348123d78cacc3d20d29005a8bc93bcbc4541231843a5a7f5f
 
 post_install() {
 	vlicense LICENSE