[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: guile-gi: Fix a source code encoding error.
From: |
guix-commits |
Subject: |
02/02: gnu: guile-gi: Fix a source code encoding error. |
Date: |
Wed, 3 Nov 2021 07:53:45 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 6c39c131b74651e3019cd199061fcfc3607ba198
Author: Vivien Kraus <vivien@planete-kraus.eu>
AuthorDate: Tue Nov 2 18:19:03 2021 +0100
gnu: guile-gi: Fix a source code encoding error.
* gnu/packages/guile-xyz.scm (guile-gi)[phases]: Remove the default dotted
circle from the combining character that is tested in test/string.scm.
Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
---
gnu/packages/guile-xyz.scm | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 355b23f..e3c36ff 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3142,6 +3142,16 @@ list of components. This module takes care of that for
you.")
(ice-9 rdelim))
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'remove-dotted-circle-from-combining-character
+ ;; The test/string.scm files contain ◌̀, which is a dotted circle
+ ;; (U+25cc) followed by an upper combining character (U+0300). The
+ ;; old guile 3.0.2 reader incorrectly ignores the dotted circle,
+ ;; and parses it as the combining character alone, but the new
+ ;; guile reader does not.
+ ;; See https://github.com/spk121/guile-gi/issues/112
+ (lambda* _
+ (substitute* "test/string.scm"
+ (("#\\\\◌̀") "#\\x0300"))))
(add-after 'unpack 'patch-references-to-extension
(lambda* (#:key outputs #:allow-other-keys)
(let ((effective (read-line