[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#64255] [PATCH v2 2/2] gnu: utfcpp: Update to 3.2.3.
From: |
Hilton Chain |
Subject: |
[bug#64255] [PATCH v2 2/2] gnu: utfcpp: Update to 3.2.3. |
Date: |
Thu, 3 Aug 2023 22:06:44 +0800 |
From: Reza Housseini <reza@housseini.me>
* gnu/packages/textutils.scm (utfcpp): Update to 3.2.3.
[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>
---
gnu/packages/games.scm | 2 +-
gnu/packages/textutils.scm | 27 +++++++++++++--------------
gnu/packages/video.scm | 5 +++++
3 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 1573d7de00..82302852f4 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5573,7 +5573,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"
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 4e026fc6f9..5fbfdde284 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -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.3")
(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"))))
+ "00hzh39iddbc6nxg13813qd6d55g2kccwjf5dr96wykfhway9wbr"))))
(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
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 801c2602e4..f75a528b13 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1050,6 +1050,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")))
--
2.41.0