From: Anadon <joshua.r.marshall.1991@gmail.com>
To: 54630@debbugs.gnu.org
Cc: Anadon <joshua.r.marshall.1991@gmail.com>
Subject: [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.
Date: Thu, 26 May 2022 23:37:42 -0400 [thread overview]
Message-ID: <20220527033742.217278-1-joshua.r.marshall.1991@gmail.com> (raw)
In-Reply-To: <CAFkJGRddNbOPc0UOtT6zJDVevHn4WZLwd6FLbDFRJASKmC5tYg@mail.gmail.com>
---
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
prev parent reply other threads:[~2022-05-27 3:38 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-29 21:48 [bug#54630] [PATCH] utfcpp v3.2.1 Anadon
2022-03-29 22:10 ` Leo Famulari
2022-03-31 3:43 ` Anadon
2022-04-02 3:56 ` Anadon
2022-04-09 0:33 ` Anadon
2022-04-10 18:18 ` Leo Famulari
2022-04-10 18:56 ` Anadon
2022-04-10 20:41 ` Tobias Geerinckx-Rice via Guix-patches via
2022-05-22 4:23 ` Maxim Cournoyer
2022-05-22 14:46 ` Anadon
2022-05-22 15:09 ` Tobias Geerinckx-Rice via Guix-patches via
2022-05-22 17:41 ` Anadon
2022-05-29 17:50 ` Anadon
2022-05-29 18:20 ` Liliana Marie Prikler
2022-06-04 17:37 ` Anadon
2022-06-06 14:06 ` bug#54630: " Maxim Cournoyer
2022-04-02 22:44 ` [bug#54630] " Tobias Geerinckx-Rice via Guix-patches via
2022-05-27 3:03 ` [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
2022-05-27 6:51 ` Liliana Marie Prikler
2022-05-27 3:37 ` Anadon [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220527033742.217278-1-joshua.r.marshall.1991@gmail.com \
--to=joshua.r.marshall.1991@gmail.com \
--cc=54630@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).