TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: utfcpp: Update to 3.2.4.

Browse source 
* gnu/packages/textutils.scm (utfcpp): Update to 3.2.4.
[snippet]: Unbundle ftest.
[arguments]: Remove field.
[native-inputs]: Add ftest.
* gnu/packages/games.scm (warzone2100)[#:phases]: Adjust 'fix-utfcpp-include.
* gnu/packages/video.scm (mkvtoolnix)[#:phases]: Add 'fix-utfcpp-include.

Co-authored-by: Hilton Chain <hako@ultrarare.space>
Signed-off-by: Hilton Chain <hako@ultrarare.space>
This commit is contained in:
Reza Housseini 2023-05-27 16:08:20 +08:00 committed by Hilton Chain
parent d9bb9f5390
commit 4e531e55dc
No known key found for this signature in database
GPG key ID: ACC66D09CA528292
3 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/games.scm
View file

@ -5579,7 +5579,7 @@ (define-public warzone2100
(lambda _
(substitute* "lib/framework/wzstring.cpp"
(("<utfcpp/source/utf8.h>")
"<utf8.h>"))))
"<utf8cpp/utf8.h>"))))
(add-after 'unpack 'link-tests-with-qt
(lambda _
(substitute* "tests/Makefile.am"

27
gnu/packages/textutils.scm
View file

@ -25,6 +25,8 @@
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Bonface Munyoki Kilyungi <me@bonfacemunyoki.com>
;;; Copyright © 2022 Gabriel Wicki <gabriel@erlikon.ch>
;;; Copyright © 2023 Reza Housseini <reza@housseini.me>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;;
;;; This file is part of GNU Guix.
;;;
@ -690,29 +692,26 @@ (define-public catdoc
(define-public utfcpp
(package
(name "utfcpp")
(version "2.3.5")
(version "3.2.4")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/nemtrif/utfcpp")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(modules '((guix build utils)))
;; Unbundle ftest
(snippet
'(begin
(delete-file-recursively "extern")
(substitute* (find-files "tests" "\\.cpp")
(("\"../extern/ftest/ftest.h\"")
"<ftest/ftest.h>"))))
(sha256
(base32
"1gr98d826z6wa58r1s5i7rz7q2x3r31v7zj0pjjlrc7gfxwklr4s"))))
"0p18cbdk57ilbgcgprgqp7fgysb5i0nidczbhc5rnxkiiw4jvxgn"))))
(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))))))
(native-inputs (list ftest))
(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

5
gnu/packages/video.scm
View file

@ -1057,6 +1057,11 @@ (define-public mkvtoolnix
"--enable-precompiled-headers=no")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-utfcpp-include
(lambda _
(substitute* "src/common/strings/utf8.cpp"
(("<utf8.h>")
"<utf8cpp/utf8.h>"))))
(add-after 'unpack 'patch-relative-file-names
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))