From patchwork Sun Sep 29 07:55:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 31548 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 26C3927BBEA; Sun, 29 Sep 2024 08:58:05 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 851FD27BBE2 for ; Sun, 29 Sep 2024 08:58:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suooA-0005Dv-Ol; Sun, 29 Sep 2024 03:57:34 -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 1suoo8-0005DY-Vr 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 1suoo8-0002O1-ML for guix-patches@gnu.org; Sun, 29 Sep 2024 03:57:32 -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=4JuGwJaWVxWoEyExznjx3Rh/VpUcmOo7Yn+RastKGFs=; b=ISjBUJAlzS0vHzMh5cK0sEfyoVA8uop2Zinq1w3cwxMe9v1/TNJDTUXKSr5OLs0dhdZfOYIP7IgdI0DjJeTRoObKt2i64Q/wOA+WkBwGn80aPV6QG04+DENVhQWGQ2yhOG6ZZfGwnv4u/J1s6bjdDhcBEJplBrFCn1YhjO8BVsi4GKd1MtnyvL2LYWr7uqD4rRBqHl524zvIBV/A0y3BSxoYFxHkc2/O+p2mFgmqwu2IbL6y/5OQn6wem7jBBHmRl4OapZKQwgdHvy7Xcvy7kCBdSkUM0dJj+PYr0CIMgjARmayAUILSz4z8qREK2GYlID73NPWI3JVhf8AgVUvbxw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1suood-0007A4-8J for guix-patches@gnu.org; Sun, 29 Sep 2024 03:58:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73549] [PATCH 1/4] gnu: Add corrosion. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 29 Sep 2024 07:58:03 +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.172759662527100 (code B ref 73549); Sun, 29 Sep 2024 07:58:03 +0000 Received: (at 73549) by debbugs.gnu.org; 29 Sep 2024 07:57:05 +0000 Received: from localhost ([127.0.0.1]:39036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suong-00072x-Eq for submit@debbugs.gnu.org; Sun, 29 Sep 2024 03:57:05 -0400 Received: from mail-wm1-f49.google.com ([209.85.128.49]:61601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suone-000729-5c for 73549@debbugs.gnu.org; Sun, 29 Sep 2024 03:57:03 -0400 Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-42cafda818aso32338355e9.2 for <73549@debbugs.gnu.org>; Sun, 29 Sep 2024 00:56:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727596524; x=1728201324; 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=4JuGwJaWVxWoEyExznjx3Rh/VpUcmOo7Yn+RastKGFs=; b=kK64I1EVUu98eLsKjDtMjc17xsYACjBKsnK4IsoR82ldMaPljr9aNDz0ugDa2SdD75 M2pY+Hn0vhBua1j2NP9dFBfgFgqdQFfJafRF4VnB4FU9ak+RsVvi5AyhPee9khJuS+gY 1xRl0hZ7KzhXnl4AwuiCWMzFNnbZ3UwjMGfIlev5vN0W6CmRfxrttxrzmNYYMKZavMvR f/Hn2dKgf7oXykgYUrOIIA95GwJuq5j+pkTqY5HIxTtpv2zedfTJowc6cK1l+eAcjmds Nu6lzgmR9OlivxrntOnqclsKm+8laXgtDQx7QgicIbjwb25urzZnbEVA2wTYkBJBa273 KI3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727596524; x=1728201324; 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=4JuGwJaWVxWoEyExznjx3Rh/VpUcmOo7Yn+RastKGFs=; b=NWHcCDV4zU47z3ZUxHjOG2NbQR9QzlXHcA9ZuUE+XMigA1rHyi3QZ+48z+lIQM826g bhTxg5e2ttpoDjEw1gqEqhUrVWUy0wcrl0+HwoQ25oOwQcaxPTVx0xJ3naNP3RuIljZX 7V3vNpOujrGv3zxLiszyGgYij2jQFknCVr8suFSNeH7rlfjVv4YLpXVyhNIttHpk+qoF bdML2wtQXGZuN8pxkzXV6m4fCu8Z+MujDK+2GyqAwl95KEakPLiWdH8zF15dmS4Itdk5 kn8fStAzONjjkR+ecIijSdZq84t8+BjqVVmyA0/nEAs/qgeoIzWxQlRP0g0CwgA4PUFo UQHQ== X-Gm-Message-State: AOJu0YyJ6uRbPfbtafXU/Rri5/EkzpU0a+a+GF27gO8owHLb3pKwJlie oJbDC0IORhW9wR5FMMzzILx84933oNHmqYclM7pSwkvAg1NpUIiETNIMBBrz X-Google-Smtp-Source: AGHT+IGB/JI9Mgk5dTBLuseYNW9QhBVa9e2j2xX1fMYrM6j2/syeG6TxsO2qoFFiC7EBKVVkfARPfw== X-Received: by 2002:adf:cd8b:0:b0:374:c911:7749 with SMTP id ffacd0b85a97d-37cd5b28a9fmr5159077f8f.49.1727596523759; Sun, 29 Sep 2024 00:55:23 -0700 (PDT) Received: from localhost ([141.226.162.35]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f57e2fb5bsm69787725e9.39.2024.09.29.00.55.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Sep 2024 00:55:22 -0700 (PDT) From: Efraim Flashner Date: Sun, 29 Sep 2024 10:55:03 +0300 Message-ID: <5e0b111590eb34d408b770f3a3ca5be8f3dc603d.1727596132.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Charles * gnu/packages/cmake.scm (corrosion): New variable. Signed-off-by: Efraim Flashner Change-Id: I0bb56889722128b9946af495fab05d39beaaf65a --- gnu/packages/cmake.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 4466c4b91dd..8310dc55fa7 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2021 Ricardo Wurmus ;;; Copyright © 2024 John Kehayias ;;; Copyright © 2024 dan +;;; Copyright © 2024 Charles ;;; ;;; This file is part of GNU Guix. ;;; @@ -54,6 +55,7 @@ (define-module (gnu packages cmake) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages libevent) #:use-module (gnu packages ncurses) + #:use-module (gnu packages rust) #:use-module (gnu packages serialization) #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) @@ -440,6 +442,46 @@ (define-public cmake-minimal-cross (search-paths (package-native-search-paths cmake-minimal)))) +(define-public corrosion + (package + (name "corrosion") + (version "0.5.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/corrosion-rs/corrosion") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1sm1jhdrqzp3f36f7grh900wp7pk9l1zim49hrk87ac6frfmg8xx")))) + (build-system cmake-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ctest" "-E" + (string-append + "(" (string-join + (list "cbindgen_rust2cpp" + "rustup_proxy" + "hostbuild" + "parse_target_triple") + "|") + ")")))))))) + (native-inputs + (list rust + `(,rust "cargo"))) + (home-page "https://corrosion-rs.github.io/corrosion/") + (synopsis "Tool for integrating Rust into an existing CMake project") + (description "Corrosion, formerly known as cmake-cargo, is a tool for +integrating Rust into an existing CMake project. Corrosion can automatically +import executables, static libraries, and dynamic libraries from a workspace +or package manifest (Cargo.toml file).") + (license license:expat))) + (define-public emacs-cmake-mode (package (inherit cmake) From patchwork Sun Sep 29 07:55:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 31545 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C564127BBEA; Sun, 29 Sep 2024 08:57:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0F5E427BBE2 for ; Sun, 29 Sep 2024 08:57:38 +0100 (BST) 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 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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") From patchwork Sun Sep 29 07:55:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 31547 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9F2A427BBEA; Sun, 29 Sep 2024 08:57:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 16FCD27BBE2 for ; Sun, 29 Sep 2024 08:57:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suooD-0005Ed-8H; Sun, 29 Sep 2024 03:57:37 -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 1suooB-0005EQ-KS for guix-patches@gnu.org; Sun, 29 Sep 2024 03:57:35 -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 1suooB-0002OE-3m for guix-patches@gnu.org; Sun, 29 Sep 2024 03:57:35 -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=I4HF07StFm7IljHoqlpvtbztUEz7A/L2Tq6+Yw75154=; b=cX30Ma/ERD1N1snP+lXqp9VGL8QVimEG7OMpD3Dk122ClhwcV3xn0C+37aeHQW8kiKFswdFxJBqAkQgw9iMTDX4h2h1Pp+/fKzs64TYH03qB0b1sB8p3hOoaw63hVXvxNhXEiyut8nHaX6ho8fEJwJ3x5PFqMHjIDG9YOexBwwxXth3ptB9rZkRzxm7dBlw17Bu+meNunUbTq+t4Dliaz24z0632kQiXDJRHASPmdodLL8LMD+YSmf3DhMt/AtSev2HFBCVSdvNxYKhw2W+Mx10Filc+Ks6uWj+PsrL8q0zPsrLVdzSF8+nbERmjcLZHMe8UF5fUUxRcbABKfG5KrQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1suoof-0007AT-7r; Sun, 29 Sep 2024 03:58:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73549] [PATCH 3/4] gnu: Add fcitx5-chewing. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: all_but_last@163.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sun, 29 Sep 2024 07:58:05 +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 , Zhu Zihao , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Zhu Zihao , =?utf-8?b?5a6L5paH?= =?utf-8?b?5q2m?= Received: via spool by 73549-submit@debbugs.gnu.org id=B73549.172759664927325 (code B ref 73549); Sun, 29 Sep 2024 07:58:05 +0000 Received: (at 73549) by debbugs.gnu.org; 29 Sep 2024 07:57:29 +0000 Received: from localhost ([127.0.0.1]:39060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suoo1-000762-Su for submit@debbugs.gnu.org; Sun, 29 Sep 2024 03:57:29 -0400 Received: from mail-wm1-f48.google.com ([209.85.128.48]:51529) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suonl-00072w-L4 for 73549@debbugs.gnu.org; Sun, 29 Sep 2024 03:57:13 -0400 Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-42cbe624c59so27336695e9.3 for <73549@debbugs.gnu.org>; Sun, 29 Sep 2024 00:56:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727596533; x=1728201333; 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=I4HF07StFm7IljHoqlpvtbztUEz7A/L2Tq6+Yw75154=; b=j6Qj+rekgAWocqXNXnWD++/CWwVofq9WVzeWZU9zjM0tPQpK+h6u5fsg79ZJOZ2RnG bvLnCs3PtniV2Dgqu9sg/v3gSwZYriafHPxIC87ZW0BZj7tXK//OYTNgdWaBf8cMNmjZ KZ/jjCQ/TDfeAJSTDaNCb/eTMrTLxKyz5TSDZ5wQ8gm9HzYVBAF/AagkmFwz746NcN0j 3gYnVawKBf57O3F/exwNRwVRdWDzbAcaQJ857tIcMIvbR/z2CtHGAzAyAFHMhJjtObfq UvXN54f/K3J54p9Nm++5xf5eOQ5jV6xI7kUplfI0wr+hZMNK7TdJFTR35sZ7X34WuhVs 4Y/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727596533; x=1728201333; 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=I4HF07StFm7IljHoqlpvtbztUEz7A/L2Tq6+Yw75154=; b=Fb5o59qYU56gZJMcPvopulx826GIhaByCA13waUiD7iDwZDkXhNupq8ikpwsvKBojE 2+pTKDVKUygXQ4/BFflHOnPRt+1Lxcg3z/V+Ugv6ESh7aE3eBe3rJTG8VdyoXmVi/MMr AZVQ1GmLJDrhGPpE+9S8TH/iw08M0xGIP373iuM88q68G+w1sObVmt6q33Ypfmx2Ahxk SBJRKwMVLeNJgpttoPoP0StRClm9avfuOAhGURtTXQZtUYNlGkldNF+f0CYGX3tTvDhF dy5OpNttU+GVu70yAvk72/ik06PhUsVt7C3AWx6ITDMYhv3LoF09KpssI9nTxDiLuQtU xMiA== X-Gm-Message-State: AOJu0YxRyIJGnqLuRHG8WXpUrExxdmzq+sn0Qhf34XSyKWvGN2gVLddQ eYhjyI6ObjFMmPyA2YW65/2aERDrBmWuSyC/XtYGihKrs5eyXGKs8M4ba0vB X-Google-Smtp-Source: AGHT+IEMvz8sM/xSGSbmDxjpUTDJa3ZkBuMeffB4WUPmCLyW5oWVhr7zvDzwrfMHNAjTKioIceRKOw== X-Received: by 2002:adf:f2c6:0:b0:37c:d4e8:2c67 with SMTP id ffacd0b85a97d-37cd5b1f5bamr4932844f8f.52.1727596532707; Sun, 29 Sep 2024 00:55:32 -0700 (PDT) Received: from localhost ([141.226.162.35]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f57de1288sm70376315e9.18.2024.09.29.00.55.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Sep 2024 00:55:31 -0700 (PDT) From: Efraim Flashner Date: Sun, 29 Sep 2024 10:55:05 +0300 Message-ID: <9ec2e750f07696f89eadb463fb7001f939e23f17.1727596132.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Charles * gnu/packages/fcitx5.scm (fcitx5-chewing): New variable. Signed-off-by: Efraim Flashner Change-Id: I27cd2d9732ad12a387ecaa258a36f7342d438ab1 --- gnu/packages/fcitx5.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index c4c2b565db7..b6002f8023c 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2022 Dominic Martinez ;;; Copyright © 2022 dan ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2024 Charles ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,6 +42,7 @@ (define-module (gnu packages fcitx5) #:use-module (gnu packages ibus) #:use-module (gnu packages iso-codes) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages language) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) #:use-module (gnu packages lua) @@ -369,6 +371,35 @@ (define-public fcitx5-anthy the Anthy input method.") (license license:gpl2+))) +(define-public fcitx5-chewing + (package + (name "fcitx5-chewing") + (version "5.1.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fcitx/fcitx5-chewing") + (commit version))) + (sha256 + (base32 "011psyvvcbrw062zw807lm33n827qza7mqaagf8zb0cz3hh1qwm9")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ (setenv "HOME" (getcwd))))))) + (inputs (list libchewing)) + (native-inputs + (list extra-cmake-modules + pkg-config + gettext-minimal + fcitx5)) + (home-page "https://github.com/fcitx/fcitx5-chewing") + (synopsis "Chewing wrapper for Fcitx") + (description "This provides libchewing input method support for fcitx5.") + (license license:gpl2+))) + (define-public fcitx5-chinese-addons (package (name "fcitx5-chinese-addons") From patchwork Sun Sep 29 07:55:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 31546 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CBFCA27BBEA; Sun, 29 Sep 2024 08:57:42 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4253727BBE2 for ; Sun, 29 Sep 2024 08:57:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suooF-0005G2-MO; Sun, 29 Sep 2024 03:57:39 -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 1suooD-0005FT-VZ for guix-patches@gnu.org; Sun, 29 Sep 2024 03:57:37 -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 1suooD-0002OU-M4 for guix-patches@gnu.org; Sun, 29 Sep 2024 03:57:37 -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=NbYxYS+aNQEU2FSFdq6gq7Sfvb49fezA+j6XWCTjlEI=; b=cca373nqV2p3OkyKcUJruI3oZX7c6WIsU11wQPPuGiUSZQfLPDDG+853cvEXkqxumcFTs32rQ6npkDLwV/RMsCHEgyz0KSJ9Rj5QR8ZAxJKlEs4JLxsEXUg/zCN1mPVpAH1gmvKIYidnoWGjxWE99JKUWrjRky+aN9Z5HW2m4aBOR5WmUr6PMYZEyY2baugMZW19HzpPwlNjZUEWvupHsvpdD8YXnc4UXPT1E1hjij0q10Zcsw90g1kBRR2MaF3+k/tApmTL6jLgwtzr0Exx0pnhVa09fQhyr7khxooU10VR261xrgg4H8HCgzoAlHNCnmuhSSWKg2HvD8PXCQazrw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1suoof-0007Aa-Q5; Sun, 29 Sep 2024 03:58:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73549] [PATCH 4/4] gnu: Add ibus-chewing. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: all_but_last@163.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sun, 29 Sep 2024 07:58:05 +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 , Zhu Zihao , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Zhu Zihao , =?utf-8?b?5a6L5paH?= =?utf-8?b?5q2m?= Received: via spool by 73549-submit@debbugs.gnu.org id=B73549.172759665127342 (code B ref 73549); Sun, 29 Sep 2024 07:58:05 +0000 Received: (at 73549) by debbugs.gnu.org; 29 Sep 2024 07:57:31 +0000 Received: from localhost ([127.0.0.1]:39062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suoo5-00076e-3u for submit@debbugs.gnu.org; Sun, 29 Sep 2024 03:57:30 -0400 Received: from mail-wr1-f42.google.com ([209.85.221.42]:42202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suonp-00073S-5M for 73549@debbugs.gnu.org; Sun, 29 Sep 2024 03:57:16 -0400 Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-37ccd81de57so2125796f8f.0 for <73549@debbugs.gnu.org>; Sun, 29 Sep 2024 00:56:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727596536; x=1728201336; 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=NbYxYS+aNQEU2FSFdq6gq7Sfvb49fezA+j6XWCTjlEI=; b=eyb2wKwzx6E+dIk9i/8u+6Y1KOJgihugBP845t0VI+h/moWiSjf5eAv1H1uDb8ckbo Qfs5vCFgaVUDT0SvS2Sf050bj7JastHFBo7CFhnCHwAa7XUd44oTu7v/rZa8qMObHB+J mBSwNLqbnrwfqozoWcqa8gKz/RH9OfgmZtOXB27to2wVZjCvMZdv+6vejzAEq3lGE1wS Di8ompQB8hXhUtqxOWXD0GECVMn9/sTYovo9B6lKpWQrNurvK8KLFjIZhqKwgwixE5p3 i9cIUgoUmltDHOpY7RJCLlgLIiwAEGz23znigsLJW3i3MCG+CavGYnXULzBurgshfvfm yrrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727596536; x=1728201336; 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=NbYxYS+aNQEU2FSFdq6gq7Sfvb49fezA+j6XWCTjlEI=; b=Gi1trdl9owgeUlYyUloQJtWFyPjl8IIp2TQGy1NjzgBtU3qBmcDmFuIxL3UrUcJTza WLpdpxzKF+IIcZT8D2kUjCR9BRrx0mxaZnzhpJ3NxzblaO5f9DOOTWvKh4zGJtcAZ3tY USDHOCaVwAOrvwIAuw9bW8s/oDiTQudfm+BTHPRaueShrI49tAt7IUvPuaJimztVDHi5 6MVZ+6IBGai1i3Do0rA0Sb4LUtHNGLGO7XjhnFf/SrIox4ogCAuADz4GIKTKmBvME+Qn jYQG/UNPeGg8nr/Mvni22Uld1FYNfSnrk3JGdEROvQSmkvse4yQdM9MqAk5seLmRAljK beAQ== X-Gm-Message-State: AOJu0Yyb/ypAyPXhWg1oYjl7+li24xHCJ/V81SpsjBGdMi+TrmllgDAa KnI75nuDkYer21aGDsZnGWHhFplYpQSLo/gZJrA+uWfDMe06Y2FaO9rz/xkJ X-Google-Smtp-Source: AGHT+IHCc3/reM/o5jLYPAKru21Tdbtd8spYvGjMm1nyMgRop/2sGEnDwbMJJs9gkIJEmHnJhShJpg== X-Received: by 2002:a5d:51cc:0:b0:374:c2a3:63cb with SMTP id ffacd0b85a97d-37cd55d7eadmr4523075f8f.0.1727596536185; Sun, 29 Sep 2024 00:55:36 -0700 (PDT) Received: from localhost ([141.226.162.35]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37cd564d6d6sm6389035f8f.6.2024.09.29.00.55.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Sep 2024 00:55:35 -0700 (PDT) From: Efraim Flashner Date: Sun, 29 Sep 2024 10:55:06 +0300 Message-ID: <98bd768ded54e32edd29fe2d325db12dc4363d73.1727596132.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ibus.scm (ibus-chewing): New variable. Co-authored-by: Charles . Change-Id: I37c1ac836e5afd3101378d206e5c2056293cc182 --- gnu/packages/ibus.scm | 52 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 2f4211c385b..0dfce29ea36 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015-2023 Ricardo Wurmus ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2016 Chris Marusich -;;; Copyright © 2017, 2018 Efraim Flashner +;;; Copyright © 2017, 2018, 2024 Efraim Flashner ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019, 2020, 2021 Peng Mei Yu ;;; Copyright © 2020 kanichos @@ -13,6 +13,7 @@ ;;; Copyright © 2022, 2023 Maxim Cournoyer ;;; Copyright © 2023 Luis Felipe López Acevedo ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2024 Charles ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,6 +62,7 @@ (define-module (gnu packages ibus) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages iso-codes) + #:use-module (gnu packages language) #:use-module (gnu packages linux) #:use-module (gnu packages logging) #:use-module (gnu packages perl) @@ -380,6 +382,54 @@ (define-public libpinyin (home-page "https://github.com/libpinyin/libpinyin") (license gpl2+))) +(define-public ibus-chewing + (package + (name "ibus-chewing") + (version "2.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/chewing/ibus-chewing") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fgscxb8nhli4g8d3yy0wxzbk9bcyj6bvmqrzbddkvgikmanj36b")))) + (build-system cmake-build-system) + (arguments + (list + ;; Settings schema 'org.freedesktop.IBus.Chewing' is not installed + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'prepare-for-tests + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; IBus requires write access to the HOME directory. + (setenv "HOME" (getcwd)) + ;; MESA: error: ZINK: failed to choose pdev + (setenv "GALLIUM_DRIVER" "llvmpipe") + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1"))))))) + (inputs + (list glib + gtk + ibus + libadwaita + libchewing)) + (native-inputs + (list dbus + gettext-minimal + gobject-introspection + `(,glib "bin") + pkg-config + xorg-server-for-tests)) + (home-page "https://chewing.im/") + (synopsis "Chewing engine for IBus") + (description "IBus-Chewing is an IBus front-end of Chewing, an intelligent +Chinese input method for Zhuyin (BoPoMoFo) users.") + (license gpl2))) + (define-public ibus-anthy (package (name "ibus-anthy")