[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/someblocks/, gui-apps/someblocks/files/

[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/someblocks/, gui-apps/someblocks/files/

[Takuya Wakazono]

commit:     2bc44c67d4ca3c01bca68ea78a95c1e018a0963d
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Wed Jan  8 13:30:20 2025 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Wed Jan  8 13:30:20 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2bc44c67

gui-apps/someblocks: fix build with GCC 15

Closes: https://bugs.gentoo.org/945237
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 .../someblocks/files/someblocks-1.0.1-c23.patch    | 29 ++++++++++++++++++++++
 gui-apps/someblocks/someblocks-1.0.1.ebuild        | 17 +++++++------
 gui-apps/someblocks/someblocks-9999.ebuild         | 11 +++++---
 3 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/gui-apps/someblocks/files/someblocks-1.0.1-c23.patch b/gui-apps/someblocks/files/someblocks-1.0.1-c23.patch
new file mode 100644
index 000000000..01ab6422f
--- /dev/null
+++ b/gui-apps/someblocks/files/someblocks-1.0.1-c23.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/945237
+https://lists.sr.ht/~raphi/public-inbox/patches/56817
+C23 compatibility patch.
+--- a/someblocks.c
++++ b/someblocks.c
+@@ -34,7 +34,7 @@ void setupsignals();
+ void sighandler(int signum);
+ int getstatus(char *str, char *last);
+ void statusloop();
+-void termhandler();
++void termhandler(int signum);
+ void pstdout();
+ void psomebar();
+ static void (*writestatus) () = psomebar;
+@@ -178,12 +178,12 @@ void sighandler(int signum)
+ 	writestatus();
+ }
+ 
+-void termhandler()
++void termhandler(int signum)
+ {
+ 	statusContinue = 0;
+ }
+ 
+-void sigpipehandler()
++void sigpipehandler(int signum)
+ {
+ 	close(somebarFd);
+ 	somebarFd = -1;

diff --git a/gui-apps/someblocks/someblocks-1.0.1.ebuild b/gui-apps/someblocks/someblocks-1.0.1.ebuild
index 11c63b74e..546eda5a3 100644
--- a/gui-apps/someblocks/someblocks-1.0.1.ebuild
+++ b/gui-apps/someblocks/someblocks-1.0.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit savedconfig
 
@@ -13,21 +13,22 @@ LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64"
 
+PATCHES=(
+	# bug #945237
+	"${FILESDIR}/${P}-c23.patch"
+)
+
 src_prepare() {
 	default
 	sed -i -e 's:$(LDFLAGS):$(CPPFLAGS) $(CFLAGS) $(LDFLAGS):' Makefile \
 		|| die "sed fix failed. Uh-oh..."
 	# prevent compilation in install phase
-	sed -i -e "s/install: output/install:/g" Makefile
+	sed -i -e "s/install: output/install:/g" Makefile || die
 	restore_config blocks.h
 }
 
-src_compile() {
-	emake output
-}
-
 src_install() {
-	emake PREFIX="${ED}/usr" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
 
 	einstalldocs
 

diff --git a/gui-apps/someblocks/someblocks-9999.ebuild b/gui-apps/someblocks/someblocks-9999.ebuild
index b722149af..ec63b57aa 100644
--- a/gui-apps/someblocks/someblocks-9999.ebuild
+++ b/gui-apps/someblocks/someblocks-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit savedconfig git-r3
 
@@ -16,12 +16,15 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
-
+	sed -i -e 's:$(LDFLAGS):$(CPPFLAGS) $(CFLAGS) $(LDFLAGS):' Makefile \
+		|| die "sed fix failed. Uh-oh..."
+	# prevent compilation in install phase
+	sed -i -e "s/install: output/install:/g" Makefile || die
 	restore_config blocks.h
 }
 
 src_install() {
-	emake PREFIX="${ED}/usr" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
 
 	einstalldocs