Package: guix-patches;
Reported by: Efraim Flashner <efraim <at> flashner.co.il>
Date: Sun, 29 Sep 2024 07:55:01 UTC
Severity: normal
Tags: patch
Done: jgart <jgart <at> dismail.de>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: Efraim Flashner <efraim <at> flashner.co.il> To: 73549 <at> debbugs.gnu.org Cc: Charles <charles <at> charje.net>, Efraim Flashner <efraim <at> flashner.co.il> Subject: [bug#73549] [PATCH 2/4] gnu: libchewing: Update to 0.9.0. Date: Sun, 29 Sep 2024 10:55:04 +0300
* gnu/packages/language.scm (libchewing): Update to 0.9.0.
[build-system]: Switch to cargo-build-system.
[arguments]: Adjust for switch to cargo-build-system. Enable
parallel-tests. Add a phase to allow older versions of
rust-clap-mangen. Add the cmake version of 'configure after 'configure.
Use the cmake versions of 'build, 'check and 'install.
[native-inputs]: Add corrosion, cmake-minimal. Remove autoconf,
automake, libtool, perl, pkg-config, python-wrapper, texinfo.
Co-authored-by: Charles <charles <at> charje.net>
Change-Id: Ic11e38646fc47cfc2c575320f43b9355a1c83b39
---
gnu/packages/language.scm | 94 ++++++++++++++++++++++-----------------
1 file changed, 54 insertions(+), 40 deletions(-)
diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 7a3deb0b438..78fcba4287f 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -8,6 +8,8 @@
;;; Copyright © 2022 Milran <milranmike <at> protonmail.com>
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
;;; Copyright © 2023 gemmaro <gemmaro.dev <at> gmail.com>
+;;; Copyright © 2024 Efraim Flashner <efraim <at> flashner.co.il>
+;;; Copyright © 2024 Charles <charles <at> charje.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -31,6 +33,9 @@ (define-module (gnu packages language)
#:use-module (gnu packages audio)
#:use-module (gnu packages base)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages cmake)
+ #:use-module (gnu packages crates-io)
+ #:use-module (gnu packages crates-tls)
#:use-module (gnu packages dbm)
#:use-module (gnu packages docbook)
#:use-module (gnu packages emacs)
@@ -63,6 +68,7 @@ (define-module (gnu packages language)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)
#:use-module (guix packages)
+ #:use-module (guix build-system cargo)
#:use-module (guix build-system cmake)
#:use-module (guix build-system copy)
#:use-module (guix build-system glib-or-gtk)
@@ -264,55 +270,63 @@ (define-public hime
(define-public libchewing
(package
(name "libchewing")
- (version "0.5.1")
+ (version "0.9.0")
(source
(origin
(method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/chewing/libchewing.git")
- (commit
- (string-append "v" version))))
- (file-name
- (git-file-name name version))
+ (uri (git-reference
+ (url "https://github.com/chewing/libchewing")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
- (base32 "04d09w6xdd08v6laj9y4qmqsijw5i2jvshcilhh4vg6cfnfgl2my"))))
- (build-system gnu-build-system)
+ (base32 "1n0w9niff46w7vncs699gj4y2xghn1sbl0f4mg5x33dcapqd14sg"))))
+ (build-system cargo-build-system)
(arguments
- `(;; test-easy-symbol and test-fullshape fail with multiple cores.
- #:parallel-tests? #f
+ `(#:modules ((guix build cargo-build-system)
+ (guix build utils)
+ ((guix build cmake-build-system) #:prefix cmake:))
+ #:imported-modules ((guix build cmake-build-system)
+ ,@%cargo-build-system-modules)
+ #:install-source? #f
+ ;; Keep the vendor-dir outside of cmake's directories.
+ #:vendor-dir "../guix-vendor"
+ #:cargo-inputs
+ (("rust-anyhow" ,rust-anyhow-1)
+ ("rust-clap" ,rust-clap-4)
+ ("rust-clap-mangen" ,rust-clap-mangen-0.2)
+ ("rust-der" ,rust-der-0.7)
+ ("rust-directories" ,rust-directories-5)
+ ("rust-env-logger" ,rust-env-logger-0.10)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-rusqlite" ,rust-rusqlite-0.29))
+ #:cargo-development-inputs
+ (("rust-tempfile" ,rust-tempfile-3))
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'disable-failing-tests
+ (add-after 'unpack 'allow-older-version-of-clap-mangen
(lambda _
- (substitute* "test/Makefile.am"
- ((" test-bopomofo ")
- "")
- ((" test-config ")
- "")
- ((" test-reset ")
- "")
- ((" test-symbol ")
- "")
- ((" test-keyboardless ")
- "")
- ((" test-special-symbol ")
- "")
- ((" test-keyboard ")
- "")
- ((" test-regression ")
- "")
- ((" test-userphrase ")
- ""))
- #t)))))
+ (substitute* "tools/Cargo.toml"
+ (("0.2.12") "0.2.11"))))
+ (add-after 'configure 'cmake-configure
+ (lambda args
+ (apply (assoc-ref cmake:%standard-phases 'configure)
+ ;; For the tests.
+ (append args (list #:out-of-source? #f)))))
+ (add-after 'unpack 'work-around-genkeystroke
+ (lambda _
+ ;; Remove this phase when we can find ncurses with cmake.
+ (substitute* "tests/CMakeLists.txt"
+ (("CURSES_FOUND") "FALSE"))))
+ (replace 'build
+ (assoc-ref cmake:%standard-phases 'build))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys #:rest args)
+ (when tests?
+ ((assoc-ref cmake:%standard-phases 'check)))))
+ (replace 'install
+ (assoc-ref cmake:%standard-phases 'install)))))
(native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("libtool" ,libtool)
- ("perl" ,perl)
- ("pkg-config" ,pkg-config)
- ("python" ,python-wrapper)
- ("texinfo" ,texinfo)))
+ (list corrosion cmake-minimal))
(inputs
(list ncurses sqlite))
(synopsis "Chinese phonetic input method")
--
Efraim Flashner <efraim <at> flashner.co.il> רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.