[bug#54630] [PATCH] utfcpp v3.2.1

[Leo Famulari <leo@famulari.name>]

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

On Tue, Mar 29, 2022 at 05:48:47PM -0400, Anadon wrote:
>  (define-public utfcpp
>    (package
>      (name "utfcpp")
> -    (version "2.3.5")
> +    (version "3.2.1")

Thanks!

I turned it into a Git commit (attached as a patch) and built utfcpp 3.2.1
successfully.

I noticed that at least one of the handful of packages that depend on
utfcpp, mkvtoolnix, doesn't build with this update:

------
[...]
starting phase `build'
            CC lib/librmff/rmff.c
           CXX src/mpegparser/MPEGVideoBuffer.cpp
           CXX src/common/xml/xml.cpp
            CC lib/librmff/mb_file_io.c
            AR lib/librmff/librmff.a
        RANLIB lib/librmff/librmff.a
           CXX lib/avilib-0.6.10/xio.cpp
           CXX src/mpegparser/M2VParser.cpp
            CC lib/avilib-0.6.10/avimisc.c
            CC lib/avilib-0.6.10/avilib.c
            AR lib/avilib-0.6.10/libavi.a
        RANLIB lib/avilib-0.6.10/libavi.a
           CXX src/common/xml/ebml_tags_converter.cpp
           CXX src/mpegparser/CircBuffer.cpp
           CXX src/common/xml/ebml_segmentinfo_converter.cpp
            AR src/mpegparser/libmpegparser.a
        RANLIB src/mpegparser/libmpegparser.a
           CXX src/common/xml/ebml_converter.cpp
           CXX src/common/xml/ebml_chapters_converter.cpp
           CXX src/common/tags/vorbis.cpp
           CXX src/common/tags/tags.cpp
           CXX src/common/strings/utf8.cpp
src/common/strings/utf8.cpp:21:10: fatal error: utf8.h: No such file or directory
   21 | #include <utf8.h>
      |          ^~~~~~~~
compilation terminated.
error: in phase 'build': uncaught exception:
%exception #<&invoke-error program: "rake" arguments: ("-j" "4") exit-status: 1 term-signal: #f stop-signal: #f> 
phase `build' failed after 47.3 seconds
command "rake" "-j" "4" failed with status 1
builder for `/gnu/store/n4jp4915g90c0f89njnlljhfd75k5y0g-mkvtoolnix-52.0.0.drv' failed with exit code 1
build of /gnu/store/n4jp4915g90c0f89njnlljhfd75k5y0g-mkvtoolnix-52.0.0.drv failed
View build log at '/var/log/guix/drvs/n4/jp4915g90c0f89njnlljhfd75k5y0g-mkvtoolnix-52.0.0.drv.gz'.
guix build: error: build of `/gnu/store/n4jp4915g90c0f89njnlljhfd75k5y0g-mkvtoolnix-52.0.0.drv' failed
------

One can check full list of packages that depend on utfcpp like this:

------
$ guix refresh --list-dependent utfcpp 
Building the following 6 packages would ensure 8 dependent packages are rebuilt: emacs-flycheck-ledger@0.5 emacs-ledger-mode@4.0.0 warzone2100@4.0.1 osmium-tool@1.14.0 osm2pgsql@1.5.1 mkvtoolnix@52.0.0
------

[-- Attachment #2: 0001-gnu-utfcpp-Update-to-3.2.1.patch --]
[-- Type: text/plain, Size: 2446 bytes --]

From 076c1d163fbdb29077726a3fec8bbbec96fc4569 Mon Sep 17 00:00:00 2001
From: Anadon <joshua.r.marshall.1991@gmail.com>
Date: Tue, 29 Mar 2022 17:58:52 -0400
Subject: [PATCH] gnu: utfcpp: Update to 3.2.1.

* gnu/packages/textutils.scm (utfcpp): Update to 3.2.1.
[source]: Fetch Git submodules.
[arguments]: Remove field.

Signed-off-by: Leo Famulari <leo@famulari.name>
---
 gnu/packages/textutils.scm | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index cbc657172d..c2c1a66438 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -24,6 +24,7 @@
 ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
 ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
 ;;; Copyright © 2021 Bonface Munyoki Kilyungi <me@bonfacemunyoki.com>
+;;; Copyright © 2021 Anadon <joshua.r.marshall.1991@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -669,29 +670,18 @@ (define-public catdoc
 (define-public utfcpp
   (package
     (name "utfcpp")
-    (version "2.3.5")
+    (version "3.2.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                      (url "https://github.com/nemtrif/utfcpp")
-                     (commit (string-append "v" version))))
+                     (commit (string-append "v" version))
+                     (recursive? #t)))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1gr98d826z6wa58r1s5i7rz7q2x3r31v7zj0pjjlrc7gfxwklr4s"))))
+                "0gsbwif97i025bxgyax4fbf6v9z44zrca4s6wwd8x36ac8qzjppf"))))
     (build-system cmake-build-system)
-    (arguments
-     `(#:out-of-source? #f
-       #:phases
-       (modify-phases %standard-phases
-         (replace 'install              ; no install target
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (include (string-append out "/include"))
-                    (doc (string-append out "/share/doc/" ,name)))
-               (copy-recursively "source" include)
-               (install-file "README.md" doc)
-               #t))))))
     (home-page "https://github.com/nemtrif/utfcpp")
     (synopsis "Portable C++ library for handling UTF-8")
     (description "UTF8-CPP is a C++ library for handling UTF-8 encoded text
-- 
2.34.0