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

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

[Anadon]

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

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))))))

[-- Attachment #2: Type: text/html, Size: 2504 bytes --]

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

[Leo Famulari]

[-- 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

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

[Anadon]

[-- Attachment #1.1: Type: text/plain, Size: 2758 bytes --]

Updated, should be closer.

On Tue, Mar 29, 2022 at 6:10 PM Leo Famulari <leo@famulari.name> wrote:

> 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 #1.2: Type: text/html, Size: 3506 bytes --]

[-- Attachment #2: 0001-Updating-to-add-utfcpp-as-a-seperate-version-and-to-.patch --]
[-- Type: text/x-patch, Size: 3158 bytes --]

From eb6d740795e45a2387b4d253032d7218e4e443c9 Mon Sep 17 00:00:00 2001
From: Anadon <joshua.r.marshall.1991@gmail.com>
Date: Wed, 30 Mar 2022 21:22:04 -0400
Subject: [PATCH] Updating to add utfcpp as a seperate version and to update
 mkvtoolnix and warzone2100 to use the old version since they need behavior
 from version 2 and not version 3.

---
 gnu/packages/games.scm     |  2 +-
 gnu/packages/textutils.scm | 26 +++++++++++++++++++++++++-
 gnu/packages/video.scm     |  2 +-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 8cc29b3487..1c01a41ed6 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5131,7 +5131,7 @@ (define-public warzone2100
               ("openssl" ,openssl)
               ("sdl2" ,sdl2)
               ("sqlite" ,sqlite)
-              ("utfcpp" ,utfcpp)))
+              ("utfcpp" ,utfcpp-2)))
     (home-page "https://wz2100.net")
     (synopsis "3D Real-time strategy and real-time tactics game")
     (description
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index cbc657172d..21e8d861fa 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.
 ;;;
@@ -666,7 +667,7 @@ (define-public catdoc
 @command{catppt}, which extracts data from PowerPoint presentations.")
     (license license:gpl2+)))
 
-(define-public utfcpp
+(define-public utfcpp-2
   (package
     (name "utfcpp")
     (version "2.3.5")
@@ -698,6 +699,29 @@ (define-public utfcpp
 in a portable way.")
     (license license:boost1.0)))
 
+(define-public utfcpp-3
+  (package
+    (name "utfcpp")
+    (version "3.2.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/nemtrif/utfcpp")
+                    (commit (string-append "v" version))
+                    (recursive? #t)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0gsbwif97i025bxgyax4fbf6v9z44zrca4s6wwd8x36ac8qzjppf"))))
+    (build-system cmake-build-system)
+    (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
+in a portable way.")
+    (license license:boost1.0)))
+
+(define-public utfcpp utfcpp-3)
+
 (define-public dbacl
   (package
     (name "dbacl")
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index dc05c0a222..da383192bc 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -991,7 +991,7 @@ (define-public mkvtoolnix
            pugixml
            qtbase-5
            qtmultimedia
-           utfcpp
+           utfcpp-2
            zlib))
     (native-inputs
      `(("docbook-xsl" ,docbook-xsl)
-- 
2.34.0

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

[Anadon]

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

Can I get an update?

On Wed, Mar 30, 2022, 23:43 Anadon <joshua.r.marshall.1991@gmail.com> wrote:

> Updated, should be closer.
>
> On Tue, Mar 29, 2022 at 6:10 PM Leo Famulari <leo@famulari.name> wrote:
>
>> 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: Type: text/html, Size: 3913 bytes --]

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

[Anadon]

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

Bump

On Fri, Apr 1, 2022 at 11:56 PM Anadon <joshua.r.marshall.1991@gmail.com>
wrote:

> Can I get an update?
>
> On Wed, Mar 30, 2022, 23:43 Anadon <joshua.r.marshall.1991@gmail.com>
> wrote:
>
>> Updated, should be closer.
>>
>> On Tue, Mar 29, 2022 at 6:10 PM Leo Famulari <leo@famulari.name> wrote:
>>
>>> 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: Type: text/html, Size: 4332 bytes --]

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

[Leo Famulari]

On Fri, Apr 08, 2022 at 08:33:29PM -0400, Anadon wrote:
> Bump

We are waiting for you to tell us, after applying this update, do all
the dependent packages still work?

You could also answer Tobias's question about naming, although remember
that you are free to use any name you choose.

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

[Anadon]

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

All dependant packages work based off their unit tests.  I believe this is
in line with expectations; I may be mistaken.

I didn't get any notification that Tobias said anything, sorry about that.
I often change between birth name and what I've chosen.  At this point,
I'll just goes with what gives me the least resistance.  I can update the
patch when I'm next at a computer.

On Sun, Apr 10, 2022, 14:18 Leo Famulari <leo@famulari.name> wrote:

> On Fri, Apr 08, 2022 at 08:33:29PM -0400, Anadon wrote:
> > Bump
>
> We are waiting for you to tell us, after applying this update, do all
> the dependent packages still work?
>
> You could also answer Tobias's question about naming, although remember
> that you are free to use any name you choose.
>

[-- Attachment #2: Type: text/html, Size: 1158 bytes --]

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

[Tobias Geerinckx-Rice via Guix-patches via]

On 10 April 2022 18:56:59 UTC, Anadon <joshua.r.marshall.1991@gmail.com> wrote:
>I didn't get any notification that Tobias said anything, sorry about that.

Thanks for letting me know.  Nothing in spam etc.?    I'll check my logs.

If it's all the same to you I prefer using your real-sounding name for copyright purposes, since the 'pseudonym' doesn't seem to be doing any useful work there.



Kind regards,

T G-R

Sent on the go.  Excuse or enjoy my brevity.

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

[Maxim Cournoyer]

Hi Anadon,

Tobias Geerinckx-Rice <me@tobias.gr> writes:

> On 10 April 2022 18:56:59 UTC, Anadon <joshua.r.marshall.1991@gmail.com> wrote:
>>I didn't get any notification that Tobias said anything, sorry about that.
>
> Thanks for letting me know.  Nothing in spam etc.?    I'll check my logs.
>
> If it's all the same to you I prefer using your real-sounding name for copyright purposes, since the 'pseudonym' doesn't seem to be doing any useful work there.

Gentle ping :-)

Thanks,

Maxim

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

[Anadon]

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

Home ownership is distracting, that's for sure.  I'll get back on it.

On Sun, May 22, 2022, 00:23 Maxim Cournoyer <maxim.cournoyer@gmail.com>
wrote:

> Hi Anadon,
>
> Tobias Geerinckx-Rice <me@tobias.gr> writes:
>
> > On 10 April 2022 18:56:59 UTC, Anadon <joshua.r.marshall.1991@gmail.com>
> wrote:
> >>I didn't get any notification that Tobias said anything, sorry about
> that.
> >
> > Thanks for letting me know.  Nothing in spam etc.?    I'll check my logs.
> >
> > If it's all the same to you I prefer using your real-sounding name for
> copyright purposes, since the 'pseudonym' doesn't seem to be doing any
> useful work there.
>
> Gentle ping :-)
>
> Thanks,
>
> Maxim
>

[-- Attachment #2: Type: text/html, Size: 1215 bytes --]

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

[Tobias Geerinckx-Rice via Guix-patches via]

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

Anadon 写道：
> Home ownership is distracting, that's for sure.  I'll get back 
> on it.

I think the only remaining question was that of foregoing ‘Anadon’ 
in favour of the name in your e-mail address, assuming that's more 
real.

Kind regards,

T G-R

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]

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

[Anadon]

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

There was also the matter of changing v2 to inherit and modify from the new
v3 and skip the mapping of utfcpp name to the utfcppv3 package.

On Sun, May 22, 2022, 11:09 Tobias Geerinckx-Rice <me@tobias.gr> wrote:

> Anadon 写道：
> > Home ownership is distracting, that's for sure.  I'll get back
> > on it.
>
> I think the only remaining question was that of foregoing ‘Anadon’
> in favour of the name in your e-mail address, assuming that's more
> real.
>
> Kind regards,
>
> T G-R
>

[-- Attachment #2: Type: text/html, Size: 803 bytes --]

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

[Anadon]

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

I don't think messing with Warzone2100 or mkvtoolnix is the best idea.
Looking at Warzone2100, it handles pulling a specific version of utfcpp via
git submodules so I'm guessing it was packaged incorrectly in the first
place.  This is also exactly the same case for mkvtoolnix.  IMO, changing
those packages is out of scope, and they should have been packaged
differently in the first place to conform to their authors' expectations.

On Sun, May 22, 2022 at 1:41 PM Anadon <joshua.r.marshall.1991@gmail.com>
wrote:

> There was also the matter of changing v2 to inherit and modify from the
> new v3 and skip the mapping of utfcpp name to the utfcppv3 package.
>
> On Sun, May 22, 2022, 11:09 Tobias Geerinckx-Rice <me@tobias.gr> wrote:
>
>> Anadon 写道：
>> > Home ownership is distracting, that's for sure.  I'll get back
>> > on it.
>>
>> I think the only remaining question was that of foregoing ‘Anadon’
>> in favour of the name in your e-mail address, assuming that's more
>> real.
>>
>> Kind regards,
>>
>> T G-R
>>
>

[-- Attachment #2: Type: text/html, Size: 1663 bytes --]

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

[Liliana Marie Prikler]

Am Sonntag, dem 29.05.2022 um 13:50 -0400 schrieb Anadon:
> I don't think messing with Warzone2100 or mkvtoolnix is the best
> idea.  Looking at Warzone2100, it handles pulling a specific version
> of utfcpp via git submodules so I'm guessing it was packaged
> incorrectly in the first place.  This is also exactly the same case
> for mkvtoolnix.  IMO, changing those packages is out of scope, and
> they should have been packaged differently in the first place to
> conform to their authors' expectations.
I don't think either package is incorrect as-is.  Unbundling is a
feature, not a bug.

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

[Anadon]

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

I have to pull the change.  I can't justify the time modifying other
packages.

On Sun, May 29, 2022 at 2:20 PM Liliana Marie Prikler <
liliana.prikler@gmail.com> wrote:

> Am Sonntag, dem 29.05.2022 um 13:50 -0400 schrieb Anadon:
> > I don't think messing with Warzone2100 or mkvtoolnix is the best
> > idea.  Looking at Warzone2100, it handles pulling a specific version
> > of utfcpp via git submodules so I'm guessing it was packaged
> > incorrectly in the first place.  This is also exactly the same case
> > for mkvtoolnix.  IMO, changing those packages is out of scope, and
> > they should have been packaged differently in the first place to
> > conform to their authors' expectations.
> I don't think either package is incorrect as-is.  Unbundling is a
> feature, not a bug.
>

[-- Attachment #2: Type: text/html, Size: 1148 bytes --]

bug#54630: [PATCH] utfcpp v3.2.1

[Maxim Cournoyer]

Hi Anadon,

Anadon <joshua.r.marshall.1991@gmail.com> writes:

> I have to pull the change.  I can't justify the time modifying other
> packages.

OK, thanks for letting us know.

I'm closing the patch, but whoever is motivated looking into it is
welcome to do so!

Maxim

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

[Tobias Geerinckx-Rice via Guix-patches via]

Anadon,

As begun in #guix: I've applied the patch (with a few modifications) and 
will build all dependents overnight.

I've changed utfcpp-2 to inherit from utfcpp and removed the indirection 
(via the unused utfcpp-3) of the latter.

Whilst Guix tolerates to the point of accepting pseudonyms in copyright 
statements, yours seems rather… redundant?  Is there a compelling reason 
not to use the name in your e-mail address?  Is it also a pseudonym?

Kind regards,

T G-R

Sent from a Web browser.  Excuse or enjoy my brevity.

[bug#54630] [PATCH] Updating to add utfcpp as a seperate version and to update mkvtoolnix and warzone2100 to use the old version since they need behavior from version 2 and not version 3.

[Anadon]

---
 gnu/packages/games.scm     |  2 +-
 gnu/packages/textutils.scm | 30 ++++++++++++++++++++++++------
 gnu/packages/video.scm     |  2 +-
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 8cc29b3487..1c01a41ed6 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5131,7 +5131,7 @@ (define-public warzone2100
               ("openssl" ,openssl)
               ("sdl2" ,sdl2)
               ("sqlite" ,sqlite)
-              ("utfcpp" ,utfcpp)))
+              ("utfcpp" ,utfcpp-2)))
     (home-page "https://wz2100.net")
     (synopsis "3D Real-time strategy and real-time tactics game")
     (description
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index cbc657172d..484884160d 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 Josh Marshall <joshua.r.marshall.1991@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -668,6 +669,28 @@ (define-public catdoc
 
 (define-public utfcpp
   (package
+    (name "utfcpp")
+    (version "3.2.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/nemtrif/utfcpp")
+                    (commit (string-append "v" version))
+                    (recursive? #t)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0gsbwif97i025bxgyax4fbf6v9z44zrca4s6wwd8x36ac8qzjppf"))))
+    (build-system cmake-build-system)
+    (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
+in a portable way.")
+    (license license:boost1.0)))
+
+(define-public utfcpp-2
+  (package
+    (inherit utfcpp)
     (name "utfcpp")
     (version "2.3.5")
     (source (origin
@@ -691,12 +714,7 @@ (define-public utfcpp
                     (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
-in a portable way.")
-    (license license:boost1.0)))
+               #t))))))))
 
 (define-public dbacl
   (package
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index dc05c0a222..da383192bc 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -991,7 +991,7 @@ (define-public mkvtoolnix
            pugixml
            qtbase-5
            qtmultimedia
-           utfcpp
+           utfcpp-2
            zlib))
     (native-inputs
      `(("docbook-xsl" ,docbook-xsl)
-- 
2.34.0

[bug#54630] [PATCH] Updating to add utfcpp as a seperate version and to update mkvtoolnix and warzone2100 to use the old version since they need behavior from version 2 and not version 3.

[Liliana Marie Prikler]

Hi,

Am Donnerstag, dem 26.05.2022 um 23:03 -0400 schrieb Anadon:
> ---
We don't do light novel title commit messages.  Use a short summary,
e.g. "gnu: textutils: Update to 3.2.1", followed by an empty line
followed by a ChangeLog.

>  gnu/packages/games.scm     |  2 +-
>  gnu/packages/textutils.scm | 30 ++++++++++++++++++++++++------
>  gnu/packages/video.scm     |  2 +-
>  3 files changed, 26 insertions(+), 8 deletions(-)
> 
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index 8cc29b3487..1c01a41ed6 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -5131,7 +5131,7 @@ (define-public warzone2100
>                ("openssl" ,openssl)
>                ("sdl2" ,sdl2)
>                ("sqlite" ,sqlite)
> -              ("utfcpp" ,utfcpp)))
> +              ("utfcpp" ,utfcpp-2)))
utfcpp installs its headers in a different location.  Chances are you
only need to patch warzone2100 to look them up.

>      (home-page "https://wz2100.net")
>      (synopsis "3D Real-time strategy and real-time tactics game")
>      (description
> diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
> index cbc657172d..484884160d 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 Josh Marshall
> <joshua.r.marshall.1991@gmail.com>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -668,6 +669,28 @@ (define-public catdoc
>  
>  (define-public utfcpp
>    (package
> +    (name "utfcpp")
> +    (version "3.2.1")
> +    (source (origin
> +              (method git-fetch)
> +              (uri (git-reference
> +                    (url "https://github.com/nemtrif/utfcpp")
> +                    (commit (string-append "v" version))
> +                    (recursive? #t)))
> +              (file-name (git-file-name name version))
> +              (sha256
> +               (base32
> +               
> "0gsbwif97i025bxgyax4fbf6v9z44zrca4s6wwd8x36ac8qzjppf"))))
> +    (build-system cmake-build-system)
> +    (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
> +in a portable way.")
> +    (license license:boost1.0)))
> +
> +(define-public utfcpp-2
> +  (package
> +    (inherit utfcpp)
>      (name "utfcpp")
>      (version "2.3.5")
>      (source (origin
> @@ -691,12 +714,7 @@ (define-public utfcpp
>                      (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
> -in a portable way.")
> -    (license license:boost1.0)))
> +               #t))))))))
>  
>  (define-public dbacl
>    (package
> diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
> index dc05c0a222..da383192bc 100644
> --- a/gnu/packages/video.scm
> +++ b/gnu/packages/video.scm
> @@ -991,7 +991,7 @@ (define-public mkvtoolnix
>             pugixml
>             qtbase-5
>             qtmultimedia
> -           utfcpp
> +           utfcpp-2
Likewise.


Cheers

[bug#54630] [PATCH] Updating to add utfcpp as a seperate version and to update mkvtoolnix and warzone2100 to use the old version since they need behavior from version 2 and not version 3.

[Anadon]

---
 gnu/packages/games.scm     |  2 +-
 gnu/packages/textutils.scm | 30 ++++++++++++++++++++++++------
 gnu/packages/video.scm     |  2 +-
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 8cc29b3487..1c01a41ed6 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5131,7 +5131,7 @@ (define-public warzone2100
               ("openssl" ,openssl)
               ("sdl2" ,sdl2)
               ("sqlite" ,sqlite)
-              ("utfcpp" ,utfcpp)))
+              ("utfcpp" ,utfcpp-2)))
     (home-page "https://wz2100.net")
     (synopsis "3D Real-time strategy and real-time tactics game")
     (description
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index cbc657172d..484884160d 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 Josh Marshall <joshua.r.marshall.1991@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -668,6 +669,28 @@ (define-public catdoc
 
 (define-public utfcpp
   (package
+    (name "utfcpp")
+    (version "3.2.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/nemtrif/utfcpp")
+                    (commit (string-append "v" version))
+                    (recursive? #t)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0gsbwif97i025bxgyax4fbf6v9z44zrca4s6wwd8x36ac8qzjppf"))))
+    (build-system cmake-build-system)
+    (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
+in a portable way.")
+    (license license:boost1.0)))
+
+(define-public utfcpp-2
+  (package
+    (inherit utfcpp)
     (name "utfcpp")
     (version "2.3.5")
     (source (origin
@@ -691,12 +714,7 @@ (define-public utfcpp
                     (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
-in a portable way.")
-    (license license:boost1.0)))
+               #t))))))))
 
 (define-public dbacl
   (package
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index dc05c0a222..da383192bc 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -991,7 +991,7 @@ (define-public mkvtoolnix
            pugixml
            qtbase-5
            qtmultimedia
-           utfcpp
+           utfcpp-2
            zlib))
     (native-inputs
      `(("docbook-xsl" ,docbook-xsl)
-- 
2.34.0