diff options
| author | Kurome <hunt31999@gmail.com> | 2025-04-18 15:19:34 +0900 |
|---|---|---|
| committer | Hilton Chain <hako@ultrarare.space> | 2025-04-19 12:39:12 +0800 |
| commit | b0d0f0f9051f45f44fb592afe5dcb50ac0e405f7 (patch) | |
| tree | 07418f05744bceac2313c948f73e3dd3754844c5 | |
| parent | a4a7ff0319c622cd08aa7461cc88cc6608fe62cb (diff) | |
| download | guix-b0d0f0f9051f45f44fb592afe5dcb50ac0e405f7.tar.gz guix-b0d0f0f9051f45f44fb592afe5dcb50ac0e405f7.zip | |
gnu: libskk: Fix tests.
* gnu/packages/patches/libskk-fix-invalid-escape.patch: New file.
* gnu/local.mk (dist_patch_DATA): Regisiter it.
* gnu/packages/language.scm: (libskk) [source]: Use it.
[inputs]: Add skk-jisyo.
[arguments] <#:phases>: Add `symlink-skk-jisyo` to symlink it to output.
<#:parallel-tests?>: Disable.
Change-Id: I3d086f2a691a42b4df9083ca711261744b8ad418
Signed-off-by: Hilton Chain <hako@ultrarare.space>
Modified-by: Hilton Chain <hako@ultrarare.space>
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/language.scm | 17 | ||||
| -rw-r--r-- | gnu/packages/patches/libskk-fix-invalid-escape.patch | 16 |
3 files changed, 32 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 62cfe230bb..83df535b4c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1763,6 +1763,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 13957e12a0..7a4118c04b 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -40,6 +40,7 @@ #: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,20 @@ and manipulation.") (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-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 @@ -933,7 +946,7 @@ and manipulation.") 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": ["", "に" ], |