[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/15: gnu: ibus-rime: Update to 1.5.0.
From: |
guix-commits |
Subject: |
04/15: gnu: ibus-rime: Update to 1.5.0. |
Date: |
Thu, 5 Aug 2021 10:03:08 -0400 (EDT) |
efraim pushed a commit to branch master
in repository guix.
commit 7aab590ddd59158eb783dc532ca17006923f0fa6
Author: Peng Mei Yu <pengmeiyu@riseup.net>
AuthorDate: Tue Aug 3 09:28:01 2021 +0800
gnu: ibus-rime: Update to 1.5.0.
* 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>
---
gnu/packages/ibus.scm | 42 ++++++++++++------------------------------
1 file changed, 12 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index 9e6a665..48a2445 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -663,7 +663,7 @@ Method Engine.")
(define-public ibus-rime
(package
(name "ibus-rime")
- (version "1.4.0")
+ (version "1.5.0")
(source
(origin
(method git-fetch)
@@ -672,40 +672,22 @@ Method Engine.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "12y6jdz1amhgrnqa7zjim63dfsz6zyxyahbirfan37wmcfp6gp1d"))))
- (build-system gnu-build-system)
+ (base32 "1vl3m6ydf7mvmalpdqqmrnnmqdi6l8yyac3bv19pp8a5q3qhkwlg"))))
+ (build-system cmake-build-system)
(arguments
`(#: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
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
- (lambda* (#:key inputs outputs #:allow-other-keys)
- ;; Define RIME_DATA_DIR. It's required but not used by the code.
- (substitute* "Makefile"
- (("cmake")
- (string-append "cmake -DRIME_DATA_DIR="
- (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))))
+ (lambda _
+ (substitute* "CMakeLists.txt"
+ (("DESTINATION....RIME_DATA_DIR..")
+ "DESTINATION \"${CMAKE_INSTALL_DATADIR}/rime-data\""))
+ #t)))))
(inputs
`(("gdk-pixbuf" ,gdk-pixbuf)
("glib" ,glib)
- branch master updated (e914fc5 -> ead6cc0), guix-commits, 2021/08/05
- 01/15: gnu: julia: Fix building on aarch64-linux., guix-commits, 2021/08/05
- 02/15: gnu: librime: Update to 1.7.3., guix-commits, 2021/08/05
- 05/15: gnu: go-github-com-puerkitobio-goquery: Update to 1.7.0., guix-commits, 2021/08/05
- 07/15: gnu: go-github-com-sergi-go-diff: Update to 1.2.0., guix-commits, 2021/08/05
- 04/15: gnu: ibus-rime: Update to 1.5.0.,
guix-commits <=
- 08/15: gnu: go-github-com-pelletier-go-toml: Update to 1.9.3., guix-commits, 2021/08/05
- 03/15: gnu: rime-data: Update to 0.38.20210802., guix-commits, 2021/08/05
- 11/15: gnu: go-github-com-dlclark-regexp2: Update to 1.4.0., guix-commits, 2021/08/05
- 12/15: gnu: go-gopkg-in-check-v1: Update to 1.0.0-20201130134442-10cb98267c6c., guix-commits, 2021/08/05
- 06/15: gnu: go-go-uber-org-atomic: Update to 1.8.0., guix-commits, 2021/08/05
- 09/15: gnu: go-github-com-masterminds-goutils: Update to 1.1.1., guix-commits, 2021/08/05
- 10/15: gnu: go-github-com-magiconair-properties: Update to 1.8.5., guix-commits, 2021/08/05
- 13/15: gnu: go-etcd-io-bbolt: Update to 1.3.6., guix-commits, 2021/08/05
- 14/15: gnu: earlyoom: Patch tests for go-1.16., guix-commits, 2021/08/05
- 15/15: gnu: go-1.16: Honor #:parallel-build?, guix-commits, 2021/08/05