GNU bug report logs - #77890
[PATCH] gnu: libskk: Fix tests.

Previous Next

To reply to this bug, email your comments to 77890 AT debbugs.gnu.org.
There is no need to reopen the bug first.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Kurome <hunt31999 <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: Kurome <hunt31999 <at> gmail.com>
Subject: [PATCH] gnu: libskk: Fix tests.
Date: Fri, 18 Apr 2025 15:19:34 +0900

Add a patch file to fix invalid escape:
https://github.com/ueno/libskk/pull/90

and symlink skk-jisyo.

* gnu/packages/patches/libskk-fix-invalid-escape.patch: New file.
* gnu/packages/language.scm: Import (gnu packages dictionaries).
(libskk) [source]: Use the patch.
[arguments] <#:prallel-tests?>: Disable parallel tests.
<#:phases>: Add `symlink-skk-jisyo`.
[inputs]: Add skk-jisyo.

Change-Id: I3d086f2a691a42b4df9083ca711261744b8ad418
---
 gnu/packages/language.scm                     | 23 +++++++++++++++++--
 .../patches/libskk-fix-invalid-escape.patch   | 16 +++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/libskk-fix-invalid-escape.patch

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 13957e12a0..b7d908b25b 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -40,6 +40,7 @@ (define-module (gnu packages language)
   #:use-module (gnu packages crates-database)
   #:use-module (gnu packages crates-tls)
   #:use-module (gnu packages dbm)
+  #:use-module (gnu packages dictionaries)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages emacs)
   #:use-module (gnu packages freedesktop)
@@ -924,8 +925,23 @@ (define-public libskk
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0y279pcgs3jrsi9vzx086xhz9jbz23dqqijp4agygc9ackp9sxy5"))))
+                "0y279pcgs3jrsi9vzx086xhz9jbz23dqqijp4agygc9ackp9sxy5"))
+              (patches
+               (search-patches
+                "libskk-fix-invalid-escape.patch"))))
     (build-system gnu-build-system)
+    (arguments
+     (list
+      #:parallel-tests? #f ; concurrency issues in tests
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'install 'symlink-skk-jisyo
+            (lambda _
+              (let ((dict-dir (string-append #$output "/share/skk")))
+                (mkdir-p dict-dir)
+                (invoke "ln" "-s"
+                        (string-append #$skk-jisyo "/share/skk")
+                        dict-dir)))))))
     (native-inputs (list autoconf
                          automake
                          gettext-minimal
@@ -933,7 +949,10 @@ (define-public libskk
                          libtool
                          pkg-config
                          vala))
-    (inputs (list libgee json-glib libxkbcommon))
+    (inputs (list libgee
+                  json-glib
+                  libxkbcommon
+                  skk-jisyo))
     (home-page "https://github.com/ueno/libskk")
     (synopsis "Dealing with Japanese kana-to-kanji conversion")
     (description
diff --git a/gnu/packages/patches/libskk-fix-invalid-escape.patch b/gnu/packages/patches/libskk-fix-invalid-escape.patch
new file mode 100644
index 0000000000..2f443e83c9
--- /dev/null
+++ b/gnu/packages/patches/libskk-fix-invalid-escape.patch
@@ -0,0 +1,16 @@
+fix parse error:
+https://github.com/ueno/libskk/pull/90
+
+diff --git a/rules/default/rom-kana/default.json b/rules/default/rom-kana/default.json
+index 6ddfce6..68dcff9 100644
+--- a/rules/default/rom-kana/default.json
++++ b/rules/default/rom-kana/default.json
+@@ -108,7 +108,7 @@
+             "myi": ["", "みぃ" ],
+             "myo": ["", "みょ" ],
+             "myu": ["", "みゅ" ],
+-            "n\'": ["", "ん" ],
++            "n'": ["", "ん" ],
+             "na": ["", "な" ],
+             "ne": ["", "ね" ],
+             "ni": ["", "に" ],
-- 
2.49.0

Message #10 received at 77890-done <at> debbugs.gnu.org (full text, mbox):

From: Hilton Chain <hako <at> ultrarare.space>
To: Kurome <hunt31999 <at> gmail.com>
Cc: iyzsong <at> envs.net, 77890-done <at> debbugs.gnu.org
Subject: Re: [bug#77890] [PATCH] gnu: libskk: Fix tests.
Date: Sat, 19 Apr 2025 14:31:44 +0800

On Fri, 18 Apr 2025 14:19:34 +0800,
Kurome wrote:
>
> Add a patch file to fix invalid escape:
> https://github.com/ueno/libskk/pull/90
>
> and symlink skk-jisyo.
>
> * gnu/packages/patches/libskk-fix-invalid-escape.patch: New file.
> * gnu/packages/language.scm: Import (gnu packages dictionaries).
> (libskk) [source]: Use the patch.
> [arguments] <#:prallel-tests?>: Disable parallel tests.
> <#:phases>: Add `symlink-skk-jisyo`.
> [inputs]: Add skk-jisyo.
>
> Change-Id: I3d086f2a691a42b4df9083ca711261744b8ad418
> ---
>  gnu/packages/language.scm                     | 23 +++++++++++++++++--
>  .../patches/libskk-fix-invalid-escape.patch   | 16 +++++++++++++
>  2 files changed, 37 insertions(+), 2 deletions(-)
>  create mode 100644 gnu/packages/patches/libskk-fix-invalid-escape.patch

Applied as b0d0f0f9051f45f44fb592afe5dcb50ac0e405f7 with following change, thanks!

diff --git a/gnu/local.mk b/gnu/local.mk
index 3e29c67453..dc8d00742d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1765,6 +1765,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/libquicktime-ffmpeg.patch 		\
   %D%/packages/patches/libsecret-fix-test-paths.patch		\
   %D%/packages/patches/libsepol-versioned-docbook.patch		\
+  %D%/packages/patches/libskk-fix-invalid-escape.patch		\
   %D%/packages/patches/libtar-CVE-2013-4420.patch 		\
   %D%/packages/patches/libtar-CVE-2021-33643-CVE-2021-33644.patch	\
   %D%/packages/patches/libtar-CVE-2021-33645-CVE-2021-33646.patch	\
diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index b7d908b25b..b15cdc2e73 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -931,17 +931,14 @@ (define-public libskk
                 "libskk-fix-invalid-escape.patch"))))
     (build-system gnu-build-system)
     (arguments
-     (list
-      #:parallel-tests? #f ; concurrency issues in tests
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 'symlink-skk-jisyo
-            (lambda _
-              (let ((dict-dir (string-append #$output "/share/skk")))
-                (mkdir-p dict-dir)
-                (invoke "ln" "-s"
-                        (string-append #$skk-jisyo "/share/skk")
-                        dict-dir)))))))
+     (list #:parallel-tests? #f        ;Concurrency issues in tests.
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'install 'symlink-skk-jisyo
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (let ((dict-dir "share/skk"))
+                     (symlink (search-input-directory inputs dict-dir)
+                              (in-vicinity #$output dict-dir))))))))
     (native-inputs (list autoconf
                          automake
                          gettext-minimal
@@ -949,10 +946,7 @@ (define-public libskk
                          libtool
                          pkg-config
                          vala))
-    (inputs (list libgee
-                  json-glib
-                  libxkbcommon
-                  skk-jisyo))
+    (inputs (list libgee json-glib libxkbcommon skk-jisyo))
     (home-page "https://github.com/ueno/libskk")
     (synopsis "Dealing with Japanese kana-to-kanji conversion")
     (description

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.