[gentoo-commits] repo/gentoo:master commit in: app-admin/clog/, app-admin/clog/files/

[gentoo-commits] repo/gentoo:master commit in: app-admin/clog/, app-admin/clog/files/

[Sam James]

commit:     df018b4e4c6a9598a9060668270d503e6405a473
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 18 07:14:59 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 18 07:15:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df018b4e

app-admin/clog: fix build w/ gcc 13

Closes: https://bugs.gentoo.org/895122
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-admin/clog/clog-1.3.0-r1.ebuild         |  9 ++++++---
 app-admin/clog/files/clog-1.3.0-gcc13.patch | 11 +++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app-admin/clog/clog-1.3.0-r1.ebuild b/app-admin/clog/clog-1.3.0-r1.ebuild
index cf737f78194c..cc6689579c1b 100644
--- a/app-admin/clog/clog-1.3.0-r1.ebuild
+++ b/app-admin/clog/clog-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,13 +9,16 @@ DESCRIPTION="clog is a colorized log tail utility"
 HOMEPAGE="https://taskwarrior.org/docs/clog/"
 SRC_URI="https://gothenburgbitfactory.org/download/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86 ~x64-macos"
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 RESTRICT="test" # No test suite on tar.gz
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.0-gcc13.patch
+)
+
 src_prepare() {
-	default
 	sed -i -e 's|share/doc/clog|share/clog|' CMakeLists.txt || die
 	cmake_src_prepare
 }

diff --git a/app-admin/clog/files/clog-1.3.0-gcc13.patch b/app-admin/clog/files/clog-1.3.0-gcc13.patch
new file mode 100644
index 000000000000..3bdbc464a90e
--- /dev/null
+++ b/app-admin/clog/files/clog-1.3.0-gcc13.patch
@@ -0,0 +1,11 @@
+https://github.com/GothenburgBitFactory/libshared/pull/71
+--- a/src/libshared/src/JSON2.h
++++ b/src/libshared/src/JSON2.h
+@@ -27,6 +27,7 @@
+ #ifndef INCLUDED_JSON2
+ #define INCLUDED_JSON2
+ 
++#include <cstdint>
+ #include <string>
+ 
+ class JSON2

[gentoo-commits] repo/gentoo:master commit in: app-admin/clog/, app-admin/clog/files/

[Arthur Zamarin]

commit:     bab48e2eec6cd8db1080f25ee224471842b08d03
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  6 20:38:31 2025 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Oct  6 20:38:31 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bab48e2e

app-admin/clog: fix build on musl

Closes: https://bugs.gentoo.org/715248
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-admin/clog/clog-1.3.0-r1.ebuild        |  3 ++-
 app-admin/clog/files/clog-1.3.0-musl.patch | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app-admin/clog/clog-1.3.0-r1.ebuild b/app-admin/clog/clog-1.3.0-r1.ebuild
index cc6689579c1b..45e23cdc1d62 100644
--- a/app-admin/clog/clog-1.3.0-r1.ebuild
+++ b/app-admin/clog/clog-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,6 +16,7 @@ RESTRICT="test" # No test suite on tar.gz
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.0-gcc13.patch
+	"${FILESDIR}"/${PN}-1.3.0-musl.patch
 )
 
 src_prepare() {

diff --git a/app-admin/clog/files/clog-1.3.0-musl.patch b/app-admin/clog/files/clog-1.3.0-musl.patch
new file mode 100644
index 000000000000..e9cb12760e67
--- /dev/null
+++ b/app-admin/clog/files/clog-1.3.0-musl.patch
@@ -0,0 +1,11 @@
+--- a/src/libshared/src/FS.cpp
++++ b/src/libshared/src/FS.cpp
+@@ -41,7 +41,7 @@
+ #include <shared.h>
+ #include <format.h>
+ 
+-#if defined SOLARIS || defined NETBSD || defined FREEBSD
++#if defined SOLARIS || defined NETBSD || defined FREEBSD || !defined(__GLIBC__)
+ #include <limits.h>
+ #endif
+