ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 22:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ibus-rime: Update to 1.5.0.

Browse source 
* gnu/packages/ibus.scm (ibus-rime): Update to 1.5.0.
[build-system]: Change gnu-build-system to cmake-build-system.
[arguments]: Delete #:make-flags.  Add #:configure-flags.  Update
'patch-source phase.  Delete 'fix-file-names phase.  Revert deletion of
'configure phase.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
Peng Mei Yu 2021-08-03 09:28:01 +08:00 committed by Efraim Flashner
parent 9177895618
commit 7aab590ddd
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 12 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
gnu/packages/ibus.scm
View file

@ -663,7 +663,7 @@ (define-public rime-data
(define-public ibus-rime (define-public ibus-rime
(package (package
(name "ibus-rime") (name "ibus-rime")
(version "1.4.0") (version "1.5.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -672,40 +672,22 @@ (define-public ibus-rime
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "12y6jdz1amhgrnqa7zjim63dfsz6zyxyahbirfan37wmcfp6gp1d")))) (base32 "1vl3m6ydf7mvmalpdqqmrnnmqdi6l8yyac3bv19pp8a5q3qhkwlg"))))
(build-system gnu-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:configure-flags
(list (string-append "-DRIME_DATA_DIR="
(assoc-ref %build-inputs "rime-data")
"/share/rime-data"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-source (add-after 'unpack 'patch-source
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda _
;; Define RIME_DATA_DIR. It's required but not used by the code. (substitute* "CMakeLists.txt"
(substitute* "Makefile" (("DESTINATION....RIME_DATA_DIR..")
(("cmake") "DESTINATION \"${CMAKE_INSTALL_DATADIR}/rime-data\""))
(string-append "cmake -DRIME_DATA_DIR=" #t)))))
(assoc-ref inputs "rime-data")
"/share/rime-data")))
;; rime_config.h defines the actual data directory.
(substitute* "rime_config.h"
(("^#define IBUS_RIME_INSTALL_PREFIX .*$")
(string-append "#define IBUS_RIME_INSTALL_PREFIX \""
(assoc-ref outputs "out")
"\"\n"))
(("^#define IBUS_RIME_SHARED_DATA_DIR .*$")
(string-append "#define IBUS_RIME_SHARED_DATA_DIR \""
(assoc-ref inputs "rime-data")
"/share/rime-data\"\n")))
#t))
(add-after 'unpack 'fix-file-names
(lambda* (#:key outputs #:allow-other-keys)
;; IBus uses the component file rime.xml to start the Rime
;; engine. It must be patched with appropriate file names.
(substitute* "rime.xml"
(("/usr") (assoc-ref outputs "out")))
#t))
(delete 'configure))))
(inputs (inputs
`(("gdk-pixbuf" ,gdk-pixbuf) `(("gdk-pixbuf" ,gdk-pixbuf)
("glib" ,glib) ("glib" ,glib)