diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/language.scm | 12 | ||||
| -rw-r--r-- | gnu/packages/patches/libskk-fix-invalid-escape.patch | 16 |
3 files changed, 4 insertions, 25 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index ae24080b03c..a2c2ef46aa5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1808,7 +1808,6 @@ dist_patch_DATA = \ %D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \ %D%/packages/patches/libquicktime-ffmpeg.patch \ %D%/packages/patches/libsepol-versioned-docbook.patch \ - %D%/packages/patches/libskk-fix-invalid-escape.patch \ %D%/packages/patches/libsoup-auth-digest-fix-crash.patch \ %D%/packages/patches/libsoup-deadlock-in-add_listener_in_thread.patch \ %D%/packages/patches/libsoup-fix-merge-of-ranges.patch \ diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 3ba230f3583..7c78f724d2c 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -929,7 +929,7 @@ and manipulation.") (define-public libskk (package (name "libskk") - (version "1.0.5") + (version "1.1.1") (source (origin (method git-fetch) (uri (git-reference @@ -938,15 +938,10 @@ and manipulation.") (file-name (git-file-name name version)) (sha256 (base32 - "0y279pcgs3jrsi9vzx086xhz9jbz23dqqijp4agygc9ackp9sxy5")) - (patches - (search-patches - "libskk-fix-invalid-escape.patch")))) + "0x2fswxybc5ii821ydmm7bjn8cyr35zi3mdld2zmaqc7863hzhqq")))) (build-system gnu-build-system) (arguments (list #:parallel-tests? #f ;Concurrency issues in tests. - ;; relax gcc 14 strictness - #:configure-flags #~(list "CFLAGS=-g2 -O2 -Wno-error=int-conversion") #:phases #~(modify-phases %standard-phases (add-after 'install 'symlink-skk-jisyo @@ -961,7 +956,8 @@ and manipulation.") libtool pkg-config vala)) - (inputs (list libgee json-glib libxkbcommon skk-jisyo)) + (inputs (list json-glib libxkbcommon skk-jisyo)) + (propagated-inputs (list glib libgee)) ;required by libskk.pc (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 deleted file mode 100644 index 2f443e83c96..00000000000 --- a/gnu/packages/patches/libskk-fix-invalid-escape.patch +++ /dev/null @@ -1,16 +0,0 @@ -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": ["", "に" ], |