diff mbox series

bug#77890: [PATCH] gnu: libskk: Fix tests.

Message ID 87cyd8achb.wl-hako@ultrarare.space
State New
Headers
Series bug#77890: [PATCH] gnu: libskk: Fix tests. |

Commit Message

Hilton Chain April 19, 2025, 6:31 a.m. UTC 
  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 mbox series

Patch

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