From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id eNJnIHII+WZUXQEA62LTzQ:P1 (envelope-from ) for ; Sun, 29 Sep 2024 07:57:38 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id eNJnIHII+WZUXQEA62LTzQ (envelope-from ) for ; Sun, 29 Sep 2024 09:57:38 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=VdGvJDUG; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=VRwmXWhm; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1727596658; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=nZbk5H96xL1AF8XRpTnZn/dWD2i+2ZzSTQb5S+w2rhM=; b=MhkgsmdKdXi4AEK3JSF60I5uIadNNT9QTHSiQoYaIS+n+hllksJ6mHu2RZa047j2OCmO/I vQBlvQJrkfiiFqHd4r3OCSlgEQvzNv/+BVFXCvmN0xQ65EB9VzgLP4Unk0ncjQ8TPF6bee JJTWXLU5X5AXoKYOZPfVDqCGKXBV4aBEnmKWgROA3vo6Du9TOgN6iWd/q/ESTyk9jXy7nV VyZ+1DWn3Hjv9ROVqGMkUvUHM2RlLApn8I8SQ823OyqQS7kQwE7Iw3jjw6nrUNVGVnZQZO sjo3lI2xZTl+oYEnzlD1TJd7Fie53XMka+ebEJvQaxDoRv9Qtr0urxC0xmuHYQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=VdGvJDUG; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=VRwmXWhm; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1727596658; a=rsa-sha256; cv=none; b=jGEKx2LuXRLoa9eDRIiswLTlwH9yAKNcAAyO7zjbgdj0SoG9fgQM+UqcnzLYk9UKUowl1X oF8PoW5N4DL2f6wloE6x0uvCnT6HYVfiptdxFVXku5sWhddxTYEltQOy30VKMn98nQGi3a X3TvFIDoOVqgVyU2Gx+N/YD3Yz/4burxvr2loExVUaGNSV7Qi6QzDyi9K3+ygJ6DFgwKp4 b4fkD/gMT0KrlCI7Bja1WQcsgL/4mMJLVjyjuKrcQRDscr/2dSDsHVw4eSubDBaXuB8HB/ kE8+nT6ZCSXqtHD42MJUiVLsNIhS8ZXkhOiEmxr43KCapm+N3q3ogd6KUGAVbQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1C8B652741 for ; Sun, 29 Sep 2024 09:57:38 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suooB-0005EL-0T; Sun, 29 Sep 2024 03:57:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1suoo9-0005Di-NE for guix-patches@gnu.org; Sun, 29 Sep 2024 03:57:33 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1suoo9-0002O8-EY for guix-patches@gnu.org; Sun, 29 Sep 2024 03:57:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=nZbk5H96xL1AF8XRpTnZn/dWD2i+2ZzSTQb5S+w2rhM=; b=VdGvJDUGzl3k6VbmqVmdfkO0gAjuXLFQFnWeAQuMv4GrAqRHNsIxqwocST+xSgHqqRDuHnxADJz+fdZecaY2zbcSxsc66CL1DQto9rBH+eqMd2qiU/DRc6DEp+vMUPFypTDl0lrya+RSSm7NHdKFqfn8B5tyUbhS1KMqtliK00iLDlYaouavry+HSmLE2F59FdQ8Qj2tzJX56AEFwKwY9YUstSzsTrZ6FWunZphX9bfGUAH1M1qMowohV9wXOb6ybL1+0KtTzSNYPldnnd+NC/hxmPmtFsmBcOgP58Qz+BnL/5aVT2psXTPlKbO1NP6fd3JhCAU9hslVx6b2DacOUw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1suooe-0007AG-CM for guix-patches@gnu.org; Sun, 29 Sep 2024 03:58:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73549] [PATCH 2/4] gnu: libchewing: Update to 0.9.0. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 29 Sep 2024 07:58:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73549 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73549@debbugs.gnu.org Cc: Charles , Efraim Flashner Received: via spool by 73549-submit@debbugs.gnu.org id=B73549.172759663427170 (code B ref 73549); Sun, 29 Sep 2024 07:58:04 +0000 Received: (at 73549) by debbugs.gnu.org; 29 Sep 2024 07:57:14 +0000 Received: from localhost ([127.0.0.1]:39048 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suono-00073u-7w for submit@debbugs.gnu.org; Sun, 29 Sep 2024 03:57:13 -0400 Received: from mail-wm1-f45.google.com ([209.85.128.45]:60803) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suonh-00072Q-Lb for 73549@debbugs.gnu.org; Sun, 29 Sep 2024 03:57:07 -0400 Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-42f68e79f35so481695e9.1 for <73549@debbugs.gnu.org>; Sun, 29 Sep 2024 00:56:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727596529; x=1728201329; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=nZbk5H96xL1AF8XRpTnZn/dWD2i+2ZzSTQb5S+w2rhM=; b=VRwmXWhmVPDMb4j7HxTFeqI1s1BIECKjlbTzKuMoPHMJPbU7iUCmNhz824GB+AYj9Y Zifz4qK2tVyE9R6Gl/mCofRVDtRhqmiimX9QzCXLKXoue4E85wS9YEI9+dwxWcGMNAJK dDMZkK0MJau/35FhfhEIrLkw9hlrNrHCtKclamn0TtTFNu6WlGlmQ8rtmLz9ZN8+pGd9 IHhc9dco/PnvxXPeJWSo9zaOpExSztRX4WdL+FHxzvftFbSnWdQR87kUwhTE75GtzyCO HlfFrg6uhjpbqbbYTHPsNsXzQb0zi6MintL7ZZE7y9JgY0HOhZGDJ85jS5OfLXfZOxRD /4vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727596529; x=1728201329; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=nZbk5H96xL1AF8XRpTnZn/dWD2i+2ZzSTQb5S+w2rhM=; b=t/OGE1kkAcZEdNJULpU+wIOgNjfaRllK2EjvtwcX3WoTxn6gC/07CCONH4vm2miXAO fJJLrTZps/BPhLeBSOr5OlshH7aX9EnY3piABO8xXJQPJw4PgP4axPHhq6wKZcgdP7ZY K/8S/ZbNVYtQm472qoAlpm+H4Ym3keehKjt6b54EfjcPUonWRX00RvZqKydgIPO6GgXU t2zdpqdXzvVauudgI2v3dn2VoSdBQNaHj6pDQeY+6NR6HjyxLhc9uMiuueJ8AD1dAlyn Fpd4iWjggO0olhDDbIQNz7H+zUWUmO34Z7WaPuaqhSCbXBMHoAHLdNLN94AFfowktLw3 pTZQ== X-Gm-Message-State: AOJu0YzHsXf3xPnc2S0SJ6CLEKsmU4DJ2sPIlnoNu7IX9pvkv9kMuvrL J2b9j69PGRNHeeqIBdiZun2P4Jy+AKMsLEEepA5s0SCSs+YvC11O1aucFDeN X-Google-Smtp-Source: AGHT+IEGk0YO9NrsWjeyckkH1m2h5BtB2vlLohwKlvdd1OgvITmD3roH4nC4e20tPQfZkT4xrE1KnA== X-Received: by 2002:a05:600c:1e20:b0:42c:af06:703 with SMTP id 5b1f17b1804b1-42f5849fb61mr66278335e9.31.1727596528454; Sun, 29 Sep 2024 00:55:28 -0700 (PDT) Received: from localhost ([141.226.162.35]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42e969ffc56sm117954675e9.22.2024.09.29.00.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Sep 2024 00:55:27 -0700 (PDT) From: Efraim Flashner Date: Sun, 29 Sep 2024 10:55:04 +0300 Message-ID: <354fa8194db3c0858e6f63b86d6a493f93974f71.1727596132.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -5.34 X-Spam-Score: -5.34 X-Migadu-Queue-Id: 1C8B652741 X-Migadu-Scanner: mx13.migadu.com X-TUID: PmDyPmMg3N5Q * 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 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 ;;; Copyright © 2023 Maxim Cournoyer ;;; Copyright © 2023 gemmaro +;;; Copyright © 2024 Efraim Flashner +;;; Copyright © 2024 Charles ;;; ;;; 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 רנשלפ םירפא GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted