From 4939bcf4bbae4d486fd7b88c7acf3f74bb571a86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Birk=20S=C3=B8rensen?= <chrbirks@gmail.com>
Date: Sun, 16 Nov 2025 15:57:38 +0100
Subject: [PATCH] gnu: multitail: Update to 7.1.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/logging.scm (multitail): Update to 7.1.5.
  [source]<uri>: Switch back to the original repository.
  [build-system]: Change to cmake-build-system.
  [arguments]<#:phases>: Remove fix-broken-build.

Change-Id: I3164f57341940fc5a49a2713f73557090724be7c
Merges: https://codeberg.org/guix/guix/pulls/4248
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
---
 gnu/packages/logging.scm | 49 +++++++++++++---------------------------
 1 file changed, 16 insertions(+), 33 deletions(-)

diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index 1f7acb4c098..8198bd70c35 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -229,42 +229,25 @@ provides some unique features such as CSV log format and wide string support.")
 (define-public multitail
   (package
     (name "multitail")
-    (version "6.5.2")
+    (version "7.1.5")
     (source
      (origin
-      (method git-fetch)
-      (uri (git-reference
-            (url "https://github.com/halturin/multitail")
-            (commit (string-append "v" version))))
-      (file-name (git-file-name name version))
-      (sha256
-       (base32 "17hg5qpangyx4m7hp2x4h56mp6w3wsaslg1il39qcpwsffh1rihc"))))
-    (build-system gnu-build-system)
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/folkertvanheusden/multitail")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "11kkd2rg3qc7ck5iyha0f8l5lqc1bvwypn80di0h77h7p106blvk"))))
+    (build-system cmake-build-system)
     (arguments
-     `(#:make-flags
-       (list (string-append "CC=" ,(cc-for-target))
-             (string-append "PREFIX=" (assoc-ref %outputs "out"))
-             "SYSCONFDIR=$(PREFIX)/etc")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-broken-build
-           ;; With some luck, you might be able to remove this when updating…
-           (lambda _
-             (substitute* "Makefile"
-               ((" \\*\\.txt") "")
-               ((".*CONFIG_DIR.*") "")
-               (("^install: .*" match)
-                (string-append match
-                               "\t$(INSTALL_DIR) $(DESTDIR)$(SYSCONFDIR)\n")))
-             (substitute* "version"
-               (("(VERSION=).*" _ assign)
-                (string-append assign ,version)))))
-         (add-after 'unpack 'patch-curses-headers
-           (lambda _
-             (substitute* "mt.h"
-               (("ncursesw/") ""))))
-         (delete 'configure))           ; no configure script
-       #:tests? #f)) ; no test suite (make check just runs cppcheck)
+     (list
+      #:tests? #f                       ;no test suite
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'unpack 'patch-curses-headers
+                     (lambda _
+                       (substitute* "mt.h"
+                         (("ncursesw/") "")))))))
     (inputs (list ncurses))
     (home-page "https://vanheusden.com/multitail/")
     (synopsis "Monitor multiple log files")