From 266d55dc3080475544bf45e72359c9b9bbcecd53 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 15:24:01 +0100 Subject: gnu: ibus-libpinyin: Update to 1.12.0. * gnu/packages/ibus.scm (ibus-libpinyin): Update to 1.12.0. [arguments]: Enable opencc; include setup files on PYTHONPATH; override PYTHONPATH instead of prefixing. [inputs]: Add opencc; remove python-pyxdg. [license]: Change to GPLv3+. --- gnu/packages/ibus.scm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 930381fe09..e6001efa7f 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -174,7 +174,7 @@ may also simplify input method development.") (define-public ibus-libpinyin (package (name "ibus-libpinyin") - (version "1.11.1") + (version "1.12.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/libpinyin/ibus-libpinyin/" @@ -182,10 +182,12 @@ may also simplify input method development.") "/ibus-libpinyin-" version ".tar.gz")) (sha256 (base32 - "1bl1cgicd2df797dx1x0q904438bsn8i23djzcfcai4dp3631xc0")))) + "0xl2lmffy42f6h6za05z4vpazpza1a9gsrva65giwyv3kpf652dd")))) (build-system glib-or-gtk-build-system) (arguments - `(#:phases + `(#:configure-flags + '("--enable-opencc") + #:phases (modify-phases %standard-phases (add-after 'wrap-program 'wrap-with-additional-paths (lambda* (#:key inputs outputs #:allow-other-keys) @@ -193,21 +195,25 @@ may also simplify input method development.") ;; PYTHONPATH and GI_TYPELIB_PATH. (let ((out (assoc-ref outputs "out"))) (wrap-program (string-append out "/libexec/ibus-setup-libpinyin") - `("PYTHONPATH" ":" prefix + `("PYTHONPATH" ":" = (,(getenv "PYTHONPATH") ,(string-append (assoc-ref inputs "ibus") - "/lib/girepository-1.0"))) + "/lib/girepository-1.0") + ,(string-append (assoc-ref outputs "out") + "/share/ibus-libpinyin/setup/"))) `("GI_TYPELIB_PATH" ":" prefix (,(string-append (assoc-ref inputs "ibus") - "/lib/girepository-1.0")))) + "/lib/girepository-1.0") + ,(string-append (assoc-ref outputs "out") + "/share/ibus-libpinyin/setup/")))) #t)))))) (inputs `(("ibus" ,ibus) ("libpinyin" ,libpinyin) ("bdb" ,bdb) ("sqlite" ,sqlite) + ("opencc" ,opencc) ("python" ,python) - ("pyxdg" ,python-pyxdg) ("pygobject2" ,python-pygobject) ("gtk+" ,gtk+))) (native-inputs @@ -219,7 +225,7 @@ may also simplify input method development.") "This package includes a Chinese pinyin input method and a Chinese ZhuYin (Bopomofo) input method based on libpinyin for IBus.") (home-page "https://github.com/libpinyin/ibus-libpinyin") - (license gpl2+))) + (license gpl3+))) (define-public libpinyin (package -- cgit 1.4.1